1.1 --- a/test/bpgraph_test.cc	Thu Nov 25 22:45:29 2010 +0100
     1.2 +++ b/test/bpgraph_test.cc	Thu Dec 01 09:05:47 2011 +0100
     1.3 @@ -41,7 +41,7 @@
     1.4    G.reserveNode(3);
     1.5    G.reserveEdge(3);
     1.6  
     1.7 -  Node
     1.8 +  RedNode
     1.9      rn1 = G.addRedNode();
    1.10    checkGraphNodeList(G, 1);
    1.11    checkGraphRedNodeList(G, 1);
    1.12 @@ -49,7 +49,7 @@
    1.13    checkGraphEdgeList(G, 0);
    1.14    checkGraphArcList(G, 0);
    1.15  
    1.16 -  Node
    1.17 +  BlueNode
    1.18      bn1 = G.addBlueNode(),
    1.19      bn2 = G.addBlueNode();
    1.20    checkGraphNodeList(G, 3);
    1.21 @@ -76,7 +76,7 @@
    1.22    checkGraphConArcList(G, 2);
    1.23  
    1.24    Edge
    1.25 -    e2 = G.addEdge(rn1, bn1),
    1.26 +    e2 = G.addEdge(bn1, rn1),
    1.27      e3 = G.addEdge(rn1, bn2);
    1.28  
    1.29    checkGraphNodeList(G, 3);
    1.30 @@ -112,9 +112,10 @@
    1.31    TEMPLATE_BPGRAPH_TYPEDEFS(BpGraph);
    1.32  
    1.33    BpGraph G;
    1.34 -  Node
    1.35 -    n1 = G.addRedNode(), n2 = G.addBlueNode(),
    1.36 -    n3 = G.addBlueNode(), n4 = G.addRedNode();
    1.37 +  RedNode
    1.38 +    n1 = G.addRedNode(), n4 = G.addRedNode(); 
    1.39 +  BlueNode
    1.40 +    n2 = G.addBlueNode(), n3 = G.addBlueNode();
    1.41    Edge
    1.42      e1 = G.addEdge(n1, n2), e2 = G.addEdge(n1, n3),
    1.43      e3 = G.addEdge(n4, n2), e4 = G.addEdge(n4, n3);
    1.44 @@ -159,9 +160,10 @@
    1.45    TEMPLATE_BPGRAPH_TYPEDEFS(BpGraph);
    1.46  
    1.47    BpGraph G;
    1.48 -  Node
    1.49 -    n1 = G.addRedNode(), n2 = G.addBlueNode(),
    1.50 -    n3 = G.addBlueNode(), n4 = G.addRedNode();
    1.51 +  RedNode
    1.52 +    n1 = G.addRedNode(), n4 = G.addRedNode(); 
    1.53 +  BlueNode
    1.54 +    n2 = G.addBlueNode(), n3 = G.addBlueNode();
    1.55    Edge
    1.56      e1 = G.addEdge(n1, n2), e2 = G.addEdge(n1, n3),
    1.57      e3 = G.addEdge(n4, n2), e4 = G.addEdge(n4, n3);
    1.58 @@ -209,8 +211,9 @@
    1.59    TEMPLATE_BPGRAPH_TYPEDEFS(BpGraph);
    1.60  
    1.61    BpGraph G;
    1.62 -  Node 
    1.63 -    n1 = G.addRedNode(),
    1.64 +  RedNode
    1.65 +    n1 = G.addRedNode();
    1.66 +  BlueNode
    1.67      n2 = G.addBlueNode(),
    1.68      n3 = G.addBlueNode();
    1.69    Edge 
    1.70 @@ -225,7 +228,7 @@
    1.71  
    1.72    typename BpGraph::Snapshot snapshot(G);
    1.73  
    1.74 -  Node n4 = G.addRedNode();
    1.75 +  RedNode n4 = G.addRedNode();
    1.76    G.addEdge(n4, n2);
    1.77    G.addEdge(n4, n3);
    1.78  
    1.79 @@ -292,8 +295,9 @@
    1.80    TEMPLATE_BPGRAPH_TYPEDEFS(BpGraph);
    1.81    BpGraph g;
    1.82  
    1.83 -  Node
    1.84 -    n1 = g.addRedNode(),
    1.85 +  RedNode
    1.86 +    n1 = g.addRedNode();
    1.87 +  BlueNode
    1.88      n2 = g.addBlueNode(),
    1.89      n3 = g.addBlueNode();
    1.90  
    1.91 @@ -396,12 +400,12 @@
    1.92  
    1.93    for (int i = 0; i < G.redNum(); ++i) {
    1.94      check(G.red(G.redNode(i)), "Wrong node");
    1.95 -    check(G.redIndex(G.redNode(i)) == i, "Wrong index");
    1.96 +    check(G.index(G.redNode(i)) == i, "Wrong index");
    1.97    }
    1.98  
    1.99    for (int i = 0; i < G.blueNum(); ++i) {
   1.100      check(G.blue(G.blueNode(i)), "Wrong node");
   1.101 -    check(G.blueIndex(G.blueNode(i)) == i, "Wrong index");
   1.102 +    check(G.index(G.blueNode(i)) == i, "Wrong index");
   1.103    }
   1.104  
   1.105    for (NodeIt u(G); u != INVALID; ++u) {