diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-06-19 20:29:46 +0200 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-06-19 20:29:46 +0200 |
| commit | dc9fc58500cc9f1be70e0d34a24cb634d4fc6c34 (patch) | |
| tree | 950dc29ec544600ad94267fd442b10a15826a9e3 /src/python/include/Alpha_complex_factory.h | |
| parent | 3dd89cf0e7c47b98e150d32ede46e0f4514f5e2b (diff) | |
When 3d points are on a 2d plane case - Fixes also default_filtration_value=True in 3d
Diffstat (limited to 'src/python/include/Alpha_complex_factory.h')
| -rw-r--r-- | src/python/include/Alpha_complex_factory.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/python/include/Alpha_complex_factory.h b/src/python/include/Alpha_complex_factory.h index 69b584c5..7d98f454 100644 --- a/src/python/include/Alpha_complex_factory.h +++ b/src/python/include/Alpha_complex_factory.h @@ -48,7 +48,7 @@ static CgalPointType pt_cython_to_cgal(std::vector<double> const& vec) { class Abstract_alpha_complex { public: virtual std::vector<double> get_point(int vh) = 0; - virtual void create_simplex_tree(Simplex_tree_interface<>* simplex_tree, double max_alpha_square, + virtual bool create_simplex_tree(Simplex_tree_interface<>* simplex_tree, double max_alpha_square, bool default_filtration_value) = 0; }; @@ -68,9 +68,9 @@ class Exact_Alphacomplex_dD : public Abstract_alpha_complex { return pt_cgal_to_cython(point); } - void create_simplex_tree(Simplex_tree_interface<>* simplex_tree, double max_alpha_square, + bool create_simplex_tree(Simplex_tree_interface<>* simplex_tree, double max_alpha_square, bool default_filtration_value){ - alpha_complex_.create_complex(*simplex_tree, max_alpha_square, exact_version_, default_filtration_value); + return alpha_complex_.create_complex(*simplex_tree, max_alpha_square, exact_version_, default_filtration_value); } private: @@ -93,9 +93,9 @@ class Inexact_Alphacomplex_dD : public Abstract_alpha_complex { Point const& point = alpha_complex_.get_point(vh); return pt_cgal_to_cython(point); } - void create_simplex_tree(Simplex_tree_interface<>* simplex_tree, double max_alpha_square, + bool create_simplex_tree(Simplex_tree_interface<>* simplex_tree, double max_alpha_square, bool default_filtration_value){ - alpha_complex_.create_complex(*simplex_tree, max_alpha_square, exact_version_, default_filtration_value); + return alpha_complex_.create_complex(*simplex_tree, max_alpha_square, exact_version_, default_filtration_value); } private: @@ -122,12 +122,9 @@ class Alphacomplex_3D : public Abstract_alpha_complex { return pt_cgal_to_cython(point); } - void create_simplex_tree(Simplex_tree_interface<>* simplex_tree, double max_alpha_square, + bool create_simplex_tree(Simplex_tree_interface<>* simplex_tree, double max_alpha_square, bool default_filtration_value){ - alpha_complex_.create_complex(*simplex_tree, max_alpha_square); - if (default_filtration_value) { - // TODO - } + return alpha_complex_.create_complex(*simplex_tree, max_alpha_square); } private: |