diff options
-rw-r--r-- | src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp | 16 | ||||
-rw-r--r-- | src/common/doc/main_page.h | 14 | ||||
-rw-r--r-- | src/common/include/gudhi/Points_3D_off_io.h | 8 |
3 files changed, 21 insertions, 17 deletions
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 e9425066..42e6f0c6 100644 --- a/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp +++ b/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp @@ -45,14 +45,14 @@ using K = CGAL::Exact_predicates_inexact_constructions_kernel; using PK = CGAL::Periodic_3_Delaunay_triangulation_traits_3<K>; // Vertex type using DsVb = CGAL::Periodic_3_triangulation_ds_vertex_base_3<>; -using Vb = CGAL::Triangulation_vertex_base_3<PK,DsVb>; -using AsVb = CGAL::Alpha_shape_vertex_base_3<PK,Vb>; +using Vb = CGAL::Triangulation_vertex_base_3<PK, DsVb>; +using AsVb = CGAL::Alpha_shape_vertex_base_3<PK, Vb>; // Cell type using DsCb = CGAL::Periodic_3_triangulation_ds_cell_base_3<>; -using Cb = CGAL::Triangulation_cell_base_3<PK,DsCb>; -using AsCb = CGAL::Alpha_shape_cell_base_3<PK,Cb>; -using Tds = CGAL::Triangulation_data_structure_3<AsVb,AsCb>; -using P3DT3 = CGAL::Periodic_3_Delaunay_triangulation_3<PK,Tds>; +using Cb = CGAL::Triangulation_cell_base_3<PK, DsCb>; +using AsCb = CGAL::Alpha_shape_cell_base_3<PK, Cb>; +using Tds = CGAL::Triangulation_data_structure_3<AsVb, AsCb>; +using P3DT3 = CGAL::Periodic_3_Delaunay_triangulation_3<PK, Tds>; using Alpha_shape_3 = CGAL::Alpha_shape_3<P3DT3>; using Point_3 = PK::Point_3; @@ -162,9 +162,9 @@ int main(int argc, char * const argv[]) { // 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(0, 0, 0, 1, 1, 1)); // 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 diff --git a/src/common/doc/main_page.h b/src/common/doc/main_page.h index 063e0a11..ecf3251f 100644 --- a/src/common/doc/main_page.h +++ b/src/common/doc/main_page.h @@ -189,8 +189,6 @@ * Library</a> (CGAL \cite cgal:eb-15b) and will not be built if CGAL is not installed: * \li <a href="_persistent_cohomology_2alpha_complex_3d_persistence_8cpp-example.html"> * Persistent_cohomology/alpha_complex_3d_persistence.cpp</a> - * \li <a href="_persistent_cohomology_2alpha_complex_persistence_8cpp-example.html"> - * Persistent_cohomology/alpha_complex_persistence.cpp</a> * \li <a href="_simplex_tree_2simplex_tree_from_alpha_shapes_3_8cpp-example.html"> * Simplex_tree/simplex_tree_from_alpha_shapes_3.cpp</a> * \li <a href="_alpha_complex_2_alpha_complex_from_off_8cpp-example.html"> @@ -207,8 +205,10 @@ * Alpha_complex/Alpha_complex_from_off.cpp</a> * \li <a href="_alpha_complex_2_alpha_complex_from_points_8cpp-example.html"> * Alpha_complex/Alpha_complex_from_points.cpp</a> - * \li <a href="common_2_c_g_a_l_points_off_reader_8cpp-example.html"> - * common/CGAL_points_off_reader.cpp</a> + * \li <a href="_persistent_cohomology_2alpha_complex_persistence_8cpp-example.html"> + * Persistent_cohomology/alpha_complex_persistence.cpp</a> + * \li <a href="_persistent_cohomology_2periodic_alpha_complex_3d_persistence_8cpp-example.html"> + * Persistent_cohomology/periodic_alpha_complex_3d_persistence.cpp</a> * * \subsection eigen3 Eigen3: * <a target="_blank" href="http://eigen.tuxfamily.org/">Eigen3</a> is a C++ template library for linear algebra: @@ -222,6 +222,8 @@ * Alpha_complex/Alpha_complex_from_points.cpp</a> (requires also Eigen3) * \li <a href="_persistent_cohomology_2alpha_complex_persistence_8cpp-example.html"> * Persistent_cohomology/alpha_complex_persistence.cpp</a> + * \li <a href="_persistent_cohomology_2periodic_alpha_complex_3d_persistence_8cpp-example.html"> + * Persistent_cohomology/periodic_alpha_complex_3d_persistence.cpp</a> * * \subsection tbb Threading Building Blocks: * <a target="_blank" href="https://www.threadingbuildingblocks.org/">Intel® TBB</a> lets you easily write parallel @@ -267,6 +269,8 @@ * Persistent_cohomology/rips_multifield_persistence.cpp</a> * \li <a href="_persistent_cohomology_2rips_persistence_8cpp-example.html"> * Persistent_cohomology/rips_persistence.cpp</a> + * \li <a href="_persistent_cohomology_2periodic_alpha_complex_3d_persistence_8cpp-example.html"> + * Persistent_cohomology/periodic_alpha_complex_3d_persistence.cpp</a> * * \subsection demos Demos and examples * To build the demos and examples, run the following commands in a terminal: @@ -307,6 +311,7 @@ make \endverbatim * @example Bitmap_cubical_complex/Bitmap_cubical_complex.cpp * @example Bitmap_cubical_complex/Bitmap_cubical_complex_periodic_boundary_conditions.cpp * @example Bitmap_cubical_complex/Random_bitmap_cubical_complex.cpp + * @example common/CGAL_3D_points_off_reader.cpp * @example common/CGAL_points_off_reader.cpp * @example Contraction/Garland_heckbert.cpp * @example Contraction/Rips_contraction.cpp @@ -314,6 +319,7 @@ make \endverbatim * @example Persistent_cohomology/alpha_complex_persistence.cpp * @example Persistent_cohomology/parallel_rips_persistence.cpp * @example Persistent_cohomology/performance_rips_persistence.cpp + * @example Persistent_cohomology/periodic_alpha_complex_3d_persistence.cpp * @example Persistent_cohomology/persistence_from_file.cpp * @example Persistent_cohomology/persistence_from_simple_simplex_tree.cpp * @example Persistent_cohomology/plain_homology.cpp diff --git a/src/common/include/gudhi/Points_3D_off_io.h b/src/common/include/gudhi/Points_3D_off_io.h index 1d3b35c7..2647f11e 100644 --- a/src/common/include/gudhi/Points_3D_off_io.h +++ b/src/common/include/gudhi/Points_3D_off_io.h @@ -41,7 +41,6 @@ class Points_3D_off_visitor_reader { bool valid_; public: - /** @brief Off_reader visitor init implementation. * * The init parameters are set from OFF file header. @@ -138,11 +137,11 @@ class Points_3D_off_visitor_reader { * This example loads points from an OFF file and builds a vector of CGAL points in dimension 3. * Then, it is asked to display the points. * - * @include common/CGAL_Points_3D_off_reader.cpp + * @include common/CGAL_3D_points_off_reader.cpp * * When launching: * - * @code $> ./cgal3Doffreader ../../data/points/alphacomplexdoc.off + * @code $> ./cgal3Doffreader ../../data/points/tore3D_300.off * @endcode * * the program output is: @@ -152,7 +151,6 @@ class Points_3D_off_visitor_reader { template<typename Point_3> class Points_3D_off_reader { public: - /** @brief Reads the OFF file and constructs a vector of points from the points * that are in the OFF file. * @@ -199,6 +197,6 @@ class Points_3D_off_reader { bool valid_; }; -} // namespace Gudhi +} // namespace Gudhi #endif // POINTS_3D_OFF_IO_H_ |