Changeset 2231:06faf3f06d67 in lemon-0.x for lemon/smart_graph.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/smart_graph.h (modified) (5 diffs)

lemon/smart_graph.h

@@ -663 +663 @@
       return node.id >> 1;
     }
-    static Node fromANodeId(int id) {
+    static Node nodeFromANodeId(int id) {
       return Node(id << 1);
     }
@@ -673 +673 @@
       return node.id >> 1;
     }
-    static Node fromBNodeId(int id) {
+    static Node nodeFromBNodeId(int id) {
       return Node((id << 1) + 1);
     }
@@ -744 +744 @@
 
 
-  typedef BpUGraphExtender<SmartBpUGraphBase> ExtendedSmartBpUGraphBase;
+  typedef BpUGraphExtender<BidirBpUGraphExtender<SmartBpUGraphBase> >
+  ExtendedSmartBpUGraphBase;
 
   /// \ingroup graphs
@@ -830 +831 @@
       }
       while(s.anode_num<aNodes.size()) {
-        Node node = fromANodeId(aNodes.size() - 1);
+        Node node = nodeFromANodeId(aNodes.size() - 1);
         Parent::getNotifier(ANode()).erase(node);
         Parent::getNotifier(Node()).erase(node);
@@ -836 +837 @@
       }
       while(s.bnode_num<bNodes.size()) {
-        Node node = fromBNodeId(bNodes.size() - 1);
+        Node node = nodeFromBNodeId(bNodes.size() - 1);
         Parent::getNotifier(BNode()).erase(node);
         Parent::getNotifier(Node()).erase(node);