Add lazy_toplex_map_unit_test

Class documentation rewrite
Fix conventions in code



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

Former-commit-id: 65f79ee3c0f22157b2cedfc498e5d9c97dd055f6

3 files changed, 179 insertions, 141 deletions

diff --git a/src/Toplex_map/test/CMakeLists.txt b/src/Toplex_map/test/CMakeLists.txt
index 237cfdad..59517db5 100644
--- a/src/Toplex_map/test/CMakeLists.txt
+++ b/src/Toplex_map/test/CMakeLists.txt
@@ -4,5 +4,8 @@ include(GUDHI_test_coverage)
 
 add_executable( Toplex_map_unit_test toplex_map_unit_test.cpp )
 target_link_libraries(Toplex_map_unit_test ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
-
 gudhi_add_coverage_test(Toplex_map_unit_test)
+
+add_executable( Lazy_toplex_map_unit_test lazy_toplex_map_unit_test.cpp )
+target_link_libraries(Lazy_toplex_map_unit_test ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+gudhi_add_coverage_test(Lazy_toplex_map_unit_test)
diff --git a/src/Toplex_map/test/lazy_toplex_map_unit_test.cpp b/src/Toplex_map/test/lazy_toplex_map_unit_test.cpp
new file mode 100644
index 00000000..77d464ae
--- /dev/null
+++ b/src/Toplex_map/test/lazy_toplex_map_unit_test.cpp
@@ -0,0 +1,78 @@
+#include <iostream>
+#include <vector>
+#include <gudhi/Lazy_Toplex_map.h>
+
+
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE "lazy toplex map"
+#include <boost/test/unit_test.hpp>
+
+BOOST_AUTO_TEST_CASE(toplex_map) {
+  using Vertex = Gudhi::Lazy_Toplex_map::Vertex;
+
+  Gudhi::Lazy_Toplex_map tm;
+  std::cout << "insert_simplex {1, 2, 3, 4}" << std::endl;
+  std::vector<Vertex> sigma1 = {1, 2, 3, 4};
+  tm.insert_simplex(sigma1);
+  std::cout << "insert_simplex {5, 2, 3, 6}" << std::endl;
+  std::vector<Vertex> sigma2 = {5, 2, 3, 6};
+  tm.insert_simplex(sigma2);
+  std::cout << "insert_simplex {5}" << std::endl;
+  std::vector<Vertex> sigma3 = {5};
+  tm.insert_simplex(sigma3);
+  std::cout << "insert_simplex {4, 5, 3}" << std::endl;
+  std::vector<Vertex> sigma6 = {4, 5, 3};
+  tm.insert_simplex(sigma6);
+  std::cout << "insert_simplex {4, 5, 9}" << std::endl;
+  std::vector<Vertex> sigma7 = {4, 5, 9};
+  tm.insert_simplex(sigma7);
+
+  std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl;
+  BOOST_CHECK(tm.num_maximal_simplices() == 5);
+
+  std::vector<Vertex> sigma4 = {5, 2, 3};
+  std::vector<Vertex> sigma5 = {5, 2, 7};
+  BOOST_CHECK(tm.membership(sigma4));
+  BOOST_CHECK(!tm.membership(sigma5));
+  std::cout << "insert_simplex {5, 2, 7}" << std::endl;
+  tm.insert_simplex(sigma5);
+
+  std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl;
+  BOOST_CHECK(tm.num_maximal_simplices() == 6);
+
+  BOOST_CHECK(tm.membership(sigma5));
+
+  std::cout << "contraction(4,5)" << std::endl;
+  auto r = tm.contraction(4,5);
+  std::cout << "r=" << r << std::endl;
+  BOOST_CHECK(r == 5);
+
+  std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl;
+  BOOST_CHECK(tm.num_maximal_simplices() == 6);
+
+  std::vector<Vertex> sigma8 = {1, 2, 3};
+  std::vector<Vertex> sigma9 = {2, 7};
+
+  sigma8.emplace_back(r);
+  sigma9.emplace_back(r);
+  BOOST_CHECK(!tm.membership(sigma6));
+  BOOST_CHECK(tm.membership(sigma8));
+  BOOST_CHECK(tm.membership(sigma9));
+
+  std::cout << "remove_simplex({2, 7, r = 5})" << std::endl;
+  tm.remove_simplex(sigma9);
+  BOOST_CHECK(!tm.membership(sigma9));
+
+  std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl;
+  BOOST_CHECK(tm.num_maximal_simplices() == 8);
+
+  // {2, 7, 5} is removed, but verify its edges are still there
+  std::vector<Vertex> edge = {2, 7};
+  BOOST_CHECK(tm.membership(edge));
+  edge = {2, 5};
+  BOOST_CHECK(tm.membership(edge));
+  edge = {7, 5};
+  BOOST_CHECK(tm.membership(edge));
+
+}
+
diff --git a/src/Toplex_map/test/toplex_map_unit_test.cpp b/src/Toplex_map/test/toplex_map_unit_test.cpp
index 9ee5dff2..59c104ce 100644
--- a/src/Toplex_map/test/toplex_map_unit_test.cpp
+++ b/src/Toplex_map/test/toplex_map_unit_test.cpp
@@ -1,162 +1,119 @@
 #include <iostream>
 #include <vector>
-#include <gudhi/Lazy_Toplex_map.h>
+#include <gudhi/Toplex_map.h>
 
 
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE "toplex map"
 #include <boost/test/unit_test.hpp>
-#include <boost/mpl/list.hpp>
 
-using list_of_tested_variants = boost::mpl::list<Gudhi::Toplex_map, Gudhi::Lazy_Toplex_map>;
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(common_toplex_map_functionnalities, Toplex_map, list_of_tested_variants) {
-  using Vertex = typename Toplex_map::Vertex;
+BOOST_AUTO_TEST_CASE(toplex_map) {
+  using Vertex = Gudhi::Toplex_map::Vertex;
 
+  Gudhi::Toplex_map tm;
+  std::cout << "insert_simplex {1, 2, 3, 4}" << std::endl;
   std::vector<Vertex> sigma1 = {1, 2, 3, 4};
+  tm.insert_simplex(sigma1);
+  std::cout << "insert_simplex {5, 2, 3, 6}" << std::endl;
   std::vector<Vertex> sigma2 = {5, 2, 3, 6};
+  tm.insert_simplex(sigma2);
+  std::cout << "insert_simplex {5}" << std::endl;
   std::vector<Vertex> sigma3 = {5};
-  std::vector<Vertex> sigma4 = {5, 2, 3};
-  std::vector<Vertex> sigma5 = {5, 2, 7};
+  tm.insert_simplex(sigma3);
+  std::cout << "insert_simplex {4, 5, 3}" << std::endl;
   std::vector<Vertex> sigma6 = {4, 5, 3};
+  tm.insert_simplex(sigma6);
+  std::cout << "insert_simplex {4, 5, 9}" << std::endl;
   std::vector<Vertex> sigma7 = {4, 5, 9};
-  std::vector<Vertex> sigma8 = {1, 2, 3, 6};
-
-  Toplex_map K;
-  K.insert_simplex(sigma1);
-  K.insert_simplex(sigma2);
-  K.insert_simplex(sigma3);
-  K.insert_simplex(sigma6);
-  K.insert_simplex(sigma7);
-
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-
-  BOOST_CHECK(K.membership(sigma4));
-  //BOOST_CHECK(!K.maximality(sigma3));
-  BOOST_CHECK(!K.membership(sigma5));
-  K.insert_simplex(sigma5);
-
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-
-  BOOST_CHECK(K.membership(sigma5));
-  std::vector<Vertex> sigma9 = {1, 2, 3};
-  std::vector<Vertex> sigma10 = {2, 7};
-  auto r = K.contraction(4,5);
-
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-
-  sigma9.emplace_back(r);
-  sigma10.emplace_back(r);
-  BOOST_CHECK(!K.membership(sigma6));
-  BOOST_CHECK(K.membership(sigma9));
-  BOOST_CHECK(K.membership(sigma10));
-  K.remove_simplex(sigma10);
-  BOOST_CHECK(!K.membership(sigma10));
-
-}
-
-BOOST_AUTO_TEST_CASE(toplex_map_num_maximal_simplices) {
-  using Vertex = Gudhi::Toplex_map::Vertex;
-
-  Gudhi::Toplex_map K;
-  std::vector<Vertex> sigma1 = {1, 2, 3, 4};
-  std::vector<Vertex> sigma2 = {5, 2, 3, 6};
-  std::vector<Vertex> sigma3 = {4, 5, 3};
-  std::vector<Vertex> sigma4 = {4, 5, 9};
-  K.insert_simplex(sigma1);
-  K.insert_simplex(sigma2);
-  K.insert_simplex(sigma3);
-  K.insert_simplex(sigma4);
-
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-  BOOST_CHECK(K.num_maximal_simplices() == 4);
-
-  std::vector<Vertex> sigma5 = {5, 2, 7};
-  K.insert_simplex(sigma5);
-
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-  BOOST_CHECK(K.num_maximal_simplices() == 5);
-
-  auto r = K.contraction(4,5);
-  std::cout << "r=" << r << std::endl;
-  BOOST_CHECK(r == 5);
-
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-  BOOST_CHECK(K.num_maximal_simplices() == 4);
-
-  std::vector<Vertex> sigma6 = {2, 7};
-  K.remove_simplex(sigma6);
-
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-  BOOST_CHECK(K.num_maximal_simplices() == 4);
-
-  K.remove_simplex(sigma2);
-
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-  BOOST_CHECK(K.num_maximal_simplices() == 6);
-}
-
-BOOST_AUTO_TEST_CASE(lazy_toplex_map_num_maximal_simplices) {
-  using Vertex = Gudhi::Lazy_Toplex_map::Vertex;
-
-  Gudhi::Lazy_Toplex_map K;
-  std::vector<Vertex> sigma1 = {1, 2, 3, 4};
-  std::vector<Vertex> sigma2 = {5, 2, 3, 6};
-  std::vector<Vertex> sigma3 = {4, 5, 3};
-  std::vector<Vertex> sigma4 = {4, 5, 9};
-  K.insert_simplex(sigma1);
-  K.insert_simplex(sigma2);
-  K.insert_simplex(sigma3);
-  K.insert_simplex(sigma4);
-
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-  BOOST_CHECK(K.num_maximal_simplices() == 4);
+  tm.insert_simplex(sigma7);
+
+  std::cout << "num_maximal_simplices" << tm.num_maximal_simplices() << std::endl;
+  BOOST_CHECK(tm.num_maximal_simplices() == 4);
+  // Browse maximal simplices
+  std::cout << "Maximal simplices are :" << std::endl;
+  for (auto simplex_ptr : tm.maximal_simplices()) {
+    for (auto v : *simplex_ptr) {
+      std::cout << v << ", ";
+    }
+    std::cout << std::endl;
+    BOOST_CHECK(tm.maximality(*simplex_ptr));
+  }
+
+  BOOST_CHECK(tm.maximality(sigma1));
+  BOOST_CHECK(tm.maximality(sigma2));
+  BOOST_CHECK(!tm.maximality(sigma3));
+  BOOST_CHECK(tm.maximality(sigma6));
+  BOOST_CHECK(tm.maximality(sigma7));
 
+  std::vector<Vertex> sigma4 = {5, 2, 3};
   std::vector<Vertex> sigma5 = {5, 2, 7};
-  K.insert_simplex(sigma5);
-
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-  BOOST_CHECK(K.num_maximal_simplices() == 5);
-
-  auto r = K.contraction(4,5);
+  BOOST_CHECK(tm.membership(sigma4));
+  BOOST_CHECK(!tm.membership(sigma5));
+  std::cout << "insert_simplex {5, 2, 7}" << std::endl;
+  tm.insert_simplex(sigma5);
+
+  std::cout << "num_maximal_simplices" << tm.num_maximal_simplices() << std::endl;
+  BOOST_CHECK(tm.num_maximal_simplices() == 5);
+  // Browse maximal simplices
+  std::cout << "Maximal simplices are :" << std::endl;
+  for (auto simplex_ptr : tm.maximal_simplices()) {
+    for (auto v : *simplex_ptr) {
+      std::cout << v << ", ";
+    }
+    std::cout << std::endl;
+    BOOST_CHECK(tm.maximality(*simplex_ptr));
+  }
+
+  BOOST_CHECK(tm.membership(sigma5));
+
+  std::cout << "contraction(4,5)" << std::endl;
+  auto r = tm.contraction(4,5);
   std::cout << "r=" << r << std::endl;
   BOOST_CHECK(r == 5);
 
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-  BOOST_CHECK(K.num_maximal_simplices() == 5);
-
-  std::vector<Vertex> sigma6 = {2, 7};
-  K.remove_simplex(sigma6);
-
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-  BOOST_CHECK(K.num_maximal_simplices() == 6);
-
-  K.remove_simplex(sigma2);
-
-  std::cout << "num_maximal_simplices" << K.num_maximal_simplices() << std::endl;
-  BOOST_CHECK(K.num_maximal_simplices() == 9);
-
-}
-
-BOOST_AUTO_TEST_CASE(toplex_map_maximality) {
-  using Vertex = Gudhi::Toplex_map::Vertex;
+  std::cout << "num_maximal_simplices" << tm.num_maximal_simplices() << std::endl;
+  BOOST_CHECK(tm.num_maximal_simplices() == 4);
+  // Browse maximal simplices
+  std::cout << "Maximal simplices are :" << std::endl;
+  for (auto simplex_ptr : tm.maximal_simplices()) {
+    for (auto v : *simplex_ptr) {
+      std::cout << v << ", ";
+    }
+    std::cout << std::endl;
+    BOOST_CHECK(tm.maximality(*simplex_ptr));
+  }
+
+  std::vector<Vertex> sigma8 = {1, 2, 3};
+  std::vector<Vertex> sigma9 = {2, 7};
+
+  sigma8.emplace_back(r);
+  sigma9.emplace_back(r);
+  BOOST_CHECK(!tm.membership(sigma6));
+  BOOST_CHECK(tm.membership(sigma8));
+  BOOST_CHECK(tm.membership(sigma9));
+
+  std::cout << "remove_simplex({2, 7, r = 5})" << std::endl;
+  tm.remove_simplex(sigma9);
+  BOOST_CHECK(!tm.membership(sigma9));
+
+  std::cout << "num_maximal_simplices" << tm.num_maximal_simplices() << std::endl;
+  BOOST_CHECK(tm.num_maximal_simplices() == 5);
+  // Browse maximal simplices
+  std::cout << "Maximal simplices are :" << std::endl;
+  for (auto simplex_ptr : tm.maximal_simplices()) {
+    for (auto v : *simplex_ptr) {
+      std::cout << v << ", ";
+    }
+    std::cout << std::endl;
+    BOOST_CHECK(tm.maximality(*simplex_ptr));
+  }
+  // {2, 7, 5} is removed, but verify its edges are still there
+  std::vector<Vertex> edge = {2, 7};
+  BOOST_CHECK(tm.membership(edge));
+  edge = {2, 5};
+  BOOST_CHECK(tm.membership(edge));
+  edge = {7, 5};
+  BOOST_CHECK(tm.membership(edge));
 
-  std::vector<Vertex> sigma1 = {1, 2, 3, 4};
-  std::vector<Vertex> sigma2 = {5, 2, 3, 6};
-  std::vector<Vertex> sigma3 = {5};
-  std::vector<Vertex> sigma4 = {4, 5, 3};
-  std::vector<Vertex> sigma5 = {4, 5, 9};
-
-  Gudhi::Toplex_map K;
-  K.insert_simplex(sigma1);
-  K.insert_simplex(sigma2);
-  K.insert_simplex(sigma3);
-  K.insert_simplex(sigma4);
-  K.insert_simplex(sigma5);
-  BOOST_CHECK(K.maximality(sigma1));
-  BOOST_CHECK(K.maximality(sigma2));
-  BOOST_CHECK(!K.maximality(sigma3));
-  BOOST_CHECK(K.maximality(sigma4));
-  BOOST_CHECK(K.maximality(sigma5));
 }