Changeset 415:679e64913c5e in lemon-0.x for src/work/marci

Timestamp:

04/26/04 16:40:59 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

for igcc-3.4.0

Location:

src/work/marci

Files:

• bfs_iterator.h (modified) (1 diff)
• edmonds_karp_demo.cc (modified) (2 diffs)

src/work/marci/bfs_iterator.h

@@ -128 +128 @@
     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;

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>
@@ -38 +38 @@
   typedef ListGraph MutableGraph;
 
-//  typedef SmartGraph Graph;
-  typedef ListGraph Graph;
+  typedef SmartGraph Graph;
+  //  typedef ListGraph Graph;
   typedef Graph::Node Node;
   typedef Graph::EdgeIt EdgeIt;