1.1 --- a/test/bpgraph_test.cc	Thu Dec 01 09:05:47 2011 +0100
     1.2 +++ b/test/bpgraph_test.cc	Wed Jan 11 22:21:07 2012 +0100
     1.3 @@ -101,8 +101,8 @@
     1.4    checkEdgeIds(G);
     1.5  
     1.6    checkGraphNodeMap(G);
     1.7 -  checkGraphRedMap(G);
     1.8 -  checkGraphBlueMap(G);
     1.9 +  checkGraphRedNodeMap(G);
    1.10 +  checkGraphBlueNodeMap(G);
    1.11    checkGraphArcMap(G);
    1.12    checkGraphEdgeMap(G);
    1.13  }
    1.14 @@ -260,8 +260,8 @@
    1.15    checkEdgeIds(G);
    1.16  
    1.17    checkGraphNodeMap(G);
    1.18 -  checkGraphRedMap(G);
    1.19 -  checkGraphBlueMap(G);
    1.20 +  checkGraphRedNodeMap(G);
    1.21 +  checkGraphBlueNodeMap(G);
    1.22    checkGraphArcMap(G);
    1.23    checkGraphEdgeMap(G);
    1.24  
    1.25 @@ -369,13 +369,13 @@
    1.26    checkGraphEdgeList(G, redNum * blueNum);
    1.27    checkGraphArcList(G, 2 * redNum * blueNum);
    1.28  
    1.29 -  for (RedIt n(G); n != INVALID; ++n) {
    1.30 +  for (RedNodeIt n(G); n != INVALID; ++n) {
    1.31      checkGraphOutArcList(G, n, blueNum);
    1.32      checkGraphInArcList(G, n, blueNum);
    1.33      checkGraphIncEdgeList(G, n, blueNum);
    1.34    }
    1.35  
    1.36 -  for (BlueIt n(G); n != INVALID; ++n) {
    1.37 +  for (BlueNodeIt n(G); n != INVALID; ++n) {
    1.38      checkGraphOutArcList(G, n, redNum);
    1.39      checkGraphInArcList(G, n, redNum);
    1.40      checkGraphIncEdgeList(G, n, redNum);
    1.41 @@ -393,8 +393,8 @@
    1.42    checkEdgeIds(G);
    1.43  
    1.44    checkGraphNodeMap(G);
    1.45 -  checkGraphRedMap(G);
    1.46 -  checkGraphBlueMap(G);
    1.47 +  checkGraphRedNodeMap(G);
    1.48 +  checkGraphBlueNodeMap(G);
    1.49    checkGraphArcMap(G);
    1.50    checkGraphEdgeMap(G);
    1.51