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

2 files changed, 15 insertions, 11 deletions

diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index c866d179..8d5dddce 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -39,7 +39,6 @@
 namespace Gudhi {
   
 /** \defgroup simplex_tree Filtered Complexes
-/** \defgroup simplex_tree Filtered Complexes
  *
  * A simplicial complex \f$\mathbf{K}\f$
  * on a set of vertices \f$V = \{1, \cdots ,|V|\}\f$ is a collection of simplices
@@ -647,7 +646,7 @@ class Simplex_tree {
 
     typename boost::graph_traits<OneSkeletonGraph>::vertex_iterator v_it,
         v_it_end;
-    for (tie(v_it, v_it_end) = boost::vertices(skel_graph); v_it != v_it_end;
+    for (std::tie(v_it, v_it_end) = boost::vertices(skel_graph); v_it != v_it_end;
         ++v_it) {
       root_.members_.emplace_hint(
           root_.members_.end(), *v_it,
@@ -655,7 +654,7 @@ class Simplex_tree {
     }
     typename boost::graph_traits<OneSkeletonGraph>::edge_iterator e_it,
         e_it_end;
-    for (tie(e_it, e_it_end) = boost::edges(skel_graph); e_it != e_it_end;
+    for (std::tie(e_it, e_it_end) = boost::edges(skel_graph); e_it != e_it_end;
         ++e_it) {
       auto u = source(*e_it, skel_graph);
       auto v = target(*e_it, skel_graph);
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--;
 	}
 }