Changeset 372:7b6466ed488a in lemon-main

Timestamp:

11/07/08 14:04:54 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Avoid bit operator precedence warning with gcc-4.3

Some of these warnings are actually revealed real bugs

Files:

• lemon/hypercube_graph.h (modified) (8 diffs)
• test/graph_test.cc (modified) (5 diffs)

lemon/hypercube_graph.h

@@ -51 +51 @@
       _dim = dim;
       _node_num = 1 << dim;
-      _edge_num = dim * (1 << dim-1);
+      _edge_num = dim * (1 << (dim-1));
     }
 
@@ -77 +77 @@
 
     Node u(Edge edge) const {
-      int base = edge._id & ((1 << _dim-1) - 1);
-      int k = edge._id >> _dim-1;
-      return ((base >> k) << k+1) | (base & ((1 << k) - 1));
+      int base = edge._id & ((1 << (_dim-1)) - 1);
+      int k = edge._id >> (_dim-1);
+      return ((base >> k) << (k+1)) | (base & ((1 << k) - 1));
     }
 
     Node v(Edge edge) const {
-      int base = edge._id & ((1 << _dim-1) - 1);
-      int k = edge._id >> _dim-1;
-      return ((base >> k) << k+1) | (base & ((1 << k) - 1)) | (1 << k);
+      int base = edge._id & ((1 << (_dim-1)) - 1);
+      int k = edge._id >> (_dim-1);
+      return ((base >> k) << (k+1)) | (base & ((1 << k) - 1)) | (1 << k);
     }
 
@@ -106 +106 @@
       for ( ; (d & 1) == 0; d >>= 1) ++k;
       if (d >> 1 != 0) return INVALID;
-      return (k << _dim-1) | ((u._id >> k+1) << k) | (u._id & ((1 << k) - 1));
+      return (k << (_dim-1)) | ((u._id >> (k+1)) << k) |
+        (u._id & ((1 << k) - 1));
     }
 
@@ -112 +113 @@
       Edge edge = findEdge(u, v, prev);
       if (edge == INVALID) return INVALID;
-      int k = edge._id >> _dim-1;
+      int k = edge._id >> (_dim-1);
       return ((u._id >> k) & 1) == 1 ? edge._id << 1 : (edge._id << 1) | 1;
     }
@@ -195 +196 @@
     void nextInc(Edge& edge, bool& dir) const {
       Node n = dir ? u(edge) : v(edge);
-      int k = (edge._id >> _dim-1) + 1;
+      int k = (edge._id >> (_dim-1)) + 1;
       if (k < _dim) {
-        edge._id = (k << _dim-1) |
-                   ((n._id >> k+1) << k) | (n._id & ((1 << k) - 1));
+        edge._id = (k << (_dim-1)) |
+          ((n._id >> (k+1)) << k) | (n._id & ((1 << k) - 1));
         dir = ((n._id >> k) & 1) == 0;
       } else {
@@ -214 +215 @@
       int k = (arc._id >> _dim) + 1;
       if (k < _dim) {
-        arc._id = (k << _dim-1) |
-                  ((n._id >> k+1) << k) | (n._id & ((1 << k) - 1));
+        arc._id = (k << (_dim-1)) |
+          ((n._id >> (k+1)) << k) | (n._id & ((1 << k) - 1));
         arc._id = (arc._id << 1) | (~(n._id >> k) & 1);
       } else {
@@ -230 +231 @@
       int k = (arc._id >> _dim) + 1;
       if (k < _dim) {
-        arc._id = (k << _dim-1) |
-                  ((n._id >> k+1) << k) | (n._id & ((1 << k) - 1));
+        arc._id = (k << (_dim-1)) |
+          ((n._id >> (k+1)) << k) | (n._id & ((1 << k) - 1));
         arc._id = (arc._id << 1) | ((n._id >> k) & 1);
       } else {
@@ -255 +256 @@
 
     int dimension(Edge edge) const {
-      return edge._id >> _dim-1;
+      return edge._id >> (_dim-1);
     }
 

test/graph_test.cc

@@ -322 +322 @@
   HypercubeGraph G(dim);
   checkGraphNodeList(G, 1 << dim);
-  checkGraphEdgeList(G, dim * (1 << dim-1));
+  checkGraphEdgeList(G, dim * (1 << (dim-1)));
   checkGraphArcList(G, dim * (1 << dim));
 
@@ -331 +331 @@
     for (IncEdgeIt e(G, n); e != INVALID; ++e) {
       check( (G.u(e) == n &&
-              G.id(G.v(e)) == G.id(n) ^ (1 << G.dimension(e))) ||
+              G.id(G.v(e)) == (G.id(n) ^ (1 << G.dimension(e)))) ||
              (G.v(e) == n &&
-              G.id(G.u(e)) == G.id(n) ^ (1 << G.dimension(e))),
+              G.id(G.u(e)) == (G.id(n) ^ (1 << G.dimension(e)))),
              "Wrong edge or wrong dimension");
     }
@@ -340 +340 @@
     for (OutArcIt a(G, n); a != INVALID; ++a) {
       check(G.source(a) == n &&
-            G.id(G.target(a)) == G.id(n) ^ (1 << G.dimension(a)),
+            G.id(G.target(a)) == (G.id(n) ^ (1 << G.dimension(a))),
             "Wrong arc or wrong dimension");
     }
@@ -347 +347 @@
     for (InArcIt a(G, n); a != INVALID; ++a) {
       check(G.target(a) == n &&
-            G.id(G.source(a)) == G.id(n) ^ (1 << G.dimension(a)),
+            G.id(G.source(a)) == (G.id(n) ^ (1 << G.dimension(a))),
             "Wrong arc or wrong dimension");
     }
@@ -353 +353 @@
 
   checkGraphConArcList(G, (1 << dim) * dim);
-  checkGraphConEdgeList(G, dim * (1 << dim-1));
+  checkGraphConEdgeList(G, dim * (1 << (dim-1)));
 
   checkArcDirections(G);