1.1 --- a/test/graph_test.h	Thu Nov 25 22:45:29 2010 +0100
     1.2 +++ b/test/graph_test.h	Thu Dec 01 09:05:47 2011 +0100
     1.3 @@ -46,6 +46,16 @@
     1.4      typename Graph::RedIt n(G);
     1.5      for(int i=0;i<cnt;i++) {
     1.6        check(n!=INVALID,"Wrong red Node list linking.");
     1.7 +      check(G.red(n),"Wrong node set check.");
     1.8 +      check(!G.blue(n),"Wrong node set check.");
     1.9 +      typename Graph::Node nn = n;
    1.10 +      check(G.asRedNodeUnsafe(nn) == n,"Wrong node conversion.");
    1.11 +      check(G.asRedNode(nn) == n,"Wrong node conversion.");
    1.12 +      check(G.asBlueNode(nn) == INVALID,"Wrong node conversion.");
    1.13 +      std::pair<typename Graph::RedNode, typename Graph::BlueNode> rbn =
    1.14 +        G.asRedBlueNode(nn);
    1.15 +      check(rbn.first == n,"Wrong node conversion.");
    1.16 +      check(rbn.second == INVALID,"Wrong node conversion.");
    1.17        ++n;
    1.18      }
    1.19      check(n==INVALID,"Wrong red Node list linking.");
    1.20 @@ -58,6 +68,16 @@
    1.21      typename Graph::BlueIt n(G);
    1.22      for(int i=0;i<cnt;i++) {
    1.23        check(n!=INVALID,"Wrong blue Node list linking.");
    1.24 +      check(G.blue(n),"Wrong node set check.");
    1.25 +      check(!G.red(n),"Wrong node set check.");
    1.26 +      typename Graph::Node nn = n;
    1.27 +      check(G.asBlueNodeUnsafe(nn) == n,"Wrong node conversion.");
    1.28 +      check(G.asBlueNode(nn) == n,"Wrong node conversion.");
    1.29 +      check(G.asRedNode(nn) == INVALID,"Wrong node conversion.");
    1.30 +      std::pair<typename Graph::RedNode, typename Graph::BlueNode> rbn =
    1.31 +        G.asRedBlueNode(nn);
    1.32 +      check(rbn.first == INVALID,"Wrong node conversion.");
    1.33 +      check(rbn.second == n,"Wrong node conversion.");
    1.34        ++n;
    1.35      }
    1.36      check(n==INVALID,"Wrong blue Node list linking.");
    1.37 @@ -207,9 +227,8 @@
    1.38      std::set<int> values;
    1.39      for (typename Graph::RedIt n(G); n != INVALID; ++n) {
    1.40        check(G.red(n), "Wrong partition");
    1.41 -      check(G.redId(n) == G.id(RedNode(n)), "Wrong id");
    1.42 -      check(values.find(G.redId(n)) == values.end(), "Wrong id");
    1.43 -      check(G.redId(n) <= G.maxRedId(), "Wrong maximum id");
    1.44 +      check(values.find(G.id(n)) == values.end(), "Wrong id");
    1.45 +      check(G.id(n) <= G.maxRedId(), "Wrong maximum id");
    1.46        values.insert(G.id(n));
    1.47      }
    1.48      check(G.maxId(RedNode()) == G.maxRedId(), "Wrong maximum id");
    1.49 @@ -221,9 +240,8 @@
    1.50      std::set<int> values;
    1.51      for (typename Graph::BlueIt n(G); n != INVALID; ++n) {
    1.52        check(G.blue(n), "Wrong partition");
    1.53 -      check(G.blueId(n) == G.id(BlueNode(n)), "Wrong id");
    1.54 -      check(values.find(G.blueId(n)) == values.end(), "Wrong id");
    1.55 -      check(G.blueId(n) <= G.maxBlueId(), "Wrong maximum id");
    1.56 +      check(values.find(G.id(n)) == values.end(), "Wrong id");
    1.57 +      check(G.id(n) <= G.maxBlueId(), "Wrong maximum id");
    1.58        values.insert(G.id(n));
    1.59      }
    1.60      check(G.maxId(BlueNode()) == G.maxBlueId(), "Wrong maximum id");