Changeset 1158:29961fa390a3 in lemon-0.x for src/lemon/iterable_graph_extender.h

Timestamp:

02/20/05 02:02:07 (20 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

Graph and UndirGraph? concept modifications.

• For incidence iterators ({In,Out,Inc}EdgeIt?) there is now baseNode and runningNode functions in graph interface
• For Edge in undir graphs: Edge(UndirGraph? const &, UndirEdge?, Node) constructor. Same for IncEdgeIt?
• Edge(UndirEdge?, bool) constructor is no more in the public interface. (But we need it in the developpers interface).

File:

• src/lemon/iterable_graph_extender.h (modified) (5 diffs)

src/lemon/iterable_graph_extender.h

@@ -111 +111 @@
     };
 
+    /// Base node of the iterator
+    ///
+    /// Returns the base node (ie. the source in this case) of the iterator
+    ///
+    /// \todo Document in the concept!
+    Node baseNode(const OutEdgeIt &e) const {
+      return source(e);
+    }
+    /// Running node of the iterator
+    ///
+    /// Returns the running node (ie. the target in this case) of the
+    /// iterator
+    ///
+    /// \todo Document in the concept!
+    Node runningNode(const OutEdgeIt &e) const {
+      return target(e);
+    }
+
+    /// Base node of the iterator
+    ///
+    /// Returns the base node (ie. the target in this case) of the iterator
+    ///
+    /// \todo Document in the concept!
+    Node baseNode(const InEdgeIt &e) const {
+      return target(e);
+    }
+    /// Running node of the iterator
+    ///
+    /// Returns the running node (ie. the source in this case) of the
+    /// iterator
+    ///
+    /// \todo Document in the concept!
+    Node runningNode(const InEdgeIt &e) const {
+      return source(e);
+    }
+
     using Parent::first;
 
@@ -125 +161 @@
 
   };
+
+
+
+
+
   
   template <typename _Base>
@@ -170 +211 @@
       IncEdgeIt(Invalid i) : UndirEdge(i), forward(false) { }
 
-      explicit IncEdgeIt(const Graph& _graph, const Node &n)
+      IncEdgeIt(const Graph& _graph, const Node &n)
         : graph(&_graph)
       {
@@ -176 +217 @@
       }
 
-      // FIXME: Do we need this type of constructor here?
-      // IncEdgeIt(const Graph& _graph, const Edge& e) : 
-      //   UndirEdge(e), graph(&_graph), forward(_graph.forward(e)) { }
-      // or
-      // IncEdgeIt(const Graph& _graph, const Node& n,
-      //    Const UndirEdge &e) ... ?
+      IncEdgeIt(const Graph& _graph, const UndirEdge &ue, const Node &n)
+        : graph(&_graph), UndirEdge(ue)
+      {
+        forward = (_graph.source(ue) == n);
+      }
 
       IncEdgeIt& operator++() {
@@ -189 +229 @@
     };
 
-    Node source(const IncEdgeIt &e) const {
+    using Parent::baseNode;
+    using Parent::runningNode;
+
+    /// Base node of the iterator
+    ///
+    /// Returns the base node of the iterator
+    Node baseNode(const IncEdgeIt &e) const {
       return _dirSource(e);
     }
-
-    /// \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 IncEdgeIt &e) const {
+    /// Running node of the iterator
+    ///
+    /// Returns the running node of the iterator
+    Node runningNode(const IncEdgeIt &e) const {
       return _dirTarget(e);
     }
-
-    /// \todo Shouldn't the "target" of an undirected edge be called "bNode"
-    /// or something???
-    using Parent::target;
 
   };