From 4da44faa00bac671db47f2c2ba576b90664347eb Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Tue, 21 Aug 2012 15:29:53 -0700 Subject: [PATCH] Update. --- mtp.cc | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/mtp.cc b/mtp.cc index 88e6557..9fa61aa 100644 --- a/mtp.cc +++ b/mtp.cc @@ -168,24 +168,20 @@ void Graph::find_shortest_path(Vertex **front, Vertex **new_front) { scalar_t d; #ifdef VERBOSE - cout << "find_shortest_path" << endl; -#endif - -#ifdef DEBUG scalar_t residual_error = 0.0; #endif for(int n = 0; n < nb_vertices; n++) { for(Edge *e = vertices[n].root_edge; e; e = e->next) { if(e->work_length < 0) { -#ifdef DEBUG +#ifdef VERBOSE residual_error -= e->work_length; #endif e->work_length = 0.0; } } } -#ifdef DEBUG - cout << "DEBUG residual_error " << residual_error << endl; +#ifdef VERBOSE + cout << "residual_error " << residual_error << endl; #endif for(int v = 0; v < nb_vertices; v++) { @@ -336,10 +332,10 @@ int main(int argc, char **argv) { source, sink, result_edge_occupation); - // dot_print(nb_vertices, nb_edges, - // vertex_from, vertex_to, edge_lengths, - // source, sink, - // result_edge_occupation); + dot_print(nb_vertices, nb_edges, + vertex_from, vertex_to, edge_lengths, + source, sink, + result_edge_occupation); delete[] result_edge_occupation; delete[] edge_lengths; -- 2.20.1