Fix weighted periodic alpa complex 3d example test

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

Former-commit-id: ddf754a1f8046c7b17db89668cf8d4dd95f69dac

3 files changed, 1005 insertions, 3 deletions

diff --git a/data/points/grid_10_10_10_in_0_1.weights b/data/points/grid_10_10_10_in_0_1.weights
new file mode 100644
index 00000000..48926e09
--- /dev/null
+++ b/data/points/grid_10_10_10_in_0_1.weights
@@ -0,0 +1,1000 @@
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
+1e-6
diff --git a/src/Persistent_cohomology/example/CMakeLists.txt b/src/Persistent_cohomology/example/CMakeLists.txt
index f6c866dc..be23de35 100644
--- a/src/Persistent_cohomology/example/CMakeLists.txt
+++ b/src/Persistent_cohomology/example/CMakeLists.txt
@@ -105,7 +105,7 @@ if(CGAL_FOUND)
     add_test(NAME Persistent_cohomology_example_alpha_complex COMMAND $<TARGET_FILE:alpha_complex_persistence>
         "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off" "-p" "2" "-m" "0.45")
     add_test(NAME Persistent_cohomology_example_periodic_alpha_complex_3d COMMAND $<TARGET_FILE:periodic_alpha_complex_3d_persistence>
-        "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off" "${CMAKE_SOURCE_DIR}/data/points/iso_cuboid_3_in_0_1.txt" "2" "0")
+        "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off" "${CMAKE_SOURCE_DIR}/data/points/iso_cuboid_3_in_0_1.txt" "3" "1.0")
     add_test(NAME Persistent_cohomology_example_custom_persistence_sort COMMAND $<TARGET_FILE:custom_persistence_sort>)
 
     install(TARGETS alpha_complex_persistence DESTINATION bin)
@@ -121,6 +121,10 @@ if(CGAL_FOUND)
       target_link_libraries(weighted_periodic_alpha_complex_3d_persistence ${TBB_LIBRARIES})
     endif(TBB_FOUND)
 
+    add_test(NAME Persistent_cohomology_example_weigted_periodic_alpha_complex_3d COMMAND $<TARGET_FILE:weighted_periodic_alpha_complex_3d_persistence>
+        "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off" "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.weights"
+        "${CMAKE_SOURCE_DIR}/data/points/iso_cuboid_3_in_0_1.txt" "3" "1.0")
+
     install(TARGETS weighted_periodic_alpha_complex_3d_persistence DESTINATION bin)
 
     # On CGAL 4.11, the weighted alpha shape 3 interface was changed - the new interface
diff --git a/src/Persistent_cohomology/example/weighted_periodic_alpha_complex_3d_persistence.cpp b/src/Persistent_cohomology/example/weighted_periodic_alpha_complex_3d_persistence.cpp
index 2ecb3f24..ab2e29b4 100644
--- a/src/Persistent_cohomology/example/weighted_periodic_alpha_complex_3d_persistence.cpp
+++ b/src/Persistent_cohomology/example/weighted_periodic_alpha_complex_3d_persistence.cpp
@@ -149,10 +149,8 @@ int main(int argc, char* const argv[]) {
 
   // Define the periodic cube
   P3RT3 prt(PK::Iso_cuboid_3(x_min, y_min, z_min, x_max, y_max, z_max));
-  std::cout << "1 " << std::endl;
   // Heuristic for inserting large point sets (if pts is reasonably large)
   prt.insert(wp.begin(), wp.end(), true);
-  std::cout << "2 " << std::endl;
   // As prt won't be modified anymore switch to 1-sheeted cover if possible
   if (prt.is_triangulation_in_1_sheet()) prt.convert_to_1_sheeted_covering();
   std::cout << "Periodic Delaunay computed." << std::endl;