Changeset 2617:5222a3c470ed in lemon-0.x

Timestamp:

07/22/08 13:29:57 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3502

Message:

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

Location:

lemon

Files:

• bpugraph_adaptor.h (modified) (1 diff)
• graph_adaptor.h (modified) (1 diff)
• ugraph_adaptor.h (modified) (1 diff)

lemon/bpugraph_adaptor.h

@@ -157 +157 @@
     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(); }

lemon/graph_adaptor.h

@@ -114 +114 @@
     int id(const Edge& e) const { return graph->id(e); }
 
-    Node fromNodeId(int ix) const {
-      return graph->fromNodeId(ix);
-    }
-
-    Edge fromEdgeId(int ix) const {
-      return graph->fromEdgeId(ix);
+    Node nodeFromId(int ix) const {
+      return graph->nodeFromId(ix);
+    }
+
+    Edge edgeFromId(int ix) const {
+      return graph->edgeFromId(ix);
     }
 

lemon/ugraph_adaptor.h

@@ -126 +126 @@
     int id(const UEdge& e) const { return graph->id(e); }
 
-    Node fromNodeId(int ix) const {
-      return graph->fromNodeId(ix);
-    }
-
-    Edge fromEdgeId(int ix) const {
-      return graph->fromEdgeId(ix);
-    }
-
-    UEdge fromUEdgeId(int ix) const {
-      return graph->fromUEdgeId(ix);
+    Node nodeFromId(int ix) const {
+      return graph->nodeFromId(ix);
+    }
+
+    Edge edgeFromId(int ix) const {
+      return graph->edgeFromId(ix);
+    }
+
+    UEdge uEdgeFromId(int ix) const {
+      return graph->uEdgeFromId(ix);
     }