Changeset 962:1a770e9f80b2 in lemon-0.x for src/lemon/iterable_graph_extender.h

Timestamp:

11/05/04 01:31:49 (18 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

Undirect graph implementation.
Not yet done, untested.

File:

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

src/lemon/iterable_graph_extender.h

@@ -9 +9 @@
   template <typename _Base>
   class IterableGraphExtender : public _Base {
+  public:
 
     typedef _Base Parent;
     typedef IterableGraphExtender<_Base> Graph;
-
-  public:
 
     typedef typename Parent::Node Node;
@@ -27 +26 @@
       NodeIt(Invalid i) : Node(i) { }
 
-      explicit NodeIt(const Graph& _graph) : Node(), graph(&_graph) {
+      explicit NodeIt(const Graph& _graph) : graph(&_graph) {
         _graph.first(*static_cast<Node*>(this));
       }
@@ -50 +49 @@
       EdgeIt(Invalid i) : Edge(i) { }
 
-      explicit EdgeIt(const Graph& _graph) : Edge(), graph(&_graph) {
+      explicit EdgeIt(const Graph& _graph) : graph(&_graph) {
         _graph.first(*static_cast<Edge*>(this));
       }
@@ -74 +73 @@
 
       OutEdgeIt(const Graph& _graph, const Node& node) 
-        : Edge(), graph(&_graph) {
+        : graph(&_graph) {
         _graph.firstOut(*this, node);
       }
@@ -98 +97 @@
 
       InEdgeIt(const Graph& _graph, const Node& node) 
-        : Edge(), graph(&_graph) {
+        : graph(&_graph) {
         _graph.firstIn(*this, node);
       }
@@ -127 +126 @@
   };
   
+  template <typename _Base>
+  class IterableUndirGraphExtender : public IterableGraphExtender<_Base> {
+  public:
+
+    typedef IterableGraphExtender<_Base> Parent;
+    typedef IterableUndirGraphExtender<_Base> Graph;
+
+    typedef typename Parent::UndirEdge UndirEdge;
+
+    class UndirEdgeIt : public UndirEdge { 
+      const Graph* graph;
+    public:
+
+      UndirEdgeIt() { }
+
+      UndirEdgeIt(Invalid i) : UndirEdge(i) { }
+
+      explicit UndirEdgeIt(const Graph& _graph) : graph(&_graph) {
+        _graph.first(*static_cast<UndirEdge*>(this));
+      }
+
+      UndirEdgeIt(const Graph& _graph, const UndirEdge& e) : 
+        UndirEdge(e), graph(&_graph) { }
+
+      UndirEdgeIt& operator++() { 
+        graph->next(*this);
+        return *this; 
+      }
+
+    };
+
+
+  };
 }