Commit Graph

1552 Commits

Author SHA1 Message Date
Laurent Rineau 08ec884deb Merge pull request #2248 from lrineau/Triangulation_3-disable_CTest_for_demos-lrineau
Disable CTest for demo/Triangulation_3_Geomview_demos/
2017-07-17 12:24:12 +02:00
Laurent Rineau 871bba21f6 Merge pull request #2212 from MaelRL/Periodic_3_Regular_triangulation_3-APelle
Add periodic regular triangulations
2017-07-17 12:23:54 +02:00
Laurent Rineau 40d65ab16f Disable CTest for demo/Triangulation_3_Geomview_demos/ 2017-07-11 14:55:50 +02:00
Maxime Gimeno 8104d153af Fixes
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp
2017-07-10 16:16:34 +02:00
Maxime Gimeno 14482af5ea Add missing semicolon. 2017-07-10 16:11:10 +02:00
Maxime Gimeno d03fc56520 Fix Triangulation_3 demo for QGLViewer v2.7 2017-07-10 16:11:10 +02:00
Maxime Gimeno 3a97734a70 fix T3 demo for QGLViewer v2.7.0 2017-07-10 16:11:09 +02:00
Laurent Rineau ab46739f07 Merge pull request #2213 from maxGimeno/Fix_demos_for_qglviewer2_7_0-GF
Fix demos for qglviewer 2.7.0
2017-07-10 15:00:09 +02:00
Mael Rouxel-Labbé 52956a40fb Fixed accidentally including boost's function_property_map.h 2017-07-04 10:45:33 +02:00
Mael Rouxel-Labbé 5ef4ed6083 Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle
Based on master
2017-07-03 16:12:14 +02:00
Maxime Gimeno 1a5d74f020 Fixes 2017-07-03 09:39:12 +02:00
Maxime Gimeno ccec9f45c8 Add missing semicolon. 2017-07-03 09:35:15 +02:00
Maxime Gimeno 722776b78e Fix Triangulation_3 demo for QGLViewer v2.7 2017-07-03 09:35:14 +02:00
Maxime Gimeno 9bf422ad5b fix T3 demo for QGLViewer v2.7.0 2017-07-03 09:35:14 +02:00
Mael Rouxel-Labbé 7943d0877e Fixed taking reference to temporary (ter) 2017-06-30 11:40:14 +02:00
Mael Rouxel-Labbé 02a9a91e40 Cleaned off useless 'using' 2017-06-30 11:32:07 +02:00
Mael Rouxel-Labbé 4ac89861ba Fixed (?) taking reference to temporary 2017-06-28 10:17:14 +02:00
Mael Rouxel-Labbé 8c7bda5f2d Changed from boost::function_property_map to CGAL::internal::boost_'s
This is so it's always available, even if using an old version of boost
2017-06-28 10:17:14 +02:00
Mael Rouxel-Labbé ddfc4fc0fe T2/T3 now use Perturbation_order in tests with symbolic perturbations 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 044deb6c7e Replaced boost_static_assert with cgal_static_assert and used () guards 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 87e0ae40b0 Closed a parenthesis 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé d0749f1d53 Minor doc fixes 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 1fc2282350 Fixed regular triangulation capitalization across CGAL 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 2ddbc31721 Minor doc changes 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 1f14a66d94 Renamed uses of invalidate_circumcenter() in accordance with the modified concept 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé a68423f4c8 Adapted the documentation to the new concept RegTrCellBaseWithWeightedCircumcenter
- MeshCellBase_3 loses "invalidate_circumcenter" and refines the new concept
- Reg_tr_cell_base_with_weighted_circumcenter_3 is a model of the new concept
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé ea5c4fabb7 Added new concept RegularTriangulationCellBaseWithWeightedCircumcenter_3
Describes the requirements of a base cell that caches its weighted circumcenter
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 15979cd037 Fixed missing dependency in T3's documentation 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé f964171f14 Fixed Point / Point_3 issues in T3 and improved the documentation
-- Do not use concept names as template names in the doc
-- Fixed point / point_3 issues and other problems of coherence between concept
and model
-- Fixed some wrong refinement relationships
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 77e6ed8aec Fixed Point typedef in Triangulation_3 doc 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 992bd6e263 Fixed documentation of Regular cell bases
-- Regular_triangulation_cell_base_3 must document hidden_points handling
functions

-- Regular cell bases must document their Point type
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé a64fb2f271 Cleaned Weighted_point_mappers from the documentation 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 2d2eb22f98 Fixed boost/core/is_same.hpp > boost/type_traits/is_same.hpp 2017-06-28 10:16:23 +02:00
Jane Tournois 130e65db97 really use the GT given as a parameter
When the geom_traits given as parameter of `circumcenter` and/or
`weighted_circumcenter` was deriving from the cell base GT
(first template parameter), the gt was up-casted to the
cell base GT, and the function construct_circumcenter_3_object()
(or construct_weighted_circumcenter_3_object()) not
called on the right geom traits type --> possibly missing
the actual input of the function (the robust_circumcenter_traits in Mesh_3)

we add a static assert to check at compile time that point types are the same
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé a990913d99 Fixed using default templated class functions 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé d770640506 Fixed wrong template type (which induced taking references of references) 2017-06-28 10:16:23 +02:00
Jane Tournois 110316570c really use the GT given as a parameter
When the geom_traits given as parameter of `circumcenter` and/or
`weighted_circumcenter` was deriving from the cell base GT
(first template parameter), the gt was up-casted to the
cell base GT, and the function construct_circumcenter_3_object()
(or construct_weighted_circumcenter_3_object()) not
called on the right geom traits type --> possibly missing
the actual input of the function (the robust_circumcenter_traits in Mesh_3)

we add a static assert to check at compile time that both geom traits
are compatible
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé b5affb383d Changed boost/core/enable_if.hpp to boost/utility/enable_if.hpp 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 9bfe9b24a5 Trimmed Construct_point_23's note in TriangulationTraits_23 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé e122246f5f Fixed regular cell bases so they actually model the concept
Also, they should not use Bare_point / Weighted_point types, which are defined
in the triangulation (much later during compilation).
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 104baabaeb Aligned the concept RegularTriangulationCellBase_3 with other similar concepts
That is, it should define the type `Point` (instead of `Weighted_point`), like
in TriangulationVertexBase_3 and RegularTriangulationVertexBase_3.
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 31dc2998a5 Clarified some documentation about the usage of Construct_point_23 in TTraits_23 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé ec7efb6d70 Fixed Has_nested_type_Bare_point includes 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 9fbf2720ce Annihilated Regular_triangulation_euclidean_traits_23 across all packages
Left a little bit alive in the tests and in the Triangulation_23/doc
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 52e366ebd3 TriangulationTraits_23 refine SpatialSortingTraits_23 for Hilbert sorting 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé f9b65eeac0 Small improvements to the (Regular)TriangulationTraits_2/3 concepts 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 42506237b2 Add Construct_point_2/3 to the concepts of triangulation traits
-- TriangulationTraits_2 requires Point_2 construct_point_2(Point_2)
-- RegularTriangulationTraits_2 requires Point_2 construct_point_2(Weighted_point_2)
-- TriangulationTraits_3 requires Point_3 construct_point_3(Point_3)
-- RegularTriangulationTraits_3 requires Point_3 construct_point_3(Weighted_point_3)
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 5990db5557 Removed an ugly static_cast 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé d0cf0fc86b Misc minor changes 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 4b556707a4 Use boost::function_property_map to apply spatial_sort to weighted points 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé b0b1e5ceaf Moved facet dual computation functions from Mesh_3 to Regular_triangulation_3
... and improved them and gave them more overloads
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé aab0bca377 Avoid copies by using result_of in boost::bind() return type
Copies were previously done on purpose to go around the Lazy kernel, but this
can be done without copies (for all kernels) by using result_of.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé ae480077de Removed obsolete file: Regular_traits_adaptor.h 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé a98d78cffb Removed useless include 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 1dff564d40 Reorganized Regular_triangulation_3 dual functions 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 34c2032edc Copy boost::bind return object
The lazy kernel returns temporaries and gives garbage to compare_xyz_3...
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 2653ebe612 Renamed Regular_triangulation base typedef (Base > Tr_Base) 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé e59e8c2aa0 Removed useless construct_point_3
Construct_weighted_circumcenter_3 already returns a Bare_point
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 47b3e7193e Comparison result should be of type Comparison_result
(it worked anyway since Comparison_result is a Sign internally)
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 0f8f34c9d4 Fixed compilation of add_temporary_points_on_far_sphere() 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 94abc23da9 Adapted the call to spatial_sort() to handle weighted points
Downside: we copy points at each comparison, which is terrible! No noticeable
changes when profiling the construction of a triangulation.

We need this copy because of Lazy kernel: despite construct_point_3 having
const Point_3& construct_point_3_object()(const Point_3&)
the Lazy kernel can return some copies.

Other solutions that were not used:
-- Distinguish the Ouput type of Unary_function_to_property map depending on
   the type of Kernel (ugly and not safe)
-- Use Weighted_point_mappers traits (but that blood will not be on my hands)
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 91ea1b4049 Adapted sorting algorithms based on compare_xyz to handle weighted point vectors 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 12fb8d35fc Construct_plane() must use bare points arguments 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 42fa20881c Fixed point typedef in Tr_3/benchmarks 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 1e30446d7e Fixed Triangulation_benchmark_3.cpp
-- Fix Weighted_point_3 / Point_3 incompatibilities
-- Generator of weighted points also generates random weights
-- Do not use Regular_euclidean_triangulation_traits since they are deprecated
-- Do not use 'using namespace'
-- Use the new policy tag to disable hidden point caching (see b925281)
-- Remove unused objects (such as pts2_bbox)
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé b4eed5b64c Fixed test_RT_cell_base_with_weigh... and added it to the CMakeLists
-Some wrong Bare_point/Weighted_point usage
-Fully instantiate the Regular_triangulation_cell_base_with_weighted_circum...
 with all the template parameters of the regular cell base
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé b50098bb1e Removed hiding-related functions from Triangulation_cell_base_3
Triangulation_cell_base_3 cannot be used anymore as a cell base of a regular
triangulation and thus there is no point keeping these functions.

People wishing to disable caching of hidden points in regular triangulations
should use the new policy, see commit b92528171c)
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 98226c97c4 Added a template parameter to Regular_tr_cell_base on hidden points handling
Before WP<->P implicit conversion changes, one could choose to not keep hidden
points by using `Triangulation_cell_base_3` as cell base instead of
`Regular_triangulation_cell_base_3`. This is not possible anymore as point types
will conflict.

This changes introduces a new template parameter to pass a policy on whether
to keep or discard hidden points.

It is a breaking change since it is placed before the container template
parameter, but it makes more sense that way and the container type template
was not documented.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé de76ccf545 Removed Weighted_point_mapper_3 and RegTraits_3 shenanigans
There is no need anymore for sneaky traits adaptors to make Triangulation_3
a compatible base of Regular_triangulation_3:
- The Point type in Triangulation_3 is obtained through TDS::Vertex::Point (see
  commit 13d5e89)
- Triangulation_3 always ensures that we are passing bare points to the kernel
  functors that require bare point arguments (see commit db5da73)

This greatly clarifies the code of Regular_triangulation_3: there is only a
single traits type, a single base type, etc.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé cd9a908393 Ensured that we call kernel functions with the correct (bare) point type
Note that if the type `Point` is already `Point_3`, Construct_point_3 does not
do anything (except in the lazy kernel, but in that case, the running time is
horrible anyway).
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé ae1fb2bfec Deduce Triangulation_3's point type from the TDS
Since we have a distinc vertex_base for regular triangulations and that this
regular vertex base defines a type Point, it is redundant to get the Point
type from the Geom_traits.

This also allows to remove the Weighted_point_mapper trick, and pass more easily
custom point types.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé e421fe92f9 Fixed Regular_traits_adaptor
The functor members cannot be references because the Regular_triangulation
might be templated by a traits class that is not simply a Kernel (that is
the case in the package Interpolation).

When that is the case, calling this->K::function_object() might be a call
to a constructor in the base traits class. Thus, the functor members
of Reg_traits_adaptors get initialized to temporaries, which is problematic
because these temporaries are at a much lower scope and thus are quickly
cleaned, leaving us with references to nothing in Reg_traits_adaptor.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé d668d42f44 Do not provide Bare_point overloads in Regular_triangulation 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé f0d3e77558 Fixed usage of Bare point and Weighted point across Triangulation_3 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé e08b054aff Trimmed Regular triangulation euclidean traits (doc version)
Now that the traits is exactly the kernel, there isn't a big need for a lot of
documentation.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé d2abb2d981 Trimmed Regular triangulation euclidean traits
-- Code added as consequence of disabling implicit conversion between points and
   weighted points implies that defining
     typedef weighted_point point;
   creates ambiguous functors.

   This typedef is nevertheless still used, in Weighted_point_mappers.

-- The traits are not supposed to define Bare_point
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 7bdd0b1383 Fixed Triangulation_3's regular test
Constructing weighted points with (x,y,z,w) is ambiguous and that is why it was
disabled.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé d1f86d0146 Removed unused typedef 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 9d5eaa8259 Fixed missing typename 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé fcdadec2c7 Fixed Triangulation_3's test using Traits::Bare_point/Weighted_point 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 22bd3538a0 Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé e1dcdcaf4d Cleaned #if 0 code 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 78a4a12b0c Fixed hide_point()
Hide weighted points since they can be re-inserted afterwards
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé d884edd84a Fixed initialization order warning 2017-06-28 10:14:35 +02:00
Jane Tournois 223e3a20b6 make constructors of Weighted_point explicit
and fix compilation errors
2017-06-28 10:14:35 +02:00
Sébastien Loriot e602bae784 version without partial specialization
the norms says that partial specialization should be
done in a namespace (not inside a class)
2017-06-28 10:14:35 +02:00
Jane Tournois 6ec4669937 fix compilation of tests wrt Point vs Weighted point 2017-06-28 10:14:35 +02:00
Jane Tournois ae4449782d remove hybrid operators, that use Bare points and Weighted points in an ambiguous manner
this commit only fixes the testsuite of Mesh_3
2017-06-28 10:14:35 +02:00
Andreas Fabri 780e01dc90 WIP: test_meshing_polyhedron_with_features compiles and crashes in odt 2017-06-28 10:14:35 +02:00
Andreas Fabri bb213d5ad1 Changes after making Weighted_point_3(const Point_3) explicit 2017-06-28 10:14:35 +02:00
Andreas Fabri 787d46ffb8 Disable Point_3(const Weighted_point_3&) 2017-06-28 10:14:35 +02:00
Andreas Fabri 2f895335d0 The Weighted_point_mapper becomes a traits class; test_regular_3.cpp passes 2017-06-28 10:14:35 +02:00
Laurent Rineau 036b4b064f Merge pull request #2185 from cjamin/Triangulation-add_regular_tri-cjamin_mglisse
Triangulation: add dD regular triangulation
2017-06-27 16:29:11 +02:00
Clement Jamin c7bd6a7403 Include licence check header 2017-06-23 10:41:05 +02:00
Clement Jamin 5b9562ea84 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2017-06-16 11:09:07 +02:00
Mael Rouxel-Labbé 3c42724e22 Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle
Based on Kernel_Weighted_point_without...
  @ 41e7520b3e
2017-06-15 15:07:53 +02:00
Mael Rouxel-Labbé 7beae5f1af Minor doc fixes 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 98800d2de8 Fixed regular triangulation capitalization across CGAL 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 77f415f02c Minor doc changes 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 9cc17dc935 Renamed uses of invalidate_circumcenter() in accordance with the modified concept 2017-06-15 10:34:15 +02:00