diff options
| author |  yoco <peter.xiau@gmail.com> | 2014-02-10 22:49:13 +0800 |
|---|---|---|
| committer | yoco <peter.xiau@gmail.com> | 2014-02-10 22:49:13 +0800 |
| commit | 15f273b63c1089df68129076de4f93cbd38aae5b (patch) | |
| tree | 7b51d08ded4a132bc8098cdd452e47ff8a102533 /test/reshape.cpp | |
| parent | b64a09acc109489f0b14c20de11493c26cc74d92 (diff) | |
fix reshape flag and test case
Diffstat (limited to 'test/reshape.cpp')
| -rw-r--r-- | test/reshape.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/reshape.cpp b/test/reshape.cpp index eeab155f3..0298a2fe4 100644 --- a/test/reshape.cpp +++ b/test/reshape.cpp @@ -18,18 +18,18 @@ template <typename MatType> void reshape_all_size(MatType m) { typedef Eigen::Map<MatrixXi> MapMat; // dynamic - VERIFY_IS_EQUAL((m.template reshape( 1, 16)), MapMat(m.eval().data(), 1, 16)); - VERIFY_IS_EQUAL((m.template reshape( 2, 8)), MapMat(m.eval().data(), 2, 8)); - VERIFY_IS_EQUAL((m.template reshape( 4, 4)), MapMat(m.eval().data(), 4, 4)); - VERIFY_IS_EQUAL((m.template reshape( 8, 2)), MapMat(m.eval().data(), 8, 2)); - VERIFY_IS_EQUAL((m.template reshape(16, 1)), MapMat(m.eval().data(), 16, 1)); + VERIFY_IS_EQUAL((m.template reshape( 1, 16)), MapMat(m.data(), 1, 16)); + VERIFY_IS_EQUAL((m.template reshape( 2, 8)), MapMat(m.data(), 2, 8)); + VERIFY_IS_EQUAL((m.template reshape( 4, 4)), MapMat(m.data(), 4, 4)); + VERIFY_IS_EQUAL((m.template reshape( 8, 2)), MapMat(m.data(), 8, 2)); + VERIFY_IS_EQUAL((m.template reshape(16, 1)), MapMat(m.data(), 16, 1)); // static - VERIFY_IS_EQUAL((m.template reshape< 1, 16>()), MapMat(m.eval().data(), 1, 16)); - VERIFY_IS_EQUAL((m.template reshape< 2, 8>()), MapMat(m.eval().data(), 2, 8)); - VERIFY_IS_EQUAL((m.template reshape< 4, 4>()), MapMat(m.eval().data(), 4, 4)); - VERIFY_IS_EQUAL((m.template reshape< 8, 2>()), MapMat(m.eval().data(), 8, 2)); - VERIFY_IS_EQUAL((m.template reshape<16, 1>()), MapMat(m.eval().data(), 16, 1)); + VERIFY_IS_EQUAL((m.template reshape< 1, 16>()), MapMat(m.data(), 1, 16)); + VERIFY_IS_EQUAL((m.template reshape< 2, 8>()), MapMat(m.data(), 2, 8)); + VERIFY_IS_EQUAL((m.template reshape< 4, 4>()), MapMat(m.data(), 4, 4)); + VERIFY_IS_EQUAL((m.template reshape< 8, 2>()), MapMat(m.data(), 8, 2)); + VERIFY_IS_EQUAL((m.template reshape<16, 1>()), MapMat(m.data(), 16, 1)); // reshape chain VERIFY_IS_EQUAL( @@ -45,7 +45,7 @@ void reshape_all_size(MatType m) { .template reshape( 8, 2) .template reshape< 4, 4>() ), - MapMat(m.eval().data(), 4, 4) + MapMat(m.data(), 4, 4) ); } |