lemon/smart_graph.h
changeset 2231 06faf3f06d67
parent 2190 dd887831e9c1
child 2256 b22dfb6c5ff3
     1.1 --- a/lemon/smart_graph.h	Tue Oct 03 11:24:41 2006 +0000
     1.2 +++ b/lemon/smart_graph.h	Tue Oct 03 11:46:39 2006 +0000
     1.3 @@ -662,7 +662,7 @@
     1.4      static int aNodeId(const Node& node) {
     1.5        return node.id >> 1;
     1.6      }
     1.7 -    static Node fromANodeId(int id) {
     1.8 +    static Node nodeFromANodeId(int id) {
     1.9        return Node(id << 1);
    1.10      }
    1.11      int maxANodeId() const {
    1.12 @@ -672,7 +672,7 @@
    1.13      static int bNodeId(const Node& node) {
    1.14        return node.id >> 1;
    1.15      }
    1.16 -    static Node fromBNodeId(int id) {
    1.17 +    static Node nodeFromBNodeId(int id) {
    1.18        return Node((id << 1) + 1);
    1.19      }
    1.20      int maxBNodeId() const {
    1.21 @@ -743,7 +743,8 @@
    1.22    };
    1.23  
    1.24  
    1.25 -  typedef BpUGraphExtender<SmartBpUGraphBase> ExtendedSmartBpUGraphBase;
    1.26 +  typedef BpUGraphExtender<BidirBpUGraphExtender<SmartBpUGraphBase> >
    1.27 +  ExtendedSmartBpUGraphBase;
    1.28  
    1.29    /// \ingroup graphs
    1.30    ///
    1.31 @@ -829,13 +830,13 @@
    1.32  	edges.pop_back();
    1.33        }
    1.34        while(s.anode_num<aNodes.size()) {
    1.35 -        Node node = fromANodeId(aNodes.size() - 1);
    1.36 +        Node node = nodeFromANodeId(aNodes.size() - 1);
    1.37  	Parent::getNotifier(ANode()).erase(node);
    1.38  	Parent::getNotifier(Node()).erase(node);
    1.39  	aNodes.pop_back();
    1.40        }
    1.41        while(s.bnode_num<bNodes.size()) {
    1.42 -        Node node = fromBNodeId(bNodes.size() - 1);
    1.43 +        Node node = nodeFromBNodeId(bNodes.size() - 1);
    1.44  	Parent::getNotifier(BNode()).erase(node);
    1.45  	Parent::getNotifier(Node()).erase(node);
    1.46  	bNodes.pop_back();