diff -r 096d83158d41 -r 81b47fc5c444 lemon/ugraph_adaptor.h
--- a/lemon/ugraph_adaptor.h	Fri Mar 02 17:56:22 2007 +0000
+++ b/lemon/ugraph_adaptor.h	Fri Mar 02 18:04:28 2007 +0000
@@ -99,18 +99,18 @@
     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 addNode() const { return graph->addNode(); }
-    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); }
@@ -125,16 +125,16 @@
     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);
+    Node fromNodeId(int ix) const {
+      return graph->fromNodeId(ix);
     }
 
-    Edge fromEdgeId(int id) const {
-      return graph->fromEdgeId(id);
+    Edge fromEdgeId(int ix) const {
+      return graph->fromEdgeId(ix);
     }
 
-    UEdge fromUEdgeId(int id) const {
-      return graph->fromUEdgeId(id);
+    UEdge fromUEdgeId(int ix) const {
+      return graph->fromUEdgeId(ix);
     }
 
     int maxNodeId() const {
@@ -395,25 +395,25 @@
     typedef False EdgeNumTag;
 
     typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
-    Edge findEdge(const Node& source, const Node& target, 
+    Edge findEdge(const Node& u, const Node& v, 
 		  const Edge& prev = INVALID) {
-      if (!(*node_filter_map)[source] || !(*node_filter_map)[target]) {
+      if (!(*node_filter_map)[u] || !(*node_filter_map)[v]) {
         return INVALID;
       }
-      Edge edge = Parent::findEdge(source, target, prev);
+      Edge edge = Parent::findEdge(u, v, prev);
       while (edge != INVALID && !(*uedge_filter_map)[edge]) {
-        edge = Parent::findEdge(source, target, edge);
+        edge = Parent::findEdge(u, v, edge);
       }
       return edge;
     }
-    UEdge findUEdge(const Node& source, const Node& target, 
+    UEdge findUEdge(const Node& u, const Node& v, 
 		  const UEdge& prev = INVALID) {
-      if (!(*node_filter_map)[source] || !(*node_filter_map)[target]) {
+      if (!(*node_filter_map)[u] || !(*node_filter_map)[v]) {
         return INVALID;
       }
-      UEdge uedge = Parent::findUEdge(source, target, prev);
+      UEdge uedge = Parent::findUEdge(u, v, prev);
       while (uedge != INVALID && !(*uedge_filter_map)[uedge]) {
-        uedge = Parent::findUEdge(source, target, uedge);
+        uedge = Parent::findUEdge(u, v, uedge);
       }
       return uedge;
     }
@@ -428,10 +428,10 @@
       typedef SubMapExtender<Adaptor, typename Parent::
                              template NodeMap<_Value> > Parent;
     
-      NodeMap(const Graph& graph) 
-	: Parent(graph) {}
-      NodeMap(const Graph& graph, const _Value& value) 
-	: Parent(graph, value) {}
+      NodeMap(const Graph& g) 
+	: Parent(g) {}
+      NodeMap(const Graph& g, const _Value& v) 
+	: Parent(g, v) {}
     
       NodeMap& operator=(const NodeMap& cmap) {
 	return operator=<NodeMap>(cmap);
@@ -454,10 +454,10 @@
       typedef SubMapExtender<Adaptor, typename Parent::
                              template EdgeMap<_Value> > Parent;
     
-      EdgeMap(const Graph& graph) 
-	: Parent(graph) {}
-      EdgeMap(const Graph& graph, const _Value& value) 
-	: Parent(graph, value) {}
+      EdgeMap(const Graph& g) 
+	: Parent(g) {}
+      EdgeMap(const Graph& g, const _Value& v) 
+	: Parent(g, v) {}
     
       EdgeMap& operator=(const EdgeMap& cmap) {
 	return operator=<EdgeMap>(cmap);
@@ -480,10 +480,10 @@
       typedef SubMapExtender<Adaptor, typename Parent::
                              template UEdgeMap<_Value> > Parent;
     
-      UEdgeMap(const Graph& graph) 
-	: Parent(graph) {}
-      UEdgeMap(const Graph& graph, const _Value& value) 
-	: Parent(graph, value) {}
+      UEdgeMap(const Graph& g) 
+	: Parent(g) {}
+      UEdgeMap(const Graph& g, const _Value& v) 
+	: Parent(g, v) {}
     
       UEdgeMap& operator=(const UEdgeMap& cmap) {
 	return operator=<UEdgeMap>(cmap);
@@ -622,19 +622,19 @@
     typedef False EdgeNumTag;
 
     typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
-    Edge findEdge(const Node& source, const Node& target, 
+    Edge findEdge(const Node& u, const Node& v, 
 		  const Edge& prev = INVALID) {
-      Edge edge = Parent::findEdge(source, target, prev);
+      Edge edge = Parent::findEdge(u, v, prev);
       while (edge != INVALID && !(*uedge_filter_map)[edge]) {
-        edge = Parent::findEdge(source, target, edge);
+        edge = Parent::findEdge(u, v, edge);
       }
       return edge;
     }
-    UEdge findUEdge(const Node& source, const Node& target, 
+    UEdge findUEdge(const Node& u, const Node& v, 
 		  const UEdge& prev = INVALID) {
-      UEdge uedge = Parent::findUEdge(source, target, prev);
+      UEdge uedge = Parent::findUEdge(u, v, prev);
       while (uedge != INVALID && !(*uedge_filter_map)[uedge]) {
-        uedge = Parent::findUEdge(source, target, uedge);
+        uedge = Parent::findUEdge(u, v, uedge);
       }
       return uedge;
     }
@@ -649,10 +649,10 @@
       typedef SubMapExtender<Adaptor, typename Parent::
                              template NodeMap<_Value> > Parent;
     
-      NodeMap(const Graph& graph) 
-	: Parent(graph) {}
-      NodeMap(const Graph& graph, const _Value& value) 
-	: Parent(graph, value) {}
+      NodeMap(const Graph& g) 
+	: Parent(g) {}
+      NodeMap(const Graph& g, const _Value& v) 
+	: Parent(g, v) {}
     
       NodeMap& operator=(const NodeMap& cmap) {
 	return operator=<NodeMap>(cmap);
@@ -675,10 +675,10 @@
       typedef SubMapExtender<Adaptor, typename Parent::
                              template EdgeMap<_Value> > Parent;
     
-      EdgeMap(const Graph& graph) 
-	: Parent(graph) {}
-      EdgeMap(const Graph& graph, const _Value& value) 
-	: Parent(graph, value) {}
+      EdgeMap(const Graph& g) 
+	: Parent(g) {}
+      EdgeMap(const Graph& g, const _Value& v) 
+	: Parent(g, v) {}
     
       EdgeMap& operator=(const EdgeMap& cmap) {
 	return operator=<EdgeMap>(cmap);
@@ -701,10 +701,10 @@
       typedef SubMapExtender<Adaptor, typename Parent::
                              template UEdgeMap<_Value> > Parent;
     
-      UEdgeMap(const Graph& graph) 
-	: Parent(graph) {}
-      UEdgeMap(const Graph& graph, const _Value& value) 
-	: Parent(graph, value) {}
+      UEdgeMap(const Graph& g) 
+	: Parent(g) {}
+      UEdgeMap(const Graph& g, const _Value& v) 
+	: Parent(g, v) {}
     
       UEdgeMap& operator=(const UEdgeMap& cmap) {
 	return operator=<UEdgeMap>(cmap);
@@ -943,20 +943,20 @@
     int edgeNum() 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) {
       Edge edge = prev;
       bool d = edge == INVALID ? true : (*direction)[edge];
       if (d) {
-        edge = graph->findUEdge(source, target, edge);
+        edge = graph->findUEdge(u, v, edge);
         while (edge != INVALID && !(*direction)[edge]) {
-          graph->findUEdge(source, target, edge);
+          graph->findUEdge(u, v, edge);
         }
         if (edge != INVALID) return edge;
       }
-      graph->findUEdge(target, source, edge);
+      graph->findUEdge(v, u, edge);
       while (edge != INVALID && (*direction)[edge]) {
-        graph->findUEdge(source, target, edge);
+        graph->findUEdge(u, v, edge);
       }
       return edge;
     }
@@ -965,9 +965,9 @@
       return Node(graph->addNode()); 
     }
 
-    Edge addEdge(const Node& source, const Node& target) const {
-      Edge edge = graph->addEdge(source, target);
-      direction->set(edge, graph->source(edge) == source);
+    Edge addEdge(const Node& u, const Node& v) const {
+      Edge edge = graph->addEdge(u, v);
+      direction->set(edge, graph->source(edge) == u);
       return edge; 
     }