[Lemon-commits] Alpar Juttner: Avoid bit operator precedence war...

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/7b6466ed488a
changeset: 385:7b6466ed488a
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Fri Nov 07 13:04:54 2008 +0000
description:
	Avoid bit operator precedence warning with gcc-4.3

	Some of these warnings are actually revealed real bugs

diffstat:

2 files changed, 24 insertions(+), 23 deletions(-)
lemon/hypercube_graph.h |   35 ++++++++++++++++++-----------------
test/graph_test.cc      |   12 ++++++------

diffs (143 lines):

diff -r 164fe3abc024 -r 7b6466ed488a lemon/hypercube_graph.h
--- a/lemon/hypercube_graph.h	Fri Nov 07 07:18:37 2008 +0000
+++ b/lemon/hypercube_graph.h	Fri Nov 07 13:04:54 2008 +0000
@@ -50,7 +50,7 @@
       LEMON_ASSERT(dim >= 1, "The number of dimensions must be at least 1.");
       _dim = dim;
       _node_num = 1 << dim;
-      _edge_num = dim * (1 << dim-1);
+      _edge_num = dim * (1 << (dim-1));
     }
 
   public:
@@ -76,15 +76,15 @@
     static int id(Arc arc) { return arc._id; }
 
     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);
     }
 
     Node source(Arc arc) const {
@@ -105,13 +105,14 @@
       if (d == 0) return INVALID;
       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));
     }
 
     Arc findArc(Node u, Node v, Arc prev = INVALID) const {
       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;
     }
 
@@ -194,10 +195,10 @@
 
     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 {
         edge._id = -1;
@@ -213,8 +214,8 @@
       Node n = (arc._id & 1) == 1 ? u(arc) : v(arc);
       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 {
         arc._id = -1;
@@ -229,8 +230,8 @@
       Node n = (arc._id & 1) == 1 ? v(arc) : u(arc);
       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 {
         arc._id = -1;
@@ -254,7 +255,7 @@
     }
 
     int dimension(Edge edge) const {
-      return edge._id >> _dim-1;
+      return edge._id >> (_dim-1);
     }
 
     int dimension(Arc arc) const {
diff -r 164fe3abc024 -r 7b6466ed488a test/graph_test.cc
--- a/test/graph_test.cc	Fri Nov 07 07:18:37 2008 +0000
+++ b/test/graph_test.cc	Fri Nov 07 13:04:54 2008 +0000
@@ -321,7 +321,7 @@
 
   HypercubeGraph G(dim);
   checkGraphNodeList(G, 1 << dim);
-  checkGraphEdgeList(G, dim * (1 << dim-1));
+  checkGraphEdgeList(G, dim * (1 << (dim-1)));
   checkGraphArcList(G, dim * (1 << dim));
 
   Node n = G.nodeFromId(dim);
@@ -330,29 +330,29 @@
     checkGraphIncEdgeList(G, n, dim);
     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");
     }
 
     checkGraphOutArcList(G, n, dim);
     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");
     }
 
     checkGraphInArcList(G, n, dim);
     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");
     }
   }
 
   checkGraphConArcList(G, (1 << dim) * dim);
-  checkGraphConEdgeList(G, dim * (1 << dim-1));
+  checkGraphConEdgeList(G, dim * (1 << (dim-1)));
 
   checkArcDirections(G);