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

Former-commit-id: 3d5fea05d42ce04bd3ba57e63d6b1e0428ddd96f

2 files changed, 30 insertions, 34 deletions

diff --git a/src/Witness_complex/example/CMakeLists.txt b/src/Witness_complex/example/CMakeLists.txt
index 9990c541..549a85be 100644
--- a/src/Witness_complex/example/CMakeLists.txt
+++ b/src/Witness_complex/example/CMakeLists.txt
@@ -9,40 +9,36 @@ endif()
 add_test(Witness_complex_test_nearest_landmark_table Witness_complex_example_nearest_landmark_table)
 
 # CGAL and Eigen3 are required for Euclidean version of Witness
-if(CGAL_FOUND)
-  if (NOT CGAL_VERSION VERSION_LESS 4.6.0)
-    if (EIGEN3_FOUND)
-      add_executable( Witness_complex_example_off example_witness_complex_off.cpp )
-      target_link_libraries(Witness_complex_example_off ${Boost_SYSTEM_LIBRARY})
-      add_executable( Witness_complex_example_strong_off example_strong_witness_complex_off.cpp )
-      target_link_libraries(Witness_complex_example_strong_off ${Boost_SYSTEM_LIBRARY})
-      add_executable ( Witness_complex_example_sphere example_witness_complex_sphere.cpp )
-      target_link_libraries(Witness_complex_example_sphere ${Boost_SYSTEM_LIBRARY})
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0)
+  add_executable( Witness_complex_example_off example_witness_complex_off.cpp )
+  target_link_libraries(Witness_complex_example_off ${Boost_SYSTEM_LIBRARY})
+  add_executable( Witness_complex_example_strong_off example_strong_witness_complex_off.cpp )
+  target_link_libraries(Witness_complex_example_strong_off ${Boost_SYSTEM_LIBRARY})
+  add_executable ( Witness_complex_example_sphere example_witness_complex_sphere.cpp )
+  target_link_libraries(Witness_complex_example_sphere ${Boost_SYSTEM_LIBRARY})
 
-      add_executable ( Witness_complex_example_witness_persistence example_witness_complex_persistence.cpp )
-      target_link_libraries(Witness_complex_example_witness_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+  add_executable ( Witness_complex_example_witness_persistence example_witness_complex_persistence.cpp )
+  target_link_libraries(Witness_complex_example_witness_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
 
-      add_executable ( Witness_complex_example_strong_witness_persistence example_strong_witness_persistence.cpp )
-      target_link_libraries(Witness_complex_example_strong_witness_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+  add_executable ( Witness_complex_example_strong_witness_persistence example_strong_witness_persistence.cpp )
+  target_link_libraries(Witness_complex_example_strong_witness_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
 
-      if (TBB_FOUND)
-        target_link_libraries(Witness_complex_example_witness_persistence ${TBB_LIBRARIES})
-        target_link_libraries(Witness_complex_example_strong_witness_persistence ${TBB_LIBRARIES})
-      endif()
+  if (TBB_FOUND)
+    target_link_libraries(Witness_complex_example_witness_persistence ${TBB_LIBRARIES})
+    target_link_libraries(Witness_complex_example_strong_witness_persistence ${TBB_LIBRARIES})
+  endif()
 
-      add_test(Witness_complex_off_test_torus
-               ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_off
-               ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off 20 1.0 3)
-      add_test(Witness_complex_strong_off_test_torus
-               ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_strong_off
-               ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off 20 1.0 3)
-      add_test(Witness_complex_test_sphere_10 Witness_complex_example_sphere 10)
-      add_test(Witness_complex_test_torus_persistence
-               ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_witness_persistence
-               ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off -l 20 -a 0.5)
-      add_test(Witness_complex_strong_test_torus_persistence
-               ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_strong_witness_persistence
-               ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off -l 20 -a 0.5)
-    endif(EIGEN3_FOUND)
-  endif (NOT CGAL_VERSION VERSION_LESS 4.6.0)
-endif()
+  add_test(Witness_complex_off_test_torus
+           ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_off
+           ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off 20 1.0 3)
+  add_test(Witness_complex_strong_off_test_torus
+           ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_strong_off
+           ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off 20 1.0 3)
+  add_test(Witness_complex_test_sphere_10 Witness_complex_example_sphere 10)
+  add_test(Witness_complex_test_torus_persistence
+           ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_witness_persistence
+           ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off -l 20 -a 0.5)
+  add_test(Witness_complex_strong_test_torus_persistence
+           ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_strong_witness_persistence
+           ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off -l 20 -a 0.5)
+endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0)
diff --git a/src/Witness_complex/example/example_witness_complex_sphere.cpp b/src/Witness_complex/example/example_witness_complex_sphere.cpp
index 06fe3889..124fd99b 100644
--- a/src/Witness_complex/example/example_witness_complex_sphere.cpp
+++ b/src/Witness_complex/example/example_witness_complex_sphere.cpp
@@ -60,12 +60,12 @@ int main(int argc, char * const argv[]) {
   }
 
   int number_of_landmarks = atoi(argv[1]);
-  clock_t start, end;
 
   std::vector< std::pair<int, double> > l_time;
 
   // Generate points
   for (int nbP = 500; nbP < 10000; nbP += 500) {
+    clock_t start, end;
     // Construct the Simplex Tree
     Gudhi::Simplex_tree<> simplex_tree;
     Point_Vector point_vector, landmarks;