[Lemon-commits] [lemon_svn] marci: r423 - hugo/trunk/src/work/marci

[Lemon SVN]

Author: marci
Date: Mon Apr  5 19:25:40 2004
New Revision: 423

Modified:
   hugo/trunk/src/work/marci/edmonds_karp_demo.cc
   hugo/trunk/src/work/marci/graph_wrapper.h

Log:
.


Modified: hugo/trunk/src/work/marci/edmonds_karp_demo.cc
==============================================================================
--- hugo/trunk/src/work/marci/edmonds_karp_demo.cc	(original)
+++ hugo/trunk/src/work/marci/edmonds_karp_demo.cc	Mon Apr  5 19:25:40 2004
@@ -3,7 +3,7 @@
 #include <fstream>
 
 #include <list_graph.h>
-//#include <smart_graph.h>
+#include <smart_graph.h>
 #include <dimacs.h>
 #include <edmonds_karp.h>
 #include <time_measure.h>
@@ -39,8 +39,8 @@
 
   typedef ListGraph MutableGraph;
 
-  //typedef SmartGraph Graph;
-  typedef ListGraph Graph;
+  typedef SmartGraph Graph;
+  //typedef ListGraph Graph;
   typedef Graph::Node Node;
   typedef Graph::EdgeIt EdgeIt;
 

Modified: hugo/trunk/src/work/marci/graph_wrapper.h
==============================================================================
--- hugo/trunk/src/work/marci/graph_wrapper.h	(original)
+++ hugo/trunk/src/work/marci/graph_wrapper.h	Mon Apr  5 19:25:40 2004
@@ -714,7 +714,7 @@
       return e;
     }
 
-    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); }
 
     template< typename It > It first() const { 
@@ -1004,7 +1004,7 @@
       return e;
     }
    
-    NodeIt& next(NodeIt& n) const { return graph->next(n); }
+    NodeIt& next(NodeIt& n) const { graph->next(n); return n; }
 
     OutEdgeIt& next(OutEdgeIt& e) const { 
       if (e.out_or_in) {