Changeset 1021:fd1d073b6557 in lemon-0.x for src/lemon/undir_graph_extender.h

Timestamp:

11/25/04 15:48:24 (20 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

Advances in UndirGraph?.

• IterableExtender? is complete

File:

• src/lemon/undir_graph_extender.h (modified) (9 diffs)

src/lemon/undir_graph_extender.h

@@ -71 +71 @@
     }
 
-    /// Source of the given Edge.
-    Node source(const Edge &e) const {
+  protected:
+
+    template <typename E>
+    Node _dirSource(const E &e) const {
       return e.forward ? Parent::source(e) : Parent::target(e);
     }
 
+    template <typename E>
+    Node _dirTarget(const E &e) const {
+      return e.forward ? Parent::target(e) : Parent::source(e);
+    }
+
+  public:
     /// \todo Shouldn't the "source" of an undirected edge be called "aNode"
     /// or something???
     using Parent::source;
 
-    /// Target of the given Edge.
-    Node target(const Edge &e) const {
-      return e.forward ? Parent::target(e) : Parent::source(e);
+    /// Source of the given Edge.
+    Node source(const Edge &e) const {
+      return _dirSource(e);
     }
 
@@ -88 +96 @@
     /// or something???
     using Parent::target;
+
+    /// Target of the given Edge.
+    Node target(const Edge &e) const {
+      return _dirTarget(e);
+    }
 
     /// Returns whether the given directed edge is same orientation as the
@@ -123 +136 @@
     }
 
-    void firstOut(Edge &e, const Node &n) const {
+    
+  protected:
+
+    template <typename E>
+    void _dirFirstOut(E &e, const Node &n) const {
       Parent::firstOut(e,n);
       if( UndirEdge(e) != INVALID ) {
@@ -133 +150 @@
       }
     }
-    void firstIn(Edge &e, const Node &n) const {
+    template <typename E>
+    void _dirFirstIn(E &e, const Node &n) const {
       Parent::firstIn(e,n);
       if( UndirEdge(e) != INVALID ) {
@@ -144 +162 @@
     }
 
-    void nextOut(Edge &e) const {
+    template <typename E>
+    void _dirNextOut(E &e) const {
       if( e.forward ) {
         Parent::nextOut(e);
@@ -156 +175 @@
       }
     }
-    void nextIn(Edge &e) const {
+    template <typename E>
+    void _dirNextIn(E &e) const {
       if( e.forward ) {
         Parent::nextIn(e);
@@ -169 +189 @@
     }
 
+  public:
+
+    void firstOut(Edge &e, const Node &n) const {
+      _dirFirstOut(e, n);
+    }
+    void firstIn(Edge &e, const Node &n) const {
+      _dirFirstIn(e, n);
+    }
+
+    void nextOut(Edge &e) const {
+      _dirNextOut(e);
+    }
+    void nextIn(Edge &e) const {
+      _dirNextIn(e);
+    }
+
     // Miscellaneous stuff:
 
@@ -174 +210 @@
     /// Extender
 
-    using Parent::id;
+    // using Parent::id;
+    // Using "using" is not a good idea, cause it could be that there is
+    // no "id" in Parent...
+
+    int id(const Node &n) const {
+      return Parent::id(n);
+    }
+
+    int id(const UndirEdge &e) const {
+      return Parent::id(e);
+    }
 
     int id(const Edge &e) const {
@@ -180 +226 @@
     }
 
-    int maxId(Edge = INVALID) const {
+
+    int maxId(Node n) const {
+      return Parent::maxId(Node());
+    }
+
+    int maxId(Edge) const {
       return 2 * Parent::maxId(typename Parent::Edge()) + 1;
     }
-    int maxId(UndirEdge = INVALID) const {
+    int maxId(UndirEdge) const {
       return Parent::maxId(typename Parent::Edge());
     }