Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/edge_set.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/edge_set.h (modified) (9 diffs)

lemon/edge_set.h

@@ -87 +87 @@
     ListEdgeSetBase() : first_edge(-1), first_free_edge(-1) {} 
 
-    Edge addEdge(const Node& source, const Node& target) {
+    Edge addEdge(const Node& u, const Node& v) {
       int n;
       if (first_free_edge == -1) {
@@ -96 +96 @@
         first_free_edge = edges[first_free_edge].next_in;
       }
-      edges[n].next_in = (*nodes)[target].first_in;
-      if ((*nodes)[target].first_in != -1) {
-        edges[(*nodes)[target].first_in].prev_in = n;
-      }
-      (*nodes)[target].first_in = n;
-      edges[n].next_out = (*nodes)[source].first_out;
-      if ((*nodes)[source].first_out != -1) {
-        edges[(*nodes)[source].first_out].prev_out = n;
-      }
-      (*nodes)[source].first_out = n;
-      edges[n].source = source;
-      edges[n].target = target;
+      edges[n].next_in = (*nodes)[v].first_in;
+      if ((*nodes)[v].first_in != -1) {
+        edges[(*nodes)[v].first_in].prev_in = n;
+      }
+      (*nodes)[v].first_in = n;
+      edges[n].next_out = (*nodes)[u].first_out;
+      if ((*nodes)[u].first_out != -1) {
+        edges[(*nodes)[u].first_out].prev_out = n;
+      }
+      (*nodes)[u].first_out = n;
+      edges[n].source = u;
+      edges[n].target = v;
       return Edge(n);
     }
@@ -189 +189 @@
     int id(const Edge& edge) const { return edge.id; }
 
-    Node nodeFromId(int id) const { return graph->nodeFromId(id); }
-    Edge edgeFromId(int id) const { return Edge(id); }
+    Node nodeFromId(int ix) const { return graph->nodeFromId(ix); }
+    Edge edgeFromId(int ix) const { return Edge(ix); }
 
     int maxNodeId() const { return graph->maxNodeId(); };
@@ -294 +294 @@
       }
       virtual void erase(const std::vector<Node>& nodes) {
-        for (int i = 0; i < (int)nodes.size(); ++i) {
+        for (int i = 0; i < int(nodes.size()); ++i) {
           _edgeset.eraseNode(nodes[i]);
         }
@@ -383 +383 @@
       }
       virtual void erase(const std::vector<Node>& nodes) {
-        for (int i = 0; i < (int)nodes.size(); ++i) {
+        for (int i = 0; i < int(nodes.size()); ++i) {
           _edgeset.eraseNode(nodes[i]);
         }
@@ -461 +461 @@
     SmartEdgeSetBase() {} 
 
-    Edge addEdge(const Node& source, const Node& target) {
+    Edge addEdge(const Node& u, const Node& v) {
       int n = edges.size();
       edges.push_back(EdgeT());
-      edges[n].next_in = (*nodes)[target].first_in;
-      (*nodes)[target].first_in = n;
-      edges[n].next_out = (*nodes)[source].first_out;
-      (*nodes)[source].first_out = n;
-      edges[n].source = source;
-      edges[n].target = target;
+      edges[n].next_in = (*nodes)[v].first_in;
+      (*nodes)[v].first_in = n;
+      edges[n].next_out = (*nodes)[u].first_out;
+      (*nodes)[u].first_out = n;
+      edges[n].source = u;
+      edges[n].target = v;
       return Edge(n);
     }
@@ -517 +517 @@
     int id(const Edge& edge) const { return edge.id; }
 
-    Node nodeFromId(int id) const { return graph->nodeFromId(id); }
-    Edge edgeFromId(int id) const { return Edge(id); }
+    Node nodeFromId(int ix) const { return graph->nodeFromId(ix); }
+    Edge edgeFromId(int ix) const { return Edge(ix); }
 
     int maxNodeId() const { return graph->maxNodeId(); };
@@ -627 +627 @@
       virtual void erase(const std::vector<Node>& nodes) {
         try {
-          for (int i = 0; i < (int)nodes.size(); ++i) {
+          for (int i = 0; i < int(nodes.size()); ++i) {
             _edgeset.eraseNode(nodes[i]);
           }
@@ -732 +732 @@
       virtual void erase(const std::vector<Node>& nodes) {
         try {
-          for (int i = 0; i < (int)nodes.size(); ++i) {
+          for (int i = 0; i < int(nodes.size()); ++i) {
             _edgeset.eraseNode(nodes[i]);
           }