diff -r 096d83158d41 -r 81b47fc5c444 lemon/bpugraph_adaptor.h
--- a/lemon/bpugraph_adaptor.h	Fri Mar 02 17:56:22 2007 +0000
+++ b/lemon/bpugraph_adaptor.h	Fri Mar 02 18:04:28 2007 +0000
@@ -127,19 +127,19 @@
     int uEdgeNum() const { return graph->uEdgeNum(); }
 
     typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
-    Edge findEdge(const Node& source, const Node& target, 
+    Edge findEdge(const Node& u, const Node& v, 
 		  const Edge& prev = INVALID) {
-      return graph->findEdge(source, target, prev);
+      return graph->findEdge(u, v, prev);
     }
-    UEdge findUEdge(const Node& source, const Node& target, 
+    UEdge findUEdge(const Node& u, const Node& v, 
                     const UEdge& prev = INVALID) {
-      return graph->findUEdge(source, target, prev);
+      return graph->findUEdge(u, v, prev);
     }
   
     Node addANode() const { return graph->addANode(); }
     Node addBNode() const { return graph->addBNode(); }
-    UEdge addEdge(const Node& source, const Node& target) const { 
-      return graph->addEdge(source, target); 
+    UEdge addEdge(const Node& u, const Node& v) const { 
+      return graph->addEdge(u, v); 
     }
 
     void erase(const Node& i) const { graph->erase(i); }
@@ -156,11 +156,11 @@
     int id(const Edge& e) const { return graph->id(e); }
     int id(const UEdge& e) const { return graph->id(e); }
 
-    Node fromNodeId(int id) const { return graph->fromNodeId(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); }
+    Node fromNodeId(int ix) const { return graph->fromNodeId(ix); }
+    ANode nodeFromANodeId(int ix) const { return graph->nodeFromANodeId(ix); }
+    BNode nodeFromBNodeId(int ix) const { return graph->nodeFromBNodeId(ix); }
+    Edge fromEdgeId(int ix) const { return graph->fromEdgeId(ix); }
+    UEdge fromUEdgeId(int ix) const { return graph->fromUEdgeId(ix); }
 
     int maxNodeId() const { return graph->maxNodeId(); }
     int maxANodeId() const { return graph->maxANodeId(); }
@@ -361,8 +361,8 @@
     int id(const ANode& v) const { return Parent::id(v); }
     int id(const BNode& v) const { return Parent::id(v); }
 
-    ANode nodeFromANodeId(int id) const { return Parent::nodeFromBNodeId(id); }
-    BNode nodeFromBNodeId(int id) const { return Parent::nodeFromANodeId(id); }
+    ANode nodeFromANodeId(int ix) const { return Parent::nodeFromBNodeId(ix); }
+    BNode nodeFromBNodeId(int ix) const { return Parent::nodeFromANodeId(ix); }
 
     int maxANodeId() const { return Parent::maxBNodeId(); }
     int maxBNodeId() const { return Parent::maxANodeId(); }