From a99cac04ca5b61d1f9a1c5246829d017a6cf278d Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 15 Jun 2018 08:13:42 +0000 Subject: Weighted, normal and exact version of Alpha_shapes_3 git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alpha_complex_3d_module_vincent@3618 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: f1b2014fe34b3e7814d9c3d02881c63e10f047b2 --- src/Alpha_complex/example/CMakeLists.txt | 2 + src/Alpha_complex/example/traits_test.cpp | 35 ++++ src/Alpha_complex/include/gudhi/Alpha_complex_3d.h | 193 +++++++++++++++++++++ 3 files changed, 230 insertions(+) create mode 100644 src/Alpha_complex/example/traits_test.cpp create mode 100644 src/Alpha_complex/include/gudhi/Alpha_complex_3d.h diff --git a/src/Alpha_complex/example/CMakeLists.txt b/src/Alpha_complex/example/CMakeLists.txt index 2fc62452..c93832d2 100644 --- a/src/Alpha_complex/example/CMakeLists.txt +++ b/src/Alpha_complex/example/CMakeLists.txt @@ -32,4 +32,6 @@ if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0) install(TARGETS Alpha_complex_example_from_points DESTINATION bin) install(TARGETS Alpha_complex_example_from_off DESTINATION bin) + add_executable ( traits_test traits_test.cpp ) + endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0) diff --git a/src/Alpha_complex/example/traits_test.cpp b/src/Alpha_complex/example/traits_test.cpp new file mode 100644 index 00000000..63b9740c --- /dev/null +++ b/src/Alpha_complex/example/traits_test.cpp @@ -0,0 +1,35 @@ +#include + +#include +#include +#include +#include // for numeric limits + +void usage(int nbArgs, char * const progName) { + std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n"; + std::cerr << "Usage: " << progName << " [alpha_square_max_value]\n"; + std::cerr << " i.e.: " << progName << " 60.0\n"; + exit(-1); // ----- >> +} + +int main(int argc, char **argv) { + //if ((argc != 1) && (argc != 2)) usage(argc, (argv[0] - 1)); + + using Alpha_shapes_3d = Gudhi::alpha_complex::Alpha_shapes_3d; + std::vector points; + points.push_back(Alpha_shapes_3d::Point_3(1., 2., 3.)); + points.push_back(Alpha_shapes_3d::Point_3(6., 5., 4.)); + + Gudhi::alpha_complex::Alpha_complex_3d alpha_complex(points); + + using Weighted_alpha_shapes_3d = Gudhi::alpha_complex::Weighted_alpha_shapes_3d; + std::vector w_points; + w_points.push_back(Alpha_shapes_3d::Point_3(1., 2., 3.)); + w_points.push_back(Alpha_shapes_3d::Point_3(6., 5., 4.)); + + std::vector weights = {1., 2.}; + + Gudhi::alpha_complex::Alpha_complex_3d weighted_alpha_complex(points, weights); + + return 0; +} diff --git a/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h b/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h new file mode 100644 index 00000000..dc083142 --- /dev/null +++ b/src/Alpha_complex/include/gudhi/Alpha_complex_3d.h @@ -0,0 +1,193 @@ +/* This file is part of the Gudhi Library. The Gudhi library + * (Geometric Understanding in Higher Dimensions) is a generic C++ + * library for computational topology. + * + * Author(s): Vincent Rouvreau + * + * Copyright (C) 2018 Inria + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef ALPHA_COMPLEX_3D_H_ +#define ALPHA_COMPLEX_3D_H_ + + +#include + +#include +#include +#include +#include +#include +#include +#include + + +namespace Gudhi { + +namespace alpha_complex { + +class Alpha_shapes_3d { +private: + // Alpha_shape_3 templates type definitions + using Kernel = CGAL::Exact_predicates_inexact_constructions_kernel; + using Vb = CGAL::Alpha_shape_vertex_base_3; + using Fb = CGAL::Alpha_shape_cell_base_3; + using Tds = CGAL::Triangulation_data_structure_3; + using Triangulation_3 = CGAL::Delaunay_triangulation_3; + +public: + using Alpha_shape_3 = CGAL::Alpha_shape_3; + using Point_3 = Kernel::Point_3; + + static const bool exact = false; + static const bool weighted = false; + static const bool periodic = false; + +}; + +class Exact_alpha_shapes_3d { +private: + // Alpha_shape_3 templates type definitions + using Kernel = CGAL::Exact_predicates_inexact_constructions_kernel; + using Exact_tag = CGAL::Tag_true; + using Vb = CGAL::Alpha_shape_vertex_base_3; + using Fb = CGAL::Alpha_shape_cell_base_3; + using Tds = CGAL::Triangulation_data_structure_3; + using Triangulation_3 = CGAL::Delaunay_triangulation_3; + +public: + using Alpha_shape_3 = CGAL::Alpha_shape_3; + using Point_3 = Kernel::Point_3; + + static const bool exact = true; + static const bool weighted = false; + static const bool periodic = false; +}; + +class Weighted_alpha_shapes_3d { +private: + using Kernel = CGAL::Exact_predicates_inexact_constructions_kernel; + using Rvb = CGAL::Regular_triangulation_vertex_base_3; + using Vb = CGAL::Alpha_shape_vertex_base_3; + using Rcb = CGAL::Regular_triangulation_cell_base_3; + using Cb = CGAL::Alpha_shape_cell_base_3; + using Tds = CGAL::Triangulation_data_structure_3; + using Triangulation_3 = CGAL::Regular_triangulation_3; + + +public: + using Alpha_shape_3 = CGAL::Alpha_shape_3; + using Point_3 = Triangulation_3::Bare_point; + using Weighted_point_3 = Triangulation_3::Weighted_point; + + static const bool exact = false; + static const bool weighted = true; + static const bool periodic = false; +}; + +template +class Alpha_complex_3d { +private: + using Alpha_shape_3 = typename AlphaComplex3dOptions::Alpha_shape_3; + // filtration with alpha values needed type definition + using Alpha_value_type = typename Alpha_shape_3::FT; + using Object = CGAL::Object; + using Dispatch = + CGAL::Dispatch_output_iterator, + CGAL::cpp11::tuple >, + std::back_insert_iterator > > >; + using Cell_handle = typename Alpha_shape_3::Cell_handle; + using Facet = typename Alpha_shape_3::Facet; + using Edge_3 = typename Alpha_shape_3::Edge; + using Vertex_handle = typename Alpha_shape_3::Vertex_handle; + +public: + /** \brief Alpha_complex constructor from a list of points. + * + * Duplicate points are inserted once in the Alpha_complex. This is the reason why the vertices may be not contiguous. + * + * @param[in] points Range of points to triangulate. Points must be in AlphaComplex3dOptions::Point_3 + * + * The type InputPointRange must be a range for which std::begin and + * std::end return input iterators on a AlphaComplex3dOptions::Point_3. + */ + template + Alpha_complex_3d(const InputPointRange& points) { + static_assert(!AlphaComplex3dOptions::weighted, "This constructor is not available for weighted versions of Alpha_complex_3d"); + static_assert(!AlphaComplex3dOptions::periodic, "This constructor is not available for periodic versions of Alpha_complex_3d"); + std::cout << points[0] << std::endl; + Alpha_shape_3 alpha_shape_3(std::begin(points), std::end(points), 0, Alpha_shape_3::GENERAL); + + Dispatch disp = CGAL::dispatch_output(std::back_inserter(the_objects), + std::back_inserter(the_alpha_values)); + + alpha_shape_3.filtration_with_alpha_values(disp); +#ifdef DEBUG_TRACES + std::cout << "filtration_with_alpha_values returns : " << the_objects.size() << " objects" << std::endl; +#endif // DEBUG_TRACES + + } + + /** \brief Alpha_complex constructor from a list of points. +* +* Duplicate points are inserted once in the Alpha_complex. This is the reason why the vertices may be not contiguous. +* +* @param[in] points Range of points to triangulate. Points must be in Kernel::Point_d +* +* The type InputPointRange must be a range for which std::begin and +* std::end return input iterators on a Kernel::Point_d. +*/ + template + Alpha_complex_3d(const InputPointRange& points, WeightRange weights) { + static_assert(AlphaComplex3dOptions::weighted, + "This constructor is not available for non-weighted versions of Alpha_complex_3d"); + static_assert(!AlphaComplex3dOptions::periodic, + "This constructor is not available for periodic versions of Alpha_complex_3d"); + GUDHI_CHECK((weights.size() == points.size()), + std::invalid_argument("Alpha_complex_3d constructor with weights requires points number to be equal with points number")); + + using Weighted_point_3 = typename AlphaComplex3dOptions::Weighted_point_3; + std::vector weighted_points_3; + + std::size_t index = 0; + weighted_points_3.reserve(points.size()); + while ((index < weights.size()) && (index < points.size())) { + weighted_points_3.push_back(Weighted_point_3(points[index], weights[index])); + index++; + } + + Alpha_shape_3 alpha_shape_3(std::begin(weighted_points_3), std::end(weighted_points_3), 0, Alpha_shape_3::GENERAL); + + Dispatch disp = CGAL::dispatch_output(std::back_inserter(the_objects), + std::back_inserter(the_alpha_values)); + + alpha_shape_3.filtration_with_alpha_values(disp); +#ifdef DEBUG_TRACES + std::cout << "filtration_with_alpha_values returns : " << the_objects.size() << " objects" << std::endl; +#endif // DEBUG_TRACES + } + +private: + std::vector the_objects; + std::vector the_alpha_values; + +}; + +} // namespace alpha_complex + +} // namespace Gudhi + +#endif // ALPHA_COMPLEX_3D_H_ -- cgit v1.2.3