Fix various rename bugs
authorPeter Kovacs <kpeter@inf.elte.hu>
Sun, 15 Jun 2008 09:19:53 +0200
changeset 1695b507a86ad72
parent 168 8ceb318224b1
child 170 91fb4372688f
Fix various rename bugs
lemon/concepts/graph_components.h
lemon/dijkstra.h
lemon/graph_utils.h
     1.1 --- a/lemon/concepts/graph_components.h	Sat Jun 14 19:52:08 2008 +0200
     1.2 +++ b/lemon/concepts/graph_components.h	Sun Jun 15 09:19:53 2008 +0200
     1.3 @@ -1424,8 +1424,8 @@
     1.4            checkConcept<Base, _Graph>();
     1.5  	  typename _Graph::Node node;
     1.6  	  graph.erase(node);
     1.7 -	  typename _Graph::Arc arc;
     1.8 -	  graph.erase(arc);
     1.9 +	  typename _Graph::Edge edge;
    1.10 +	  graph.erase(edge);
    1.11  	}
    1.12  
    1.13  	_Graph& graph;
     2.1 --- a/lemon/dijkstra.h	Sat Jun 14 19:52:08 2008 +0200
     2.2 +++ b/lemon/dijkstra.h	Sun Jun 15 09:19:53 2008 +0200
     2.3 @@ -22,16 +22,14 @@
     2.4  ///\ingroup shortest_path
     2.5  ///\file
     2.6  ///\brief Dijkstra algorithm.
     2.7 -///
     2.8  
     2.9 -#include <lemon/list_digraph.h>
    2.10 +#include <lemon/list_graph.h>
    2.11  #include <lemon/bin_heap.h>
    2.12  #include <lemon/bits/path_dump.h>
    2.13  #include <lemon/bits/invalid.h>
    2.14  #include <lemon/error.h>
    2.15  #include <lemon/maps.h>
    2.16  
    2.17 -
    2.18  namespace lemon {
    2.19  
    2.20    /// \brief Default OperationTraits for the Dijkstra algorithm class.
     3.1 --- a/lemon/graph_utils.h	Sat Jun 14 19:52:08 2008 +0200
     3.2 +++ b/lemon/graph_utils.h	Sun Jun 15 09:19:53 2008 +0200
     3.3 @@ -402,10 +402,10 @@
     3.4            if (e == INVALID) {
     3.5              g.firstInc(e, b, u);
     3.6            } else {
     3.7 -            b = g.source(e) == u;
     3.8 +            b = g.u(e) == u;
     3.9              g.nextInc(e, b);
    3.10            }
    3.11 -          while (e != INVALID && (b ? g.target(e) : g.source(e)) != v) {
    3.12 +          while (e != INVALID && (b ? g.v(e) : g.u(e)) != v) {
    3.13              g.nextInc(e, b);
    3.14            }
    3.15          } else {
    3.16 @@ -415,7 +415,7 @@
    3.17              b = true;
    3.18              g.nextInc(e, b);
    3.19            }
    3.20 -          while (e != INVALID && (!b || g.target(e) != v)) {
    3.21 +          while (e != INVALID && (!b || g.v(e) != v)) {
    3.22              g.nextInc(e, b);
    3.23            }
    3.24          }
    3.25 @@ -455,7 +455,7 @@
    3.26    /// }
    3.27    ///\endcode
    3.28    ///
    3.29 -  ///\sa ConArcIt
    3.30 +  ///\sa ConEdgeIt
    3.31  
    3.32    template <typename Graph>
    3.33    inline typename Graph::Edge 
    3.34 @@ -504,8 +504,8 @@
    3.35      ///
    3.36      /// It increments the iterator and gives back the next edge.
    3.37      ConEdgeIt& operator++() {
    3.38 -      Parent::operator=(findEdge(_graph, _graph.source(*this), 
    3.39 -				 _graph.target(*this), *this));
    3.40 +      Parent::operator=(findEdge(_graph, _graph.u(*this), 
    3.41 +				 _graph.v(*this), *this));
    3.42        return *this;
    3.43      }
    3.44    private: