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);