From dc7e8e3267dcabe24c56af9377baa1466eec6fc3 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Wed, 8 Jun 2016 07:43:06 +0000
Subject: periodic_alpha_complex_3d_persistence modification for is_cuboid_3 to
 be customized through a file.

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

Former-commit-id: 9862a35dcdfc0dbf0eff01375ea716f094833127
---
 src/Persistent_cohomology/example/CMakeLists.txt   |  2 +-
 .../periodic_alpha_complex_3d_persistence.cpp      | 24 +++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'src/Persistent_cohomology')

diff --git a/src/Persistent_cohomology/example/CMakeLists.txt b/src/Persistent_cohomology/example/CMakeLists.txt
index 186a6c33..b335fb3a 100644
--- a/src/Persistent_cohomology/example/CMakeLists.txt
+++ b/src/Persistent_cohomology/example/CMakeLists.txt
@@ -83,7 +83,7 @@ if(GMPXX_FOUND AND GMP_FOUND)
           target_link_libraries(custom_persistence_sort ${TBB_RELEASE_LIBRARY})
         endif()
         add_test(alpha_complex_persistence_2_0_45 ${CMAKE_CURRENT_BINARY_DIR}/alpha_complex_persistence ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -m 0.45 -p 2)
-        add_test(periodic_alpha_complex_3d_persistence_2_0 ${CMAKE_CURRENT_BINARY_DIR}/periodic_alpha_complex_3d_persistence ${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off 2 0)
+        add_test(periodic_alpha_complex_3d_persistence_2_0 ${CMAKE_CURRENT_BINARY_DIR}/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)
         add_test(custom_persistence_sort ${CMAKE_CURRENT_BINARY_DIR}/custom_persistence_sort)
 
       else()
diff --git a/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp b/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp
index b8e1097d..a199fea1 100644
--- a/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp
+++ b/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp
@@ -125,28 +125,28 @@ Vertex_list from(const Alpha_shape_3::Vertex_handle& vh) {
 
 void usage(char * const progName) {
   std::cerr << "Usage: " << progName <<
-      " path_to_file_graph coeff_field_characteristic[integer > 0] min_persistence[float >= -1.0]\n";
+      " path_to_file_graph path_to_iso_cuboid_3_file coeff_field_characteristic[integer > 0] min_persistence[float >= -1.0]\n";
   exit(-1);
 }
 
 int main(int argc, char * const argv[]) {
   // program args management
-  if (argc != 4) {
+  if (argc != 5) {
     std::cerr << "Error: Number of arguments (" << argc << ") is not correct\n";
     usage(argv[0]);
   }
 
   int coeff_field_characteristic = 0;
-  int returnedScanValue = sscanf(argv[2], "%d", &coeff_field_characteristic);
+  int returnedScanValue = sscanf(argv[3], "%d", &coeff_field_characteristic);
   if ((returnedScanValue == EOF) || (coeff_field_characteristic <= 0)) {
-    std::cerr << "Error: " << argv[2] << " is not correct\n";
+    std::cerr << "Error: " << argv[3] << " is not correct\n";
     usage(argv[0]);
   }
 
   Filtration_value min_persistence = 0.0;
-  returnedScanValue = sscanf(argv[3], "%lf", &min_persistence);
+  returnedScanValue = sscanf(argv[4], "%lf", &min_persistence);
   if ((returnedScanValue == EOF) || (min_persistence < -1.0)) {
-    std::cerr << "Error: " << argv[3] << " is not correct\n";
+    std::cerr << "Error: " << argv[4] << " is not correct\n";
     usage(argv[0]);
   }
 
@@ -160,11 +160,21 @@ int main(int argc, char * const argv[]) {
     usage(argv[0]);
   }
 
+  // Read iso_cuboid_3 information from file
+  std::ifstream iso_cuboid_str(argv[2]);
+  double x_min, y_min, z_min, x_max, y_max, z_max;
+  if (iso_cuboid_str.good()) {
+    iso_cuboid_str >> x_min >> y_min >> z_min >> x_max >> y_max >> z_max;
+  } else {
+    std::cerr << "Unable to read file " << argv[2] << std::endl;
+    usage(argv[0]);
+  }
+
   // Retrieve the triangulation
   std::vector<Point_3> lp = off_reader.get_point_cloud();
 
   // Define the periodic cube
-  P3DT3 pdt(PK::Iso_cuboid_3(0, 0, 0, 1, 1, 1));
+  P3DT3 pdt(PK::Iso_cuboid_3(x_min, y_min, z_min, x_max, y_max, z_max));
   // Heuristic for inserting large point sets (if pts is reasonably large)
   pdt.insert(lp.begin(), lp.end(), true);
   // As pdt won't be modified anymore switch to 1-sheeted cover if possible
-- 
cgit v1.2.3