From: Francois Fleuret Date: Thu, 23 Aug 2012 05:01:55 +0000 (-0700) Subject: Cosmetics. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=3228d8c6786e4dfc90dc08a1bd2c8640d0b1052d;p=mtp.git Cosmetics. --- diff --git a/mtp_graph.cc b/mtp_graph.cc index 590bdb2..7167cf6 100644 --- a/mtp_graph.cc +++ b/mtp_graph.cc @@ -239,31 +239,6 @@ void MTPGraph::find_shortest_path(Vertex **_front, Vertex **_new_front) { _new_front_size = 0; iteration++; - // for(int k = 0; k < _nb_edges; k++) { - // Edge *e = _edges + k; - // d = e->origin_vertex->distance_from_source + e->positivized_length; - // if(d < e->terminal_vertex->distance_from_source) { - // e->terminal_vertex->distance_from_source = d; - // _new_front_size++; - // } - // } - - // for(int n = 0; n < _nb_vertices; n++) { - // v = &_vertices[n]; - // for(e = v->leaving_edges; e; e = e->next_leaving_edge) { - // d = v->distance_from_source + e->positivized_length; - // tv = e->terminal_vertex; - // if(d < tv->distance_from_source) { - // tv->distance_from_source = d; - // tv->best_pred_edge_to_source = e; - // if(tv->iteration < iteration) { - // _new_front[_new_front_size++] = tv; - // tv->iteration = iteration; - // } - // } - // } - // } - for(int f = 0; f < _front_size; f++) { v = _front[f]; for(e = v->leaving_edges; e; e = e->next_leaving_edge) { @@ -288,19 +263,6 @@ void MTPGraph::find_shortest_path(Vertex **_front, Vertex **_new_front) { _new_front_size = _front_size; _front_size = tmp_front_size; } while(_front_size > 0); - -#ifdef VERBOSE - scalar_t min_delta = 0, delta; - for(int k = 0; k < _nb_edges; k++) { - Edge *e = _edges + k; - // d = e->origin_vertex->distance_from_source + e->positivized_length; - // if(d > e->terminal_vertex->distance_from_source) { abort(); } - delta = e->positivized_length + - (e->origin_vertex->distance_from_source - e->terminal_vertex->distance_from_source); - min_delta = min(delta, min_delta); - } - cout << "min_delta = " << delta << endl; -#endif } void MTPGraph::find_best_paths(scalar_t *lengths) {