1.1 --- a/test/matrix_maps_test.cc Wed Nov 02 15:23:46 2005 +0000
1.2 +++ b/test/matrix_maps_test.cc Wed Nov 02 15:24:38 2005 +0000
1.3 @@ -53,15 +53,15 @@
1.4 int val = urandom(100);
1.5 matrix.set(it, jt, val);
1.6 check(matrix(it, jt) == val, "Wrong assign");
1.7 - check(matrix(it, jt) == matrixColMap(matrix, it)[jt], "Wrong colMap");
1.8 - check(matrix(it, jt) == matrixRowMap(matrix, jt)[it], "Wrong rowMap");
1.9 + check(matrix(it, jt) == matrixRowMap(matrix, it)[jt], "Wrong rowMap");
1.10 + check(matrix(it, jt) == matrixColMap(matrix, jt)[it], "Wrong colMap");
1.11 }
1.12 }
1.13 const IntMatrixMap& cm = matrix;
1.14 for (Graph::NodeIt it(graph); it != INVALID; ++it) {
1.15 for (Graph::NodeIt jt(graph); jt != INVALID; ++jt) {
1.16 - check(cm(it, jt) == matrixColMap(cm, it)[jt], "Wrong colMap");
1.17 - check(cm(it, jt) == matrixRowMap(cm, jt)[it], "Wrong rowMap");
1.18 + check(cm(it, jt) == matrixRowMap(cm, it)[jt], "Wrong rowMap");
1.19 + check(cm(it, jt) == matrixColMap(cm, jt)[it], "Wrong colMap");
1.20 }
1.21 }
1.22 }
1.23 @@ -95,15 +95,15 @@
1.24 matrix.set(it, jt, val);
1.25 check(matrix(it, jt) == val, "Wrong assign");
1.26 check(matrix(jt, it) == val, "Wrong assign");
1.27 - check(matrix(it, jt) == matrixColMap(matrix, it)[jt], "Wrong colMap");
1.28 - check(matrix(it, jt) == matrixRowMap(matrix, jt)[it], "Wrong rowMap");
1.29 + check(matrix(it, jt) == matrixRowMap(matrix, it)[jt], "Wrong rowMap");
1.30 + check(matrix(it, jt) == matrixColMap(matrix, jt)[it], "Wrong colMap");
1.31 }
1.32 }
1.33 const IntMatrixMap& cm = matrix;
1.34 for (Graph::NodeIt it(graph); it != INVALID; ++it) {
1.35 for (Graph::NodeIt jt(graph); jt != INVALID; ++jt) {
1.36 - check(cm(it, jt) == matrixColMap(cm, it)[jt], "Wrong colMap");
1.37 - check(cm(it, jt) == matrixRowMap(cm, jt)[it], "Wrong rowMap");
1.38 + check(cm(it, jt) == matrixRowMap(cm, it)[jt], "Wrong rowMap");
1.39 + check(cm(it, jt) == matrixColMap(cm, jt)[it], "Wrong colMap");
1.40 }
1.41 }
1.42 }