1.1 --- a/test/graph_copy_test.cc	Thu Dec 01 09:05:47 2011 +0100
     1.2 +++ b/test/graph_copy_test.cc	Wed Jan 11 22:21:07 2012 +0100
     1.3 @@ -216,8 +216,8 @@
     1.4    // Build a graph
     1.5    SmartBpGraph from;
     1.6    SmartBpGraph::NodeMap<int> fnm(from);
     1.7 -  SmartBpGraph::RedMap<int> frnm(from);
     1.8 -  SmartBpGraph::BlueMap<int> fbnm(from);
     1.9 +  SmartBpGraph::RedNodeMap<int> frnm(from);
    1.10 +  SmartBpGraph::BlueNodeMap<int> fbnm(from);
    1.11    SmartBpGraph::ArcMap<int> fam(from);
    1.12    SmartBpGraph::EdgeMap<int> fem(from);
    1.13    SmartBpGraph::Node fn = INVALID;
    1.14 @@ -261,8 +261,8 @@
    1.15    // Test graph copy
    1.16    GR to;
    1.17    typename GR::template NodeMap<int> tnm(to);
    1.18 -  typename GR::template RedMap<int> trnm(to);
    1.19 -  typename GR::template BlueMap<int> tbnm(to);
    1.20 +  typename GR::template RedNodeMap<int> trnm(to);
    1.21 +  typename GR::template BlueNodeMap<int> tbnm(to);
    1.22    typename GR::template ArcMap<int> tam(to);
    1.23    typename GR::template EdgeMap<int> tem(to);
    1.24    typename GR::Node tn;
    1.25 @@ -272,19 +272,20 @@
    1.26    typename GR::Edge te;
    1.27  
    1.28    SmartBpGraph::NodeMap<typename GR::Node> nr(from);
    1.29 -  SmartBpGraph::RedMap<typename GR::RedNode> rnr(from);
    1.30 -  SmartBpGraph::BlueMap<typename GR::BlueNode> bnr(from);
    1.31 +  SmartBpGraph::RedNodeMap<typename GR::RedNode> rnr(from);
    1.32 +  SmartBpGraph::BlueNodeMap<typename GR::BlueNode> bnr(from);
    1.33    SmartBpGraph::ArcMap<typename GR::Arc> ar(from);
    1.34    SmartBpGraph::EdgeMap<typename GR::Edge> er(from);
    1.35  
    1.36    typename GR::template NodeMap<SmartBpGraph::Node> ncr(to);
    1.37 -  typename GR::template RedMap<SmartBpGraph::RedNode> rncr(to);
    1.38 -  typename GR::template BlueMap<SmartBpGraph::BlueNode> bncr(to);
    1.39 +  typename GR::template RedNodeMap<SmartBpGraph::RedNode> rncr(to);
    1.40 +  typename GR::template BlueNodeMap<SmartBpGraph::BlueNode> bncr(to);
    1.41    typename GR::template ArcMap<SmartBpGraph::Arc> acr(to);
    1.42    typename GR::template EdgeMap<SmartBpGraph::Edge> ecr(to);
    1.43  
    1.44    bpGraphCopy(from, to).
    1.45 -    nodeMap(fnm, tnm).redMap(frnm, trnm).blueMap(fbnm, tbnm).
    1.46 +    nodeMap(fnm, tnm).
    1.47 +    redNodeMap(frnm, trnm).blueNodeMap(fbnm, tbnm).
    1.48      arcMap(fam, tam).edgeMap(fem, tem).
    1.49      nodeRef(nr).redRef(rnr).blueRef(bnr).
    1.50      arcRef(ar).edgeRef(er).
    1.51 @@ -304,7 +305,7 @@
    1.52      check(fnm[it] == tnm[nr[it]], "Wrong copy.");
    1.53    }
    1.54  
    1.55 -  for (SmartBpGraph::RedIt it(from); it != INVALID; ++it) {
    1.56 +  for (SmartBpGraph::RedNodeIt it(from); it != INVALID; ++it) {
    1.57      check(ncr[nr[it]] == it, "Wrong copy.");
    1.58      check(fnm[it] == tnm[nr[it]], "Wrong copy.");
    1.59      check(rnr[it] == nr[it], "Wrong copy.");
    1.60 @@ -313,7 +314,7 @@
    1.61      check(to.red(rnr[it]), "Wrong copy.");
    1.62    }
    1.63  
    1.64 -  for (SmartBpGraph::BlueIt it(from); it != INVALID; ++it) {
    1.65 +  for (SmartBpGraph::BlueNodeIt it(from); it != INVALID; ++it) {
    1.66      check(ncr[nr[it]] == it, "Wrong copy.");
    1.67      check(fnm[it] == tnm[nr[it]], "Wrong copy.");
    1.68      check(bnr[it] == nr[it], "Wrong copy.");
    1.69 @@ -343,11 +344,11 @@
    1.70    for (typename GR::NodeIt it(to); it != INVALID; ++it) {
    1.71      check(nr[ncr[it]] == it, "Wrong copy.");
    1.72    }
    1.73 -  for (typename GR::RedIt it(to); it != INVALID; ++it) {
    1.74 +  for (typename GR::RedNodeIt it(to); it != INVALID; ++it) {
    1.75      check(rncr[it] == ncr[it], "Wrong copy.");
    1.76      check(rnr[rncr[it]] == it, "Wrong copy.");
    1.77    }
    1.78 -  for (typename GR::BlueIt it(to); it != INVALID; ++it) {
    1.79 +  for (typename GR::BlueNodeIt it(to); it != INVALID; ++it) {
    1.80      check(bncr[it] == ncr[it], "Wrong copy.");
    1.81      check(bnr[bncr[it]] == it, "Wrong copy.");
    1.82    }