Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/bpugraph_adaptor.h

Timestamp:

03/02/07 19:04:28 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Hard Warning checking

• based on the remark of the ZIB user
• we do not use -Winline

File:

• lemon/bpugraph_adaptor.h (modified) (3 diffs)

lemon/bpugraph_adaptor.h

@@ -128 +128 @@
 
     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);
-    }
-    UEdge findUEdge(const Node& source, const Node& target, 
+      return graph->findEdge(u, v, prev);
+    }
+    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); 
     }
 
@@ -157 +157 @@
     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(); }
@@ -362 +362 @@
     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(); }