Changeset 1910:f95eea8c34b0 in lemon-0.x for lemon/bits/iterable_graph_extender.h

Timestamp:

01/26/06 17:24:40 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Bipartite => Bp
Upper => A
Lower => B

+ some bug fix

File:

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

lemon/bits/iterable_graph_extender.h

@@ -271 +271 @@
 
   template <typename _Base>
-  class IterableUBipartiteGraphExtender : public _Base {
+  class IterableBpUGraphExtender : public _Base {
   public:
     typedef _Base Parent;
-    typedef IterableUBipartiteGraphExtender Graph;
+    typedef IterableBpUGraphExtender Graph;
    
     typedef typename Parent::Node Node;
-    typedef typename Parent::UpperNode UpperNode;
-    typedef typename Parent::LowerNode LowerNode;
+    typedef typename Parent::ANode ANode;
+    typedef typename Parent::BNode BNode;
     typedef typename Parent::Edge Edge;
     typedef typename Parent::UEdge UEdge;
@@ -304 +304 @@
     };
 
-    class UpperNodeIt : public Node { 
-      friend class IterableUBipartiteGraphExtender;
-      const Graph* graph;
-    public:
-    
-      UpperNodeIt() { }
-    
-      UpperNodeIt(Invalid i) : Node(INVALID) { }
-    
-      explicit UpperNodeIt(const Graph& _graph) : graph(&_graph) {
-        graph->firstUpper(static_cast<Node&>(*this));
-      }
-
-      UpperNodeIt(const Graph& _graph, const Node& node) 
+    class ANodeIt : public Node { 
+      friend class IterableBpUGraphExtender;
+      const Graph* graph;
+    public:
+    
+      ANodeIt() { }
+    
+      ANodeIt(Invalid i) : Node(INVALID) { }
+    
+      explicit ANodeIt(const Graph& _graph) : graph(&_graph) {
+        graph->firstANode(static_cast<Node&>(*this));
+      }
+
+      ANodeIt(const Graph& _graph, const Node& node) 
         : Node(node), graph(&_graph) {}
     
-      UpperNodeIt& operator++() { 
-        graph->nextUpper(*this);
-        return *this; 
-      }
-    };
-
-    class LowerNodeIt : public Node { 
-      friend class IterableUBipartiteGraphExtender;
-      const Graph* graph;
-    public:
-    
-      LowerNodeIt() { }
-    
-      LowerNodeIt(Invalid i) : Node(INVALID) { }
-    
-      explicit LowerNodeIt(const Graph& _graph) : graph(&_graph) {
-        graph->firstLower(static_cast<Node&>(*this));
-      }
-
-      LowerNodeIt(const Graph& _graph, const Node& node) 
+      ANodeIt& operator++() { 
+        graph->nextANode(*this);
+        return *this; 
+      }
+    };
+
+    class BNodeIt : public Node { 
+      friend class IterableBpUGraphExtender;
+      const Graph* graph;
+    public:
+    
+      BNodeIt() { }
+    
+      BNodeIt(Invalid i) : Node(INVALID) { }
+    
+      explicit BNodeIt(const Graph& _graph) : graph(&_graph) {
+        graph->firstBNode(static_cast<Node&>(*this));
+      }
+
+      BNodeIt(const Graph& _graph, const Node& node) 
         : Node(node), graph(&_graph) {}
     
-      LowerNodeIt& operator++() { 
-        graph->nextLower(*this);
+      BNodeIt& operator++() { 
+        graph->nextBNode(*this);
         return *this; 
       }
@@ -349 +349 @@
 
     class EdgeIt : public Edge { 
-      friend class IterableUBipartiteGraphExtender;
+      friend class IterableBpUGraphExtender;
       const Graph* graph;
     public:
@@ -372 +372 @@
 
     class UEdgeIt : public UEdge { 
-      friend class IterableUBipartiteGraphExtender;
+      friend class IterableBpUGraphExtender;
       const Graph* graph;
     public:
@@ -394 +394 @@
 
     class OutEdgeIt : public Edge { 
-      friend class IterableUBipartiteGraphExtender;
+      friend class IterableBpUGraphExtender;
       const Graph* graph;
     public:
@@ -419 +419 @@
 
     class InEdgeIt : public Edge { 
-      friend class IterableUBipartiteGraphExtender;
+      friend class IterableBpUGraphExtender;
       const Graph* graph;
     public:
@@ -471 +471 @@
   
     class IncEdgeIt : public Parent::UEdge { 
-      friend class IterableUBipartiteGraphExtender;
+      friend class IterableBpUGraphExtender;
       const Graph* graph;
       bool direction;