Changeset 2357:5365600a7a5c in lemon-0.x

Timestamp:

02/11/07 17:34:51 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3160

Message:

Some bug fix
RevIt? => RevEdgeIt? renaming

Location:

lemon

Files:

• bits/path_dump.h (modified) (7 diffs)
• concepts/path.h (modified) (4 diffs)
• path.h (modified) (4 diffs)
• path_utils.h (modified) (2 diffs)

lemon/bits/path_dump.h

@@ +1 @@
+
 /* -*- C++ -*-
  *
@@ -50 +51 @@
     }
 
-    class RevIt {
+    class RevEdgeIt {
     public:
-      RevIt() {}
-      RevIt(Invalid) : path(0), current(INVALID) {}
-      RevIt(const PredMapPath& _path) 
+      RevEdgeIt() {}
+      RevEdgeIt(Invalid) : path(0), current(INVALID) {}
+      RevEdgeIt(const PredMapPath& _path) 
         : path(&_path), current(_path.target) {}
 
@@ -61 +62 @@
       }
 
-      RevIt& operator++() {
+      RevEdgeIt& operator++() {
         current = path->graph.source(path->predMap[current]);
         if (path->predMap[current] == INVALID) current = INVALID;
@@ -67 +68 @@
       }
 
-      bool operator==(const RevIt& e) const { 
+      bool operator==(const RevEdgeIt& e) const { 
         return current == e.current; 
       }
 
-      bool operator!=(const RevIt& e) const {
+      bool operator!=(const RevEdgeIt& e) const {
         return current != e.current; 
       }
 
-      bool operator<(const RevIt& e) const { 
+      bool operator<(const RevEdgeIt& e) const { 
         return current < e.current; 
       }
@@ -122 +123 @@
     }
 
-    class RevIt {
+    class RevEdgeIt {
     public:
-      RevIt() {}
-      RevIt(Invalid) : path(0), current(INVALID) {}
-      RevIt(const PredMatrixMapPath& _path) 
+      RevEdgeIt() {}
+      RevEdgeIt(Invalid) : path(0), current(INVALID) {}
+      RevEdgeIt(const PredMatrixMapPath& _path) 
         : path(&_path), current(_path.target) {}
 
@@ -133 +134 @@
       }
 
-      RevIt& operator++() {
+      RevEdgeIt& operator++() {
         current = 
           path->graph.source(path->predMatrixMap(path->source, current));
@@ -141 +142 @@
       }
 
-      bool operator==(const RevIt& e) const { 
+      bool operator==(const RevEdgeIt& e) const { 
         return current == e.current; 
       }
 
-      bool operator!=(const RevIt& e) const {
+      bool operator!=(const RevEdgeIt& e) const {
         return current != e.current; 
       }
 
-      bool operator<(const RevIt& e) const { 
+      bool operator<(const RevEdgeIt& e) const { 
         return current < e.current; 
       }

lemon/concepts/path.h

@@ -172 +172 @@
           int e = p.empty();
 
-          typename _Path::RevIt id, ii(INVALID), i(p);
+          typename _Path::RevEdgeIt id, ii(INVALID), i(p);
 
           ++i;
@@ -233 +233 @@
       ///
       /// If the RevPathTag is defined and true then reverse dumping
-      /// is provided in the path proxy. In this case instead of the
-      /// EdgeIt the RevIt iterator should be implemented in the
-      /// proxy.
+      /// is provided in the path dumper. In this case instead of the
+      /// EdgeIt the RevEdgeIt iterator should be implemented in the
+      /// dumper.
       typedef False RevPathTag;
 
@@ -269 +269 @@
       /// This class is used to iterate on the edges of the paths in
       /// reverse direction.
-      class RevIt {
+      class RevEdgeIt {
       public:
         /// Default constructor
-        RevIt() {}
+        RevEdgeIt() {}
         /// Invalid constructor
-        RevIt(Invalid) {}
+        RevEdgeIt(Invalid) {}
         /// Constructor for first edge
-        RevIt(const PathDumper &) {}
+        RevEdgeIt(const PathDumper &) {}
 
         /// Conversion to Edge
@@ -282 +282 @@
 
         /// Next edge
-        RevIt& operator++() {return *this;}
-
-        /// Comparison operator
-        bool operator==(const RevIt&) const {return true;}
-        /// Comparison operator
-        bool operator!=(const RevIt&) const {return true;}
+        RevEdgeIt& operator++() {return *this;}
+
+        /// Comparison operator
+        bool operator==(const RevEdgeIt&) const {return true;}
+        /// Comparison operator
+        bool operator!=(const RevEdgeIt&) const {return true;}
         /// Comparison operator
-        bool operator<(const RevIt&) const {return false;}
+        bool operator<(const RevEdgeIt&) const {return false;}
 
       };

lemon/path.h

@@ -218 +218 @@
       int len = path.length();
       head.reserve(len);
-      for (typename CPath::RevIt it(path); it != INVALID; ++it) {
+      for (typename CPath::RevEdgeIt it(path); it != INVALID; ++it) {
         head.push_back(it);
       }
@@ -376 +376 @@
       data.resize(len);
       int index = len;
-      for (typename CPath::RevIt it(path); it != INVALID; ++it) {
+      for (typename CPath::RevEdgeIt it(path); it != INVALID; ++it) {
         --index;
         data[index] = it;;
@@ -721 +721 @@
     template <typename CPath>
     void buildRev(const CPath& path) {
-      for (typename CPath::RevIt it(path); it != INVALID; ++it) {
+      for (typename CPath::RevEdgeIt it(path); it != INVALID; ++it) {
         addFront(it);
       }
@@ -882 +882 @@
       edges = new Edge[len];
       int index = len;
-      for (typename CPath::RevIt it(path); it != INVALID; ++it) {
+      for (typename CPath::RevEdgeIt it(path); it != INVALID; ++it) {
         --index;
         edges[index] = it;

lemon/path_utils.h

@@ -49 +49 @@
     struct PathCopySelector {
       static void copy(Target& target, const Source& source) {
-        source.clear();
+        target.clear();
         for (typename Source::EdgeIt it(source); it != INVALID; ++it) {
           target.addBack(it);
@@ -61 +61 @@
       typename enable_if<typename Source::RevPathTag, void>::type> {
       static void copy(Target& target, const Source& source) {
-        source.clear();
-        for (typename Source::RevIt it(source); it != INVALID; ++it) {
+        target.clear();
+        for (typename Source::RevEdgeIt it(source); it != INVALID; ++it) {
           target.addFront(it);
         }