diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-15 13:20:12 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-15 13:20:12 +0000 |
commit | 6a8f01b2d30abda7e6184d9a4eb21460ae36d7d2 (patch) | |
tree | 8349679953459a9141624fe8aaa3577f580e9cae /src/Simplex_tree/test/simplex_tree_unit_test.cpp | |
parent | aa82d3856abe9e7b009c2c5bfa01540b82e17fdd (diff) | |
parent | 059c906152ca90608238bc82b07d8e28e18218dc (diff) |
Merged latest trunk changes to my_branch and fix
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/TDA_dev_1.1.0@409 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 2463ee9b0f8b69e3edbda4e8189eb61606e0af93
Diffstat (limited to 'src/Simplex_tree/test/simplex_tree_unit_test.cpp')
-rw-r--r-- | src/Simplex_tree/test/simplex_tree_unit_test.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/Simplex_tree/test/simplex_tree_unit_test.cpp b/src/Simplex_tree/test/simplex_tree_unit_test.cpp index b44f95a8..6c82586a 100644 --- a/src/Simplex_tree/test/simplex_tree_unit_test.cpp +++ b/src/Simplex_tree/test/simplex_tree_unit_test.cpp @@ -55,7 +55,7 @@ void test_iterators_on_empty_simplex_tree(typeST& tst) for( auto f_simplex : tst.filtration_simplex_range() ) { BOOST_CHECK( false); // shall be empty - std::cout << "test_simplex_tree_contains - filtration=" << tst.filtration(f_simplex) << std::endl; + std::cout << "test_iterators_on_empty_simplex_tree - filtration=" << tst.filtration(f_simplex) << std::endl; } } @@ -125,19 +125,24 @@ BOOST_AUTO_TEST_CASE( simplex_tree_from_file ) simplex_tree_stream.close(); } -void test_simplex_tree_contains(typeST& simplexTree, typeSimplex simplex, int pos) +void test_simplex_tree_contains(typeST& simplexTree, typeSimplex& simplex, int pos) { - auto f_simplex = simplexTree.filtration_simplex_range().begin(); - f_simplex += pos; + auto f_simplex = simplexTree.filtration_simplex_range().begin() + pos; + std::cout << "test_simplex_tree_contains - filtration=" << simplexTree.filtration(*f_simplex) << "||" << simplex.second << std::endl; BOOST_CHECK( AreAlmostTheSame(simplexTree.filtration(*f_simplex),simplex.second) ); - typeVectorVertex::iterator simplexIter = simplex.first.end()-1; + //typeVectorVertex::iterator simplexIter = simplex.first.end()-1; + int simplexIndex=simplex.first.size()-1; for( auto vertex : simplexTree.simplex_vertex_range(*f_simplex) ) { - std::cout << "test_simplex_tree_contains - vertex=" << vertex << "||" << *simplexIter << std::endl; - BOOST_CHECK( vertex == *simplexIter); - simplexIter--; + //std::cout << "test_simplex_tree_contains - vertex=" << vertex << "||" << *simplexIter << std::endl; + //BOOST_CHECK( vertex == *simplexIter); + //simplexIter--; + std::cout << "test_simplex_tree_contains - vertex=" << vertex << "||" << simplex.first.at(simplexIndex) << std::endl; + BOOST_CHECK(vertex == simplex.first.at(simplexIndex)); + BOOST_CHECK(simplexIndex >= 0); + simplexIndex--; } } |