1.1 --- a/lemon/bpugraph_adaptor.h	Tue Jul 22 11:20:06 2008 +0000
     1.2 +++ b/lemon/bpugraph_adaptor.h	Tue Jul 22 11:29:57 2008 +0000
     1.3 @@ -156,11 +156,11 @@
     1.4      int id(const Edge& e) const { return graph->id(e); }
     1.5      int id(const UEdge& e) const { return graph->id(e); }
     1.6  
     1.7 -    Node fromNodeId(int ix) const { return graph->fromNodeId(ix); }
     1.8 +    Node nodeFromId(int ix) const { return graph->nodeFromId(ix); }
     1.9      ANode nodeFromANodeId(int ix) const { return graph->nodeFromANodeId(ix); }
    1.10      BNode nodeFromBNodeId(int ix) const { return graph->nodeFromBNodeId(ix); }
    1.11 -    Edge fromEdgeId(int ix) const { return graph->fromEdgeId(ix); }
    1.12 -    UEdge fromUEdgeId(int ix) const { return graph->fromUEdgeId(ix); }
    1.13 +    Edge edgeFromId(int ix) const { return graph->edgeFromId(ix); }
    1.14 +    UEdge uEdgeFromId(int ix) const { return graph->uEdgeFromId(ix); }
    1.15  
    1.16      int maxNodeId() const { return graph->maxNodeId(); }
    1.17      int maxANodeId() const { return graph->maxANodeId(); }

     2.1 --- a/lemon/graph_adaptor.h	Tue Jul 22 11:20:06 2008 +0000
     2.2 +++ b/lemon/graph_adaptor.h	Tue Jul 22 11:29:57 2008 +0000
     2.3 @@ -113,12 +113,12 @@
     2.4      int id(const Node& v) const { return graph->id(v); }
     2.5      int id(const Edge& e) const { return graph->id(e); }
     2.6  
     2.7 -    Node fromNodeId(int ix) const {
     2.8 -      return graph->fromNodeId(ix);
     2.9 +    Node nodeFromId(int ix) const {
    2.10 +      return graph->nodeFromId(ix);
    2.11      }
    2.12  
    2.13 -    Edge fromEdgeId(int ix) const {
    2.14 -      return graph->fromEdgeId(ix);
    2.15 +    Edge edgeFromId(int ix) const {
    2.16 +      return graph->edgeFromId(ix);
    2.17      }
    2.18  
    2.19      int maxNodeId() const {

     3.1 --- a/lemon/ugraph_adaptor.h	Tue Jul 22 11:20:06 2008 +0000
     3.2 +++ b/lemon/ugraph_adaptor.h	Tue Jul 22 11:29:57 2008 +0000
     3.3 @@ -125,16 +125,16 @@
     3.4      int id(const Edge& e) const { return graph->id(e); }
     3.5      int id(const UEdge& e) const { return graph->id(e); }
     3.6  
     3.7 -    Node fromNodeId(int ix) const {
     3.8 -      return graph->fromNodeId(ix);
     3.9 +    Node nodeFromId(int ix) const {
    3.10 +      return graph->nodeFromId(ix);
    3.11      }
    3.12  
    3.13 -    Edge fromEdgeId(int ix) const {
    3.14 -      return graph->fromEdgeId(ix);
    3.15 +    Edge edgeFromId(int ix) const {
    3.16 +      return graph->edgeFromId(ix);
    3.17      }
    3.18  
    3.19 -    UEdge fromUEdgeId(int ix) const {
    3.20 -      return graph->fromUEdgeId(ix);
    3.21 +    UEdge uEdgeFromId(int ix) const {
    3.22 +      return graph->uEdgeFromId(ix);
    3.23      }
    3.24  
    3.25      int maxNodeId() const {