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

Timestamp:

11/25/04 15:48:24 (19 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/iterable_graph_extender.h (modified) (2 diffs)

src/lemon/iterable_graph_extender.h

@@ -132 +132 @@
     typedef IterableGraphExtender<_Base> Parent;
     typedef IterableUndirGraphExtender<_Base> Graph;
+    typedef typename Parent::Node Node;
 
     typedef typename Parent::UndirEdge UndirEdge;
@@ -157 +158 @@
     };
 
+    class UndirIncEdgeIt : public UndirEdge { 
+      const Graph* graph;
+      bool forward;
+      friend class IterableUndirGraphExtender;
+      template <typename G>
+      friend class UndirGraphExtender;
+    public:
+
+      UndirIncEdgeIt() { }
+
+      UndirIncEdgeIt(Invalid i) : UndirEdge(i), forward(false) { }
+
+      explicit UndirIncEdgeIt(const Graph& _graph, const Node &n)
+        : graph(&_graph)
+      {
+        _graph._dirFirstOut(*this, n);
+      }
+
+      // FIXME: Do we need this type of constructor here?
+      // UndirIncEdgeIt(const Graph& _graph, const UndirEdge& e) : 
+      //   UndirEdge(e), graph(&_graph) { }
+
+      UndirIncEdgeIt& operator++() {
+        graph->_dirNextOut(*this);
+        return *this; 
+      }
+    };
+
+    Node source(const UndirIncEdgeIt &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 UndirIncEdgeIt &e) const {
+      return _dirTarget(e);
+    }
+
+    /// \todo Shouldn't the "target" of an undirected edge be called "bNode"
+    /// or something???
+    using Parent::target;
 
   };