Changeset 1704:467d7927a901 in lemon-0.x for lemon/bits/iterable_graph_extender.h

Timestamp:

10/05/05 15:17:42 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

findUndirEdge, ConUndirEdgeIt?
some modification in the undir graph extenders

File:

• lemon/bits/iterable_graph_extender.h (modified) (3 diffs)

lemon/bits/iterable_graph_extender.h

@@ -217 +217 @@
     class IncEdgeIt : public Parent::UndirEdge { 
       const Graph* graph;
-      bool forward;
+      bool direction;
       friend class IterableUndirGraphExtender;
-      template <typename G>
-      friend class UndirGraphExtender;
     public:
 
       IncEdgeIt() { }
 
-      IncEdgeIt(Invalid i) : UndirEdge(i), forward(false) { }
-
-      IncEdgeIt(const Graph& _graph, const Node &n)
-        : graph(&_graph)
-      {
-        _graph._dirFirstOut(*this, n);
+      IncEdgeIt(Invalid i) : UndirEdge(i), direction(false) { }
+
+      IncEdgeIt(const Graph& _graph, const Node &n) : graph(&_graph) {
+        _graph.firstInc(*this, direction, n);
       }
 
       IncEdgeIt(const Graph& _graph, const UndirEdge &ue, const Node &n)
-        : graph(&_graph), UndirEdge(ue)
-      {
-        forward = (_graph.source(ue) == n);
+        : graph(&_graph), UndirEdge(ue) {
+        direction = (_graph.source(ue) == n);
       }
 
       IncEdgeIt& operator++() {
-        graph->_dirNextOut(*this);
+        graph->nextInc(*this, direction);
         return *this; 
       }
@@ -252 +247 @@
     /// Returns the base node of the iterator
     Node baseNode(const IncEdgeIt &e) const {
-      return _dirSource(e);
+      return e.direction ? source(e) : target(e);
     }
     /// Running node of the iterator
@@ -258 +253 @@
     /// Returns the running node of the iterator
     Node runningNode(const IncEdgeIt &e) const {
-      return _dirTarget(e);
+      return e.direction ? target(e) : source(e);
     }