Changeset 305:6720705c9095 in lemon-0.x for src/work

Timestamp:

04/05/04 19:25:40 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

.

Location:

src/work/marci

Files:

• edmonds_karp_demo.cc (modified) (2 diffs)
• graph_wrapper.h (modified) (2 diffs)

src/work/marci/edmonds_karp_demo.cc

@@ -4 +4 @@
 
 #include <list_graph.h>
-//#include <smart_graph.h>
+#include <smart_graph.h>
 #include <dimacs.h>
 #include <edmonds_karp.h>
@@ -40 +40 @@
   typedef ListGraph MutableGraph;
 
-  //typedef SmartGraph Graph;
-  typedef ListGraph Graph;
+  typedef SmartGraph Graph;
+  //typedef ListGraph Graph;
   typedef Graph::Node Node;
   typedef Graph::EdgeIt EdgeIt;

src/work/marci/graph_wrapper.h

@@ -715 +715 @@
     }
 
-    template<typename I> I& next(I &i) const { return graph->next(i); }    
+    template<typename I> I& next(I &i) const { graph->next(i); return i; }    
 //    template<typename I> I getNext(const I& i) const { return gw.getNext(i); }
 
@@ -1005 +1005 @@
     }
    
-    NodeIt& next(NodeIt& n) const { return graph->next(n); }
+    NodeIt& next(NodeIt& n) const { graph->next(n); return n; }
 
     OutEdgeIt& next(OutEdgeIt& e) const {