# HG changeset patch # User Peter Kovacs # Date 2008-06-15 09:19:53 # Node ID 5b507a86ad72b46839fb794077c82b0668914488 # Parent 8ceb318224b18d21c969ca15f98b31ced37aa0b5 Fix various rename bugs diff --git a/lemon/concepts/graph_components.h b/lemon/concepts/graph_components.h --- a/lemon/concepts/graph_components.h +++ b/lemon/concepts/graph_components.h @@ -1424,8 +1424,8 @@ checkConcept(); typename _Graph::Node node; graph.erase(node); - typename _Graph::Arc arc; - graph.erase(arc); + typename _Graph::Edge edge; + graph.erase(edge); } _Graph& graph; diff --git a/lemon/dijkstra.h b/lemon/dijkstra.h --- a/lemon/dijkstra.h +++ b/lemon/dijkstra.h @@ -22,16 +22,14 @@ ///\ingroup shortest_path ///\file ///\brief Dijkstra algorithm. -/// -#include +#include #include #include #include #include #include - namespace lemon { /// \brief Default OperationTraits for the Dijkstra algorithm class. diff --git a/lemon/graph_utils.h b/lemon/graph_utils.h --- a/lemon/graph_utils.h +++ b/lemon/graph_utils.h @@ -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 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: