diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-04-15 13:08:20 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-04-15 13:08:20 +0000 |
commit | 91e58d98e81963ac714ec6c9508c5bc15945f20b (patch) | |
tree | 463f54f973029bc764280572d133f42487fc3d6f | |
parent | 8c9f21dee8b91fcb0b8073fe3e5c2fcbe07206e5 (diff) |
Periodic bug fix
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/periodic_alpha_complex_3d@1125 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 2540ab0edd3f26219bbc3cbd7068e7f5a043f7c2
-rw-r--r-- | src/Persistent_cohomology/example/README | 19 | ||||
-rw-r--r-- | src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp | 4 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/Persistent_cohomology/example/README b/src/Persistent_cohomology/example/README index 92b80c76..f490ed9a 100644 --- a/src/Persistent_cohomology/example/README +++ b/src/Persistent_cohomology/example/README @@ -105,18 +105,19 @@ N.B.: alpha_complex_persistence accepts OFF files in d-Dimension. 3) 3D periodic special case --------------------------- -./periodic_alpha_complex_3d_persistence ../../data/points/grid_10_10_10_in_0_1.off 2 0.0 +./periodic_alpha_complex_3d_persistence ../../data/points/grid_10_10_10_in_0_1.off 3 1.0 output: Periodic Delaunay computed. Simplex_tree dim: 3 -2 0 0.0866025 inf -2 1 0.0866025 inf -2 1 0.0866025 inf -2 1 0.0866025 inf -2 2 0.0866025 inf -2 2 0.0866025 inf -2 2 0.0866025 inf +3 0 0 inf +3 1 0.05 inf +3 1 0.05 inf +3 1 0.05 inf +3 2 0.0707107 inf +3 2 0.0707107 inf +3 2 0.0707107 inf +3 3 0.0866025 inf N.B.: periodic_alpha_complex_3d_persistence accepts only OFF files in 3D dimension. In this example, the periodic cube is hard coded to { x = [0,1]; y = [0,1]; z = [0,1] } @@ -139,4 +140,4 @@ output: 2 0 0 inf 2 1 0 inf -Here we retrieve the 2 entities {0,1,2,3} and {4} (Betti numbers[0] = 2) and the hole in {0,1,3} (Betti numbers[1] = 1)
\ No newline at end of file +Here we retrieve the 2 entities {0,1,2,3} and {4} (Betti numbers[0] = 2) and the hole in {0,1,3} (Betti numbers[1] = 1) 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 42e6f0c6..750ebb1a 100644 --- a/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp +++ b/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp @@ -173,7 +173,7 @@ int main(int argc, char * const argv[]) { // alpha shape construction from points. CGAL has a strange behavior in REGULARIZED mode. This is the default mode // Maybe need to set it to GENERAL mode - Alpha_shape_3 as(pdt, Alpha_shape_3::GENERAL); + Alpha_shape_3 as(pdt, 0, Alpha_shape_3::GENERAL); // filtration with alpha values from alpha shape std::vector<Object> the_objects; @@ -291,7 +291,7 @@ int main(int argc, char * const argv[]) { std::cout << "Simplex_tree dim: " << simplex_tree.dimension() << std::endl; // Compute the persistence diagram of the complex - Persistent_cohomology pcoh(simplex_tree); + Persistent_cohomology pcoh(simplex_tree, true); // initializes the coefficient field for homology pcoh.init_coefficients(coeff_field_characteristic); |