Changeset 169:5b507a86ad72 in lemon-main

Timestamp:

06/15/08 09:19:53 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Fix various rename bugs

Location:

lemon

Files:

• concepts/graph_components.h (modified) (1 diff)
• dijkstra.h (modified) (2 diffs)
• graph_utils.h (modified) (4 diffs)

lemon/concepts/graph_components.h

@@ -1425 +1425 @@
           typename _Graph::Node node;
           graph.erase(node);
-          typename _Graph::Arc arc;
-          graph.erase(arc);
+          typename _Graph::Edge edge;
+          graph.erase(edge);
         }
 

lemon/dijkstra.h

@@ -23 +23 @@
 ///\file
 ///\brief Dijkstra algorithm.
-///
-
-#include <lemon/list_digraph.h>
+
+#include <lemon/list_graph.h>
 #include <lemon/bin_heap.h>
 #include <lemon/bits/path_dump.h>
@@ -31 +30 @@
 #include <lemon/error.h>
 #include <lemon/maps.h>
-
 
 namespace lemon {

lemon/graph_utils.h

@@ -403 +403 @@
             g.firstInc(e, b, u);
           } else {
-            b = g.source(e) == u;
+            b = g.u(e) == u;
             g.nextInc(e, b);
           }
-          while (e != INVALID && (b ? g.target(e) : g.source(e)) != v) {
+          while (e != INVALID && (b ? g.v(e) : g.u(e)) != v) {
             g.nextInc(e, b);
           }
@@ -416 +416 @@
             g.nextInc(e, b);
           }
-          while (e != INVALID && (!b || g.target(e) != v)) {
+          while (e != INVALID && (!b || g.v(e) != v)) {
             g.nextInc(e, b);
           }
@@ -456 +456 @@
   ///\endcode
   ///
-  ///\sa ConArcIt
+  ///\sa ConEdgeIt
 
   template <typename Graph>
@@ -505 +505 @@
     /// It increments the iterator and gives back the next edge.
     ConEdgeIt& operator++() {
-      Parent::operator=(findEdge(_graph, _graph.source(*this), 
-                                 _graph.target(*this), *this));
+      Parent::operator=(findEdge(_graph, _graph.u(*this), 
+                                 _graph.v(*this), *this));
       return *this;
     }