Changeset 788:c3187cafcabf in lemon-0.x for src

Timestamp:

09/02/04 18:56:33 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1081

Message:

mincostflow_test is ok.

Location:

src

Files:

• hugo/mincostflows.h (modified) (4 diffs)
• hugo/minlengthpaths.h (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)

src/hugo/mincostflows.h

@@ -12 +12 @@
 #include <hugo/maps.h>
 #include <vector>
-#include <hugo/for_each_macros.h>
 
 namespace hugo {
@@ -117 +116 @@
       total_length = 0;
       
-      for(typename Graph::EdgeIt e=loopFirst(typename Graph::EdgeIt(), (G)); e!=INVALID; ++e){
-        flow.set(e,0);
-      }
+      for (typename Graph::EdgeIt e(G); e!=INVALID; ++e) flow.set(e, 0);
 
       //Initialize the potential to zero
-      for(typename Graph::NodeIt n=loopFirst(typename Graph::NodeIt(), (G)); n!=INVALID; ++n){
-        potential.set(n,0);
-      }
-      
-
+      for (typename Graph::NodeIt n(G); n!=INVALID; ++n) potential.set(n, 0);
+      
       
       //We need a residual graph
@@ -145 +139 @@
         
         //We have to change the potential
-        //#define FOR_EACH_LOC(Ittype, e, g) for(Ittype e=loopFirst(Ittype(), (g)); (g).valid(e); (g).next(e))
-        //FOR_EACH_LOC(typename ResGraphType::NodeIt, n, res_graph){
-        for(typename ResGraphType::NodeIt n=loopFirst(typename ResGraphType::NodeIt(), (res_graph)); n!=INVALID; ++n){
+        for(typename ResGraphType::NodeIt n(res_graph); n!=INVALID; ++n)
           potential[n] += dijkstra.distMap()[n];
-        }
 
 
@@ -198 +189 @@
       Length mod_pot;
       Length fl_e;
-        //#define FOR_EACH_LOC(Ittype, e, g) for(Ittype e=loopFirst(Ittype(), (g)); (g).valid(e); (g).next(e))
-        //FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
-        for(typename Graph::EdgeIt e=loopFirst(typename Graph::EdgeIt(), (G)); e!=INVALID; ++e){
+        for(typename Graph::EdgeIt e(G); e!=INVALID; ++e) {
         //C^{\Pi}_{i,j}
         mod_pot = length[e]-potential[G.head(e)]+potential[G.tail(e)];

src/hugo/minlengthpaths.h

@@ -13 +13 @@
 #include <vector>
 #include <hugo/mincostflows.h>
-#include <for_each_macros.h>
 
 namespace hugo {
@@ -84 +83 @@
       EdgeIntMap reversed(G); 
 
-      //FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
-      for(typename Graph::EdgeIt e=loopFirst(typename Graph::EdgeIt(), (G)); e!=INVALID; ++e){
+      for(typename Graph::EdgeIt e(G); e!=INVALID; ++e) 
         reversed[e] = mincost_flow.getFlow()[e];
-      }
       
       paths.clear();

src/test/Makefile.am

@@ -5 +5 @@
 check_PROGRAMS = graph_test dijkstra_test bfs_test dfs_test time_measure_test \
         error_test xy_test \
-        unionfind_test test_tools_pass test_tools_fail
+        unionfind_test test_tools_pass test_tools_fail \
+        minlengthpaths_test mincostflows_test
 
 TESTS = $(check_PROGRAMS)
@@ -20 +21 @@
 test_tools_pass_SOURCES = test_tools_pass.cc
 test_tools_fail_SOURCES = test_tools_fail.cc
+minlengthpaths_test_SOURCES = minlengthpaths_test.cc
+mincostflows_test_SOURCES = mincostflows_test.cc