lemon/euler.h
changeset 1909 2d806130e700
parent 1875 98698b69a902
child 1956 a055123339d5
     1.1 --- a/lemon/euler.h	Thu Jan 26 06:44:22 2006 +0000
     1.2 +++ b/lemon/euler.h	Thu Jan 26 15:42:13 2006 +0000
     1.3 @@ -124,18 +124,18 @@
     1.4    ///the following code will print the edge IDs according to an
     1.5    ///Euler tour of \c g.
     1.6    ///\code
     1.7 -  ///  for(UndirEulerIt<UndirListGraph> e(g),e!=INVALID;++e) {
     1.8 -  ///    std::cout << g.id(UndirEdge(e)) << std::eol;
     1.9 +  ///  for(UEulerIt<ListUGraph> e(g),e!=INVALID;++e) {
    1.10 +  ///    std::cout << g.id(UEdge(e)) << std::eol;
    1.11    ///  }
    1.12    ///\endcode
    1.13    ///Although the iterator provides an Euler tour of an undirected graph,
    1.14 -  ///in order to indicate the direction of the tour, UndirEulerIt
    1.15 +  ///in order to indicate the direction of the tour, UEulerIt
    1.16    ///returns directed edges (that convert to the undirected ones, of course).
    1.17    ///
    1.18    ///If \c g is not Euler then the resulted tour will not be full or closed.
    1.19    ///\todo Test required
    1.20    template<class Graph>
    1.21 -  class UndirEulerIt
    1.22 +  class UEulerIt
    1.23    {
    1.24      typedef typename Graph::Node Node;
    1.25      typedef typename Graph::NodeIt NodeIt;
    1.26 @@ -146,7 +146,7 @@
    1.27      
    1.28      const Graph &g;
    1.29      typename Graph::NodeMap<OutEdgeIt> nedge;
    1.30 -    typename Graph::UndirEdgeMap<bool> visited;
    1.31 +    typename Graph::UEdgeMap<bool> visited;
    1.32      std::list<Edge> euler;
    1.33  
    1.34    public:
    1.35 @@ -156,7 +156,7 @@
    1.36      ///\param _g An undirected graph.
    1.37      ///\param start The starting point of the tour. If it is not given
    1.38      ///       the tour will start from the first node.
    1.39 -    UndirEulerIt(const Graph &_g,typename Graph::Node start=INVALID)
    1.40 +    UEulerIt(const Graph &_g,typename Graph::Node start=INVALID)
    1.41        : g(_g), nedge(g), visited(g,false)
    1.42      {
    1.43        if(start==INVALID) start=NodeIt(g);
    1.44 @@ -175,7 +175,7 @@
    1.45      bool operator!=(Invalid) { return !euler.empty(); }
    1.46      
    1.47      ///Next edge of the tour
    1.48 -    UndirEulerIt &operator++() {
    1.49 +    UEulerIt &operator++() {
    1.50        Node s=g.target(euler.front());
    1.51        euler.pop_front();
    1.52        typename std::list<Edge>::iterator next=euler.begin();
    1.53 @@ -196,7 +196,7 @@
    1.54      ///Postfix incrementation
    1.55      
    1.56      ///\warning This incrementation
    1.57 -    ///returns an \c Edge, not an \ref UndirEulerIt, as one may
    1.58 +    ///returns an \c Edge, not an \ref UEulerIt, as one may
    1.59      ///expect.
    1.60      Edge operator++(int) 
    1.61      {
    1.62 @@ -224,7 +224,7 @@
    1.63  #ifdef DOXYGEN
    1.64    bool
    1.65  #else
    1.66 -  typename enable_if<typename Graph::UndirTag,bool>::type
    1.67 +  typename enable_if<typename Graph::UTag,bool>::type
    1.68    euler(const Graph &g) 
    1.69    {
    1.70      for(typename Graph::NodeIt n(g);n!=INVALID;++n)
    1.71 @@ -232,7 +232,7 @@
    1.72      return connected(g);
    1.73    }
    1.74    template<class Graph>
    1.75 -  typename disable_if<typename Graph::UndirTag,bool>::type
    1.76 +  typename disable_if<typename Graph::UTag,bool>::type
    1.77  #endif
    1.78    euler(const Graph &g) 
    1.79    {