Merge last trunk modifications

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Nerve_GIC@3158 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: d251258287b1163f4d0984517dc71274ab183db7

1 files changed, 32 insertions, 0 deletions

diff --git a/src/Simplex_tree/test/simplex_tree_unit_test.cpp b/src/Simplex_tree/test/simplex_tree_unit_test.cpp
index 580d610a..f63ea080 100644
--- a/src/Simplex_tree/test/simplex_tree_unit_test.cpp
+++ b/src/Simplex_tree/test/simplex_tree_unit_test.cpp
@@ -863,3 +863,35 @@ BOOST_AUTO_TEST_CASE(make_filtration_non_decreasing) {
   BOOST_CHECK(st == st_other_copy);
   
 }
+
+BOOST_AUTO_TEST_CASE(insert_graph) {
+  std::cout << "********************************************************************" << std::endl;
+  std::cout << "INSERT GRAPH" << std::endl;
+  typedef typename boost::adjacency_list<boost::vecS, boost::vecS,
+          boost::undirectedS,
+          boost::property<vertex_filtration_t, double>,
+          boost::property<edge_filtration_t, double>> Graph;
+  Graph g(3);
+  // filtration value 0 everywhere
+  put(Gudhi::vertex_filtration_t(), g, 0, 0);
+  put(Gudhi::vertex_filtration_t(), g, 1, 0);
+  put(Gudhi::vertex_filtration_t(), g, 2, 0);
+  // vertices don't always occur in sorted order
+  add_edge(0, 1, 0, g);
+  add_edge(2, 1, 0, g);
+  add_edge(2, 0, 0, g);
+
+  typedef Simplex_tree<> typeST;
+  typeST st1;
+  st1.insert_graph(g);
+  BOOST_CHECK(st1.num_simplices() == 6);
+
+  // edges can have multiplicity in the graph unless we replace the first vecS with (hash_)setS
+  add_edge(1, 0, 0, g);
+  add_edge(1, 2, 0, g);
+  add_edge(0, 2, 0, g);
+  add_edge(0, 2, 0, g);
+  typeST st2;
+  st2.insert_graph(g);
+  BOOST_CHECK(st2.num_simplices() == 6);
+}