LEMON/LEMON-official Changeset - r169:5b507a86ad72

Repositories » LEMON » LEMON-official

Changeset - r169:5b507a86ad72

« 168:8ceb31

170:91fb43 »

r169:5b507a86ad72

Sun, 15 Jun 2008 09:19:53

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Fix various rename bugs

0 3 0

default

3 files changed with 9 insertions and 11 deletions:

lemon/concepts/graph_components.h

lemon/dijkstra.h

lemon/graph_utils.h

↑ Collapse diff ↑

lemon/concepts/graph_components.h

Show inline comments

@@ -1424,8 +1424,8 @@
 		          checkConcept<Base, _Graph>();
 			  typename _Graph::Node node;
 			  graph.erase(node);
 			  typename _Graph::Arc arc;
 			  graph.erase(arc);
 			  typename _Graph::Edge edge;
 			  graph.erase(edge);
+			}
 			_Graph& graph;

lemon/dijkstra.h

Show inline comments

@@ -22,16 +22,14 @@
 		///\ingroup shortest_path
 		///\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>
 		#include <lemon/bits/invalid.h>
 		#include <lemon/error.h>
 		#include <lemon/maps.h>
 		namespace lemon {
 		  /// \brief Default OperationTraits for the Dijkstra algorithm class.

lemon/graph_utils.h

Show inline comments

@@ -402,10 +402,10 @@
 		          if (e == INVALID) {
 		            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);
+		          }
 		        } else {
@@ -415,7 +415,7 @@
 		            b = true;
 		            g.nextInc(e, b);
+		          }
-		          while (e != INVALID && (!b || g.target(e) != v)) {
+		          while (e != INVALID && (!b || g.v(e) != v)) {
 		            g.nextInc(e, b);
+		          }
+		        }
@@ -455,7 +455,7 @@
 		  /// }
 		  ///\endcode
 		  ///
-		  ///\sa ConArcIt
+		  ///\sa ConEdgeIt
 		  template <typename Graph>
 		  inline typename Graph::Edge
@@ -504,8 +504,8 @@
 		    ///
 		    /// 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;
+		    }
 		  private:

0 comments (0 inline)

RhodeCode