[Lemon-commits] deba: r3503 - lemon/trunk/lemon

[Lemon SVN]

Author: deba
Date: Tue Jul 22 13:29:57 2008
New Revision: 3503

Modified:
   lemon/trunk/lemon/bpugraph_adaptor.h
   lemon/trunk/lemon/graph_adaptor.h
   lemon/trunk/lemon/ugraph_adaptor.h

Log:
Backport bug fix for Id handling from hg changeset [e67acd83a9ca]



Modified: lemon/trunk/lemon/bpugraph_adaptor.h
==============================================================================
--- lemon/trunk/lemon/bpugraph_adaptor.h	(original)
+++ lemon/trunk/lemon/bpugraph_adaptor.h	Tue Jul 22 13:29:57 2008
@@ -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 ix) const { return graph->fromNodeId(ix); }
+    Node nodeFromId(int ix) const { return graph->nodeFromId(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); }
+    Edge edgeFromId(int ix) const { return graph->edgeFromId(ix); }
+    UEdge uEdgeFromId(int ix) const { return graph->uEdgeFromId(ix); }
 
     int maxNodeId() const { return graph->maxNodeId(); }
     int maxANodeId() const { return graph->maxANodeId(); }

Modified: lemon/trunk/lemon/graph_adaptor.h
==============================================================================
--- lemon/trunk/lemon/graph_adaptor.h	(original)
+++ lemon/trunk/lemon/graph_adaptor.h	Tue Jul 22 13:29:57 2008
@@ -113,12 +113,12 @@
     int id(const Node& v) const { return graph->id(v); }
     int id(const Edge& e) const { return graph->id(e); }
 
-    Node fromNodeId(int ix) const {
-      return graph->fromNodeId(ix);
+    Node nodeFromId(int ix) const {
+      return graph->nodeFromId(ix);
     }
 
-    Edge fromEdgeId(int ix) const {
-      return graph->fromEdgeId(ix);
+    Edge edgeFromId(int ix) const {
+      return graph->edgeFromId(ix);
     }
 
     int maxNodeId() const {

Modified: lemon/trunk/lemon/ugraph_adaptor.h
==============================================================================
--- lemon/trunk/lemon/ugraph_adaptor.h	(original)
+++ lemon/trunk/lemon/ugraph_adaptor.h	Tue Jul 22 13:29:57 2008
@@ -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 ix) const {
-      return graph->fromNodeId(ix);
+    Node nodeFromId(int ix) const {
+      return graph->nodeFromId(ix);
     }
 
-    Edge fromEdgeId(int ix) const {
-      return graph->fromEdgeId(ix);
+    Edge edgeFromId(int ix) const {
+      return graph->edgeFromId(ix);
     }
 
-    UEdge fromUEdgeId(int ix) const {
-      return graph->fromUEdgeId(ix);
+    UEdge uEdgeFromId(int ix) const {
+      return graph->uEdgeFromId(ix);
     }
 
     int maxNodeId() const {