[Lemon-commits] [lemon_svn] marci: r555 - in hugo/trunk/src: include work/marci

[Lemon SVN]

Author: marci
Date: Mon Apr 26 16:40:59 2004
New Revision: 555

Modified:
   hugo/trunk/src/include/smart_graph.h
   hugo/trunk/src/work/marci/bfs_iterator.h
   hugo/trunk/src/work/marci/edmonds_karp_demo.cc

Log:
for igcc-3.4.0


Modified: hugo/trunk/src/include/smart_graph.h
==============================================================================
--- hugo/trunk/src/include/smart_graph.h	(original)
+++ hugo/trunk/src/include/smart_graph.h	Mon Apr 26 16:40:59 2004
@@ -53,8 +53,8 @@
     protected:
       const SmartGraph* G; 
     public:
-      virtual void add(const Key k) = NULL;
-      virtual void erase(const Key k) = NULL;
+      virtual void add(const Key k) = 0;
+      virtual void erase(const Key k) = 0;
       DynMapBase(const SmartGraph &_G) : G(&_G) {}
       virtual ~DynMapBase() {}
       friend class SmartGraph;

Modified: hugo/trunk/src/work/marci/bfs_iterator.h
==============================================================================
--- hugo/trunk/src/work/marci/bfs_iterator.h	(original)
+++ hugo/trunk/src/work/marci/bfs_iterator.h	Mon Apr 26 16:40:59 2004
@@ -127,9 +127,10 @@
     }
     Bfs<Graph, ReachedMap, PredMap, DistMap> operator++() {
       Parent::operator++();
-      if (this->graph->valid(this->actual_edge) && this->b_node_newly_reached) {
-	pred.set(s, actual_edge);
-	dist.set(s, dist[this->aNode()]);
+      if (this->graph->valid(this->actual_edge) && this->b_node_newly_reached) 
+      {
+	pred.set(this->bNode(), this->actual_edge);
+	dist.set(this->bNode(), dist[this->aNode()]);
       }
       return *this;
     }

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 26 16:40:59 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>
@@ -37,8 +37,8 @@
 
   typedef ListGraph MutableGraph;
 
-//  typedef SmartGraph Graph;
-  typedef ListGraph Graph;
+  typedef SmartGraph Graph;
+  //  typedef ListGraph Graph;
   typedef Graph::Node Node;
   typedef Graph::EdgeIt EdgeIt;