Changeset 2231:06faf3f06d67 in lemon-0.x for lemon/bpugraph_adaptor.h

Timestamp:

10/03/06 13:46:39 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Some rearrangement of concepts and extenders
BpUGraph concepts and concept check test

File:

• lemon/bpugraph_adaptor.h (modified) (5 diffs)

lemon/bpugraph_adaptor.h

@@ -88 +88 @@
       graph->firstInc(i, d, n);
     }
+    void firstFromANode(UEdge& i, const Node& n) const {
+      graph->firstFromANode(i, n);
+    }
+    void firstFromBNode(UEdge& i, const Node& n) const {
+      graph->firstFromBNode(i, n);
+    }
 
     void next(Node& i) const { graph->next(i); }
@@ -97 +103 @@
     void nextOut(Edge& i) const { graph->nextOut(i); }
     void nextInc(UEdge &i, bool &d) const { graph->nextInc(i, d); }
+    void nextFromANode(UEdge& i) const { graph->nextFromANode(i); }
+    void nextFromBNode(UEdge& i) const { graph->nextFromBNode(i); }
 
     Node source(const UEdge& e) const { return graph->source(e); }
@@ -150 +158 @@
 
     Node fromNodeId(int id) const { return graph->fromNodeId(id); }
-    ANode fromANodeId(int id) const { return graph->fromANodeId(id); }
-    BNode fromBNodeId(int id) const { return graph->fromBNodeId(id); }
+    ANode nodeFromANodeId(int id) const { return graph->nodeFromANodeId(id); }
+    BNode nodeFromBNodeId(int id) const { return graph->nodeFromBNodeId(id); }
     Edge fromEdgeId(int id) const { return graph->fromEdgeId(id); }
     UEdge fromUEdgeId(int id) const { return graph->fromUEdgeId(id); }
@@ -341 +349 @@
     void nextBNode(Node& i) const { Parent::nextANode(i); }
 
+    void firstFromANode(UEdge& i, const Node& n) const {
+      Parent::firstFromBNode(i, n);
+    }
+    void firstFromBNode(UEdge& i, const Node& n) const {
+      Parent::firstFromANode(i, n);
+    }
+
+    void nextFromANode(UEdge& i) const { Parent::nextFromBNode(i); }
+    void nextFromBNode(UEdge& i) const { Parent::nextFromANode(i); }
+
     int id(const ANode& v) const { return Parent::id(v); }
     int id(const BNode& v) const { return Parent::id(v); }
 
-    ANode fromANodeId(int id) const { return Parent::fromBNodeId(id); }
-    BNode fromBNodeId(int id) const { return Parent::fromANodeId(id); }
+    ANode nodeFromANodeId(int id) const { return Parent::nodeFromBNodeId(id); }
+    BNode nodeFromBNodeId(int id) const { return Parent::nodeFromANodeId(id); }
 
     int maxANodeId() const { return Parent::maxBNodeId(); }
@@ -550 +568 @@
   /// the residual graph of the matching.
   template <typename _BpUGraph, 
-            typename _ANMatchingMap, typename _BNMatchingMap>
+            typename _ANMatchingMap = 
+            typename _BpUGraph::template ANodeMap<typename _BpUGraph::UEdge>, 
+            typename _BNMatchingMap =
+            typename _BpUGraph::template BNodeMap<typename _BpUGraph::UEdge> >
   class MatchingBpUGraphAdaptor 
     : public BpUGraphAdaptorExtender<