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

[Lemon SVN]

Author: marci
Date: Thu May 20 19:21:55 2004
New Revision: 852

Modified:
   hugo/trunk/src/work/marci/graph_concept.h
   hugo/trunk/src/work/marci/max_flow_demo.cc

Log:
misc


Modified: hugo/trunk/src/work/marci/graph_concept.h
==============================================================================
--- hugo/trunk/src/work/marci/graph_concept.h	(original)
+++ hugo/trunk/src/work/marci/graph_concept.h	Thu May 20 19:21:55 2004
@@ -456,12 +456,17 @@
     int edgeNum() const { return 0; }
   };
 
-  class FullFeatureGraphConcept : public NodeIterableGraphConcept,
-				  public EdgeIterableGraphConcept, 
-				  public OutEdgeIterableGraphConcept, 
-				  public InEdgeIterableGraphConcept {
+  class FullFeatureGraphConcept : virtual public NodeIterableGraphConcept,
+				  virtual public EdgeIterableGraphConcept, 
+				  virtual public OutEdgeIterableGraphConcept, 
+				  virtual public InEdgeIterableGraphConcept, 
+				  virtual public NodeCountingGraphConcept {
   public:
     FullFeatureGraphConcept() { }
+    using EdgeIterableGraphConcept::next;
+    using NodeIterableGraphConcept::next;
+    using OutEdgeIterableGraphConcept::next;    
+    using InEdgeIterableGraphConcept::next;
   };
   
   /// @}

Modified: hugo/trunk/src/work/marci/max_flow_demo.cc
==============================================================================
--- hugo/trunk/src/work/marci/max_flow_demo.cc	(original)
+++ hugo/trunk/src/work/marci/max_flow_demo.cc	Thu May 20 19:21:55 2004
@@ -66,6 +66,7 @@
 
 
   Graph g;
+
   Node s, t;
   Graph::EdgeMap<int> cap(g);
   //readDimacsMaxFlow(std::cin, g, s, t, cap);