1.1 --- a/lemon/bpugraph_adaptor.h	Fri Mar 02 17:56:22 2007 +0000
     1.2 +++ b/lemon/bpugraph_adaptor.h	Fri Mar 02 18:04:28 2007 +0000
     1.3 @@ -127,19 +127,19 @@
     1.4      int uEdgeNum() const { return graph->uEdgeNum(); }
     1.5  
     1.6      typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
     1.7 -    Edge findEdge(const Node& source, const Node& target, 
     1.8 +    Edge findEdge(const Node& u, const Node& v, 
     1.9  		  const Edge& prev = INVALID) {
    1.10 -      return graph->findEdge(source, target, prev);
    1.11 +      return graph->findEdge(u, v, prev);
    1.12      }
    1.13 -    UEdge findUEdge(const Node& source, const Node& target, 
    1.14 +    UEdge findUEdge(const Node& u, const Node& v, 
    1.15                      const UEdge& prev = INVALID) {
    1.16 -      return graph->findUEdge(source, target, prev);
    1.17 +      return graph->findUEdge(u, v, prev);
    1.18      }
    1.19    
    1.20      Node addANode() const { return graph->addANode(); }
    1.21      Node addBNode() const { return graph->addBNode(); }
    1.22 -    UEdge addEdge(const Node& source, const Node& target) const { 
    1.23 -      return graph->addEdge(source, target); 
    1.24 +    UEdge addEdge(const Node& u, const Node& v) const { 
    1.25 +      return graph->addEdge(u, v); 
    1.26      }
    1.27  
    1.28      void erase(const Node& i) const { graph->erase(i); }
    1.29 @@ -156,11 +156,11 @@
    1.30      int id(const Edge& e) const { return graph->id(e); }
    1.31      int id(const UEdge& e) const { return graph->id(e); }
    1.32  
    1.33 -    Node fromNodeId(int id) const { return graph->fromNodeId(id); }
    1.34 -    ANode nodeFromANodeId(int id) const { return graph->nodeFromANodeId(id); }
    1.35 -    BNode nodeFromBNodeId(int id) const { return graph->nodeFromBNodeId(id); }
    1.36 -    Edge fromEdgeId(int id) const { return graph->fromEdgeId(id); }
    1.37 -    UEdge fromUEdgeId(int id) const { return graph->fromUEdgeId(id); }
    1.38 +    Node fromNodeId(int ix) const { return graph->fromNodeId(ix); }
    1.39 +    ANode nodeFromANodeId(int ix) const { return graph->nodeFromANodeId(ix); }
    1.40 +    BNode nodeFromBNodeId(int ix) const { return graph->nodeFromBNodeId(ix); }
    1.41 +    Edge fromEdgeId(int ix) const { return graph->fromEdgeId(ix); }
    1.42 +    UEdge fromUEdgeId(int ix) const { return graph->fromUEdgeId(ix); }
    1.43  
    1.44      int maxNodeId() const { return graph->maxNodeId(); }
    1.45      int maxANodeId() const { return graph->maxANodeId(); }
    1.46 @@ -361,8 +361,8 @@
    1.47      int id(const ANode& v) const { return Parent::id(v); }
    1.48      int id(const BNode& v) const { return Parent::id(v); }
    1.49  
    1.50 -    ANode nodeFromANodeId(int id) const { return Parent::nodeFromBNodeId(id); }
    1.51 -    BNode nodeFromBNodeId(int id) const { return Parent::nodeFromANodeId(id); }
    1.52 +    ANode nodeFromANodeId(int ix) const { return Parent::nodeFromBNodeId(ix); }
    1.53 +    BNode nodeFromBNodeId(int ix) const { return Parent::nodeFromANodeId(ix); }
    1.54  
    1.55      int maxANodeId() const { return Parent::maxBNodeId(); }
    1.56      int maxBNodeId() const { return Parent::maxANodeId(); }