From 3e46bcd4ec49e35937108bc44a3c0434a9ca174a Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 15 Apr 2016 12:12:45 +0000 Subject: Doc bug fix git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/periodic_alpha_complex_3d@1121 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 48bb0bb605dfdb9c20bcf5d8de049aef6caf15a5 --- .../example/periodic_alpha_complex_3d_persistence.cpp | 16 ++++++++-------- src/common/doc/main_page.h | 14 ++++++++++---- src/common/include/gudhi/Points_3D_off_io.h | 8 +++----- 3 files changed, 21 insertions(+), 17 deletions(-) (limited to 'src') 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; // Vertex type using DsVb = CGAL::Periodic_3_triangulation_ds_vertex_base_3<>; -using Vb = CGAL::Triangulation_vertex_base_3; -using AsVb = CGAL::Alpha_shape_vertex_base_3; +using Vb = CGAL::Triangulation_vertex_base_3; +using AsVb = CGAL::Alpha_shape_vertex_base_3; // Cell type using DsCb = CGAL::Periodic_3_triangulation_ds_cell_base_3<>; -using Cb = CGAL::Triangulation_cell_base_3; -using AsCb = CGAL::Alpha_shape_cell_base_3; -using Tds = CGAL::Triangulation_data_structure_3; -using P3DT3 = CGAL::Periodic_3_Delaunay_triangulation_3; +using Cb = CGAL::Triangulation_cell_base_3; +using AsCb = CGAL::Alpha_shape_cell_base_3; +using Tds = CGAL::Triangulation_data_structure_3; +using P3DT3 = CGAL::Periodic_3_Delaunay_triangulation_3; using Alpha_shape_3 = CGAL::Alpha_shape_3; using Point_3 = PK::Point_3; @@ -162,9 +162,9 @@ int main(int argc, char * const argv[]) { // Retrieve the triangulation std::vector 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 (CGAL \cite cgal:eb-15b) and will not be built if CGAL is not installed: * \li * Persistent_cohomology/alpha_complex_3d_persistence.cpp - * \li - * Persistent_cohomology/alpha_complex_persistence.cpp * \li * Simplex_tree/simplex_tree_from_alpha_shapes_3.cpp * \li @@ -207,8 +205,10 @@ * Alpha_complex/Alpha_complex_from_off.cpp * \li * Alpha_complex/Alpha_complex_from_points.cpp - * \li - * common/CGAL_points_off_reader.cpp + * \li + * Persistent_cohomology/alpha_complex_persistence.cpp + * \li + * Persistent_cohomology/periodic_alpha_complex_3d_persistence.cpp * * \subsection eigen3 Eigen3: * Eigen3 is a C++ template library for linear algebra: @@ -222,6 +222,8 @@ * Alpha_complex/Alpha_complex_from_points.cpp (requires also Eigen3) * \li * Persistent_cohomology/alpha_complex_persistence.cpp + * \li + * Persistent_cohomology/periodic_alpha_complex_3d_persistence.cpp * * \subsection tbb Threading Building Blocks: * Intel® TBB lets you easily write parallel @@ -267,6 +269,8 @@ * Persistent_cohomology/rips_multifield_persistence.cpp * \li * Persistent_cohomology/rips_persistence.cpp + * \li + * Persistent_cohomology/periodic_alpha_complex_3d_persistence.cpp * * \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 02e6f910..45c8455e 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. @@ -140,11 +139,11 @@ class Points_3D_off_visitor_reader { * * Asserts * - * @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: @@ -154,7 +153,6 @@ class Points_3D_off_visitor_reader { template 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. * @@ -201,6 +199,6 @@ class Points_3D_off_reader { bool valid_; }; -} // namespace Gudhi +} // namespace Gudhi #endif // POINTS_3D_OFF_IO_H_ -- cgit v1.2.3