diff -r 5c76ebbb4818 -r a2a454f1232d test/matrix_maps_test.cc --- a/test/matrix_maps_test.cc Wed Nov 02 15:23:46 2005 +0000 +++ b/test/matrix_maps_test.cc Wed Nov 02 15:24:38 2005 +0000 @@ -53,15 +53,15 @@ int val = urandom(100); matrix.set(it, jt, val); check(matrix(it, jt) == val, "Wrong assign"); - check(matrix(it, jt) == matrixColMap(matrix, it)[jt], "Wrong colMap"); - check(matrix(it, jt) == matrixRowMap(matrix, jt)[it], "Wrong rowMap"); + check(matrix(it, jt) == matrixRowMap(matrix, it)[jt], "Wrong rowMap"); + check(matrix(it, jt) == matrixColMap(matrix, jt)[it], "Wrong colMap"); } } const IntMatrixMap& cm = matrix; for (Graph::NodeIt it(graph); it != INVALID; ++it) { for (Graph::NodeIt jt(graph); jt != INVALID; ++jt) { - check(cm(it, jt) == matrixColMap(cm, it)[jt], "Wrong colMap"); - check(cm(it, jt) == matrixRowMap(cm, jt)[it], "Wrong rowMap"); + check(cm(it, jt) == matrixRowMap(cm, it)[jt], "Wrong rowMap"); + check(cm(it, jt) == matrixColMap(cm, jt)[it], "Wrong colMap"); } } } @@ -95,15 +95,15 @@ matrix.set(it, jt, val); check(matrix(it, jt) == val, "Wrong assign"); check(matrix(jt, it) == val, "Wrong assign"); - check(matrix(it, jt) == matrixColMap(matrix, it)[jt], "Wrong colMap"); - check(matrix(it, jt) == matrixRowMap(matrix, jt)[it], "Wrong rowMap"); + check(matrix(it, jt) == matrixRowMap(matrix, it)[jt], "Wrong rowMap"); + check(matrix(it, jt) == matrixColMap(matrix, jt)[it], "Wrong colMap"); } } const IntMatrixMap& cm = matrix; for (Graph::NodeIt it(graph); it != INVALID; ++it) { for (Graph::NodeIt jt(graph); jt != INVALID; ++jt) { - check(cm(it, jt) == matrixColMap(cm, it)[jt], "Wrong colMap"); - check(cm(it, jt) == matrixRowMap(cm, jt)[it], "Wrong rowMap"); + check(cm(it, jt) == matrixRowMap(cm, it)[jt], "Wrong rowMap"); + check(cm(it, jt) == matrixColMap(cm, jt)[it], "Wrong colMap"); } } }