Changeset 256:c760d691fe3c in lemon-main

Timestamp:

09/02/08 22:27:19 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Children:

258:0310c8984732, 334:ada5f74d1c9e

Phase:

public

Message:

Bug fix + doc improvement in UndirDigraphExtender? (ticket #141)

File:

• lemon/bits/base_extender.h (modified) (4 diffs)

lemon/bits/base_extender.h

@@ -60 +60 @@
       Arc() {}
 
-      /// Invalid arc constructor
+      // Invalid arc constructor
       Arc(Invalid i) : Edge(i), forward(true) {}
 
@@ -75 +75 @@
     };
 
-
-
-    using Parent::source;
-
-    /// Source of the given Arc.
+    /// First node of the edge
+    Node u(const Edge &e) const {
+      return Parent::source(e);
+    }
+
+    /// Source of the given arc
     Node source(const Arc &e) const {
       return e.forward ? Parent::source(e) : Parent::target(e);
     }
 
-    using Parent::target;
-
-    /// Target of the given Arc.
+    /// Second node of the edge
+    Node v(const Edge &e) const {
+      return Parent::target(e);
+    }
+
+    /// Target of the given arc
     Node target(const Arc &e) const {
       return e.forward ? Parent::target(e) : Parent::source(e);
@@ -93 +97 @@
     /// \brief Directed arc from an edge.
     ///
-    /// Returns a directed arc corresponding to the specified Edge.
-    /// If the given bool is true the given edge and the
-    /// returned arc have the same source node.
-    static Arc direct(const Edge &ue, bool d) {
-      return Arc(ue, d);
-    }
-
-    /// Returns whether the given directed arc is same orientation as the
-    /// corresponding edge.
+    /// Returns a directed arc corresponding to the specified edge.
+    /// If the given bool is true, the first node of the given edge and
+    /// the source node of the returned arc are the same.
+    static Arc direct(const Edge &e, bool d) {
+      return Arc(e, d);
+    }
+
+    /// Returns whether the given directed arc has the same orientation
+    /// as the corresponding edge.
     ///
     /// \todo reference to the corresponding point of the undirected digraph
     /// concept. "What does the direction of an edge mean?"
-    static bool direction(const Arc &e) { return e.forward; }
-
+    static bool direction(const Arc &a) { return a.forward; }
 
     using Parent::first;
@@ -229 +232 @@
       return Parent::maxArcId();
     }
-
 
     int arcNum() const {