Modified existing tests and examples

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

Former-commit-id: cd187fe5bc9174403aa5dc96c74871c697b3a5e6

2 files changed, 16 insertions, 29 deletions

diff --git a/src/Witness_complex/test/CMakeLists.txt b/src/Witness_complex/test/CMakeLists.txt
index bb55b0f1..751f533c 100644
--- a/src/Witness_complex/test/CMakeLists.txt
+++ b/src/Witness_complex/test/CMakeLists.txt
@@ -10,14 +10,14 @@ if (GPROF_PATH)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
 endif()
 
-add_executable ( simple_witness_complexUT simple_witness_complex.cpp )
-target_link_libraries(simple_witness_complexUT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+add_executable ( Witness_complex_test_simple_witness_complex test_simple_witness_complex.cpp )
+target_link_libraries(Witness_complex_test_simple_witness_complex ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
 # Unitary tests definition and xml result file generation
-add_test(NAME simple_witness_complexUT
-  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/simple_witness_complexUT 
+add_test(NAME simple_witness_complex
+  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_test_simple_witness_complex 
     # XML format for Jenkins xUnit plugin 
-    --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/simple_witness_complexUT.xml --log_level=test_suite --report_level=no)
+    --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Witness_complex_test_simple_witness_complex.xml --log_level=test_suite --report_level=no)
 
 add_executable ( witness_complex_pointsUT witness_complex_points.cpp )
 target_link_libraries(witness_complex_pointsUT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
diff --git a/src/Witness_complex/test/simple_witness_complex.cpp b/src/Witness_complex/test/test_simple_witness_complex.cpp
index 0c2c3710..abd0a0dd 100644
--- a/src/Witness_complex/test/simple_witness_complex.cpp
+++ b/src/Witness_complex/test/test_simple_witness_complex.cpp
@@ -44,11 +44,11 @@ typedef Gudhi::witness_complex::Witness_complex<Kernel> WitnessComplex;
 typedef Gudhi::witness_complex::Strong_witness_complex<Kernel> StrongWitnessComplex;
 
 /* All landmarks and witnesses are taken on the grid in the following manner.
-   LWLWL  2W4W7
-   WW.WW  WW.WW
-   L...L  1...6
-   WW.WW  WW.WW
-   LWLWL  0W3W5
+   LWLWL  
+   WW.WW  
+   L...L  
+   WW.WW  
+   LWLWL  
 
    Witness complex consists of 8 vertices, 12 edges and 4 triangles
  */
@@ -78,39 +78,26 @@ BOOST_AUTO_TEST_CASE(simple_witness_complex) {
   witnesses.push_back(Point_d(std::vector<FT>{ 1, 2}));
   witnesses.push_back(Point_d(std::vector<FT>{ 2,-1}));
   witnesses.push_back(Point_d(std::vector<FT>{ 2, 1}));
-
-  // landmarks.push_back(Point_d(std::vector<FT>{1,0}));
-  // landmarks.push_back(Point_d(std::vector<FT>{0,0}));
-  // landmarks.push_back(Point_d(std::vector<FT>{0,1}));
-  // witnesses.push_back(Point_d(std::vector<FT>{1,0}));
   
   WitnessComplex witness_complex(landmarks.begin(),
                                  landmarks.end(),
                                  witnesses.begin(),
                                  witnesses.end());
-  // witness_complex.create_complex(complex, 0);
+  witness_complex.create_complex(complex, 0);
 
-  //std::cout << complex << "\n";
+  BOOST_CHECK(complex.num_simplices() == 24);
 
-  // BOOST_CHECK(complex.num_simplices() == 24);
+  witness_complex.create_complex(relaxed_complex, 8.01);
 
-  // witness_complex.create_complex(relaxed_complex, 8.01);
+  BOOST_CHECK(relaxed_complex.num_simplices() == 239);
   
-  // std::cout << "Num_simplices: " << relaxed_complex.num_simplices() << "\n";
-  // std::cout << relaxed_complex << "\n";
-
   StrongWitnessComplex strong_witness_complex(landmarks.begin(),
                                               landmarks.end(),
                                               witnesses.begin(),
                                               witnesses.end());
 
   strong_witness_complex.create_complex(strong_relaxed_complex, 9.1);
-  std::cout << "Num_simplices: " << strong_relaxed_complex.num_simplices() << "\n";
-  std::cout << strong_relaxed_complex << "\n";
-  
-  //BOOST_CHECK(relaxed_complex.num_simplices() == 24);
-  
-  //BOOST_CHECK(witnessComplex.is_witness_complex(knn, false));
-
+    
+  BOOST_CHECK(strong_relaxed_complex.num_simplices() == 239);
   
 }