Commit Graph

438 Commits

Author SHA1 Message Date
Andreas Fabri 835605a06d Do not include a header file that is not used 2016-09-06 18:10:24 +02:00
Andreas Fabri 791c385a3a fix polyline simplification 2016-08-23 11:30:21 +02:00
Andreas Fabri 784c1b82f3 fix polyline simplification 2016-08-14 17:20:56 +02:00
Sébastien Loriot 7f3772a50b replace the usage of raw pointer as property map
It was deprecated in boost 1.55
http://www.boost.org/users/history/version_1_55_0.html
2016-07-13 13:53:00 +02:00
Sébastien Loriot c9e1f30df1 add missing traits to avoid using the default constructed one 2016-06-29 09:41:22 +02:00
Maxime Gimeno 96f0f39113 Updates the CDT constructors, the tests and the doc. 2016-06-07 17:40:26 +02:00
Sebastien Loriot 7630d2a6fc Merge pull request #875 from sloriot/Triangulation_2_and_PMP-fix_Triangulation_2_projection_traits_3
PMP: make triangulate_faces works with non filtered kernels
2016-05-05 14:55:11 +02:00
Sébastien Loriot f1be63c5d9 add deprecation warnings for the former header 2016-05-04 17:09:22 +02:00
Sebastien Loriot e9f8ef6be8 Merge pull request #1001 from afabri/Triangulation_2-deprecated-GF
Remove deprecated code, and deprecate some other code in Triangulation_2
2016-04-29 12:40:10 +02:00
Andreas Fabri db4c17ad68 fixes after Sebastien's remarks 2016-04-25 16:05:28 +02:00
Laurent Rineau 27b2d8578c Merge pull request #940 from afabri/Triangulation_2-Default-GF
Introduce CGAL::Default for the TDS of 2D constrained triangulations
2016-04-22 15:26:13 +02:00
Andreas Fabri 7f6550a48d Remove the xy_3 traits classes; Deprecate Triangulation_euclidean_traits_2 2016-04-12 17:38:25 +02:00
Andreas Fabri 6d72405658 Simplify Constrained_delaunay_triangulation_2 2016-04-01 12:58:59 +02:00
Andreas Fabri 9776c053d6 simplify template parameters, Add _ postfix to Itag (thank you Marc) 2016-03-31 13:09:54 +02:00
Laurent Rineau 00e6e03d5c Merge pull request #785 from afabri/CGAL-missing_includes-GF
Partial cleanup of issue #595   Part2
2016-03-24 17:02:27 +01:00
Andreas Fabri 31dae1898f Just Default as default does not compile, so we put the 'real' default types 2016-03-23 16:51:13 +01:00
Andreas Fabri 7a0c53496d Mention Default in the ref manual 2016-03-23 12:43:17 +01:00
Andreas Fabri 47090906f0 Introduce CGAL::Default for the TDS of constrained triangulations 2016-03-23 10:27:39 +01:00
Sébastien Loriot d7e9261d58 hide the filtered projection traits behind the projection traits
the selection of the base class is done using Kernel::Has_filtered_predicates
2016-03-02 21:57:54 +01:00
Sébastien Loriot d5a5e6abe8 Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' 2016-02-24 18:57:43 +01:00
Andreas Fabri 9b4714a684 protect against inserting a zero length constraint (that is what is documented) 2016-02-23 12:58:27 +01:00
Andreas Fabri beb1417477 remove unused header files; remove commented includes; changed include paths 2016-02-15 14:20:12 +01:00
Sébastien Loriot d019207e81 Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' 2016-01-20 16:46:29 +01:00
Andreas Fabri 4a697500be Use std::set in case of VC++ and boost 1.55 2016-01-18 09:28:40 +01:00
Sébastien Loriot 94fb95118a Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' 2016-01-08 13:57:57 +01:00
Andreas Fabri b3b700dee8 switch to boost::container::flat_set 2016-01-06 15:13:57 +01:00
Sebastien Loriot 6bfbe2a4a3 Merge pull request #579 from afabri/Triangulation-filtering_traits-GF
Move Triangulation_structural_filtering_traits to Kernel_23
2016-01-06 14:45:41 +01:00
Andreas Fabri a1cdb5a9ea Fix a bug when finding border edges e=(fh,i) with fh outside the conflict zone
fixes #572
2016-01-05 13:53:39 +01:00
Andreas Fabri 4d324c704f Move Triangulation_structural_filtering_traits and specialize in Epic and Epec headers 2015-12-31 09:17:18 +01:00
Andreas Fabri 4fec754ef8 put static into the macro and rename it 2015-12-02 20:40:15 +01:00
Andreas Fabri 37677ededc cleanup: reinsert the repetitive code that was temporarily in a repetitively included .h 2015-11-19 09:08:02 +01:00
Andreas Fabri 9c08d41a54 Change the macro CGAL_THREAD_LOCAL_VARIABLE(TYPE,VAR,VAL)
VAL is the parameter to the variable VAR
2015-11-11 11:16:16 +01:00
Andreas Fabri 6b2c4dd7c6 Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF 2015-11-09 14:26:42 +01:00
Sébastien Loriot 948651d961 Merge branch 'releases/CGAL-4.7-branch' 2015-10-27 08:59:20 +01:00
Sébastien Loriot 7e3fe6c776 fix a warning 2015-10-27 08:58:49 +01:00
Clement Jamin 31e8415983 Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF 2015-10-01 14:51:09 +02:00
Andreas Fabri 1a4faa8575 Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF 2015-10-01 10:03:04 +02:00
Andreas Fabri 3d4a1be429 WIP with Clement 2015-10-01 09:47:47 +02:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Sébastien Loriot cdfc7f1c31 Merge branch 'old/CGAL-split_packages-GF' into CGAL-split_packages-GF 2015-09-23 10:08:41 +02:00
Andreas Fabri 0d70d7b1ce do not write 'static' in the macro so that we can use the macro also for a definition 2015-09-14 10:17:22 +02:00
Andreas Fabri ea612e9645 Improved macros to avoid #if #else where we want to use TLS
The Residue.cpp file still needs simplification
2015-09-11 18:01:51 +02:00
Andreas Fabri a14cf913e9 WIP: In Lazy.h we now have a single macro for boost and c++11 thread 2015-09-11 14:54:11 +02:00
Sébastien Loriot 22beee18a6 Merge remote-tracking branch 'cgal-dev/Triangulation_2-uninitialized_warning-GF' 2015-09-11 08:39:33 +02:00
Andreas Fabri 3cee140708 fix warning about uninitialized hcl and cleaner assertion code 2015-09-10 10:54:37 +02:00
Laurent Rineau 362e4ef7db Merge pull request #322 from afabri/Triangulation_2-faster_fill_hole_Delaunay-GF
Triangulation_2: speed up fill_hole_delaunay()
2015-09-10 10:19:40 +02:00
Jane Tournois 3175ad74d4 add missing ref 2015-09-08 16:33:39 +02:00
Andreas Fabri 21b5f653f6 avoid copying lists 2015-09-07 21:14:53 +02:00
Andreas Fabri 220651bc88 Use CGAL_THREAD_LOCAL as thread_local only comes with VC201 2015-09-04 18:09:50 +02:00
Andreas Fabri 847efcd2b4 fix typo 2015-08-28 11:00:56 +02:00
Andreas Fabri 1e2ff1131e assert -> CGAL_assertion 2015-08-27 16:51:55 +02:00
Sébastien Loriot e9df6fa6cf fix typo 2015-08-25 21:54:38 +02:00
Andreas Fabri 91543fd382 move header files to TDS_2 and TDS_3 2015-08-23 15:36:12 +02:00
Laurent Rineau c21c9dda35 Merge pull request #141 from afabri/Advancing_front_surface_reconstruction-afabri
Advancing Front Surface Reconstruction, new package

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Advancing_front_surface_reconstruction
2015-07-03 16:26:28 +02:00
Laurent Rineau 97cd20e8de Merge pull request #126 from afabri/Triangulation_2-fix_plus_2-GF
Fix a bug in CDT_plus_2
2015-06-18 17:31:17 +02:00
Sébastien Loriot df47015db9 Merge branch 'old/Advancing_front_surface_reconstruction-afabri' into Advancing_front_surface_reconstruction-afabri
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/cgal_test_with_cmake
2015-06-18 09:12:12 +02:00
Andreas Fabri c80a9aaa6c Fix a bug in CDT_plus_2
Fix issue #122
2015-06-17 18:52:30 +02:00
Laurent Rineau 6fc32e43fe Merge pull request #74 from lrineau/Triangulation_2-fix_projection_traits-GF
Fix a bug in Triangulation_2_projection_traits.h and its filtered version
2015-06-10 12:30:29 +02:00
Jane Tournois 1faf51b7b1 remove useless include 2015-05-19 09:04:27 +02:00
Sébastien Loriot 7cabb0c508 Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
	Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
2015-05-19 09:01:20 +02:00
Jane Tournois 4cf8655c00 move all the cdt.dual(v) code from Triangulation_2 to Mesh_2
we do not change the API of Triangulation_2 for now
maybe later, and this version should be easy to keep backward compatible
2015-05-19 08:54:33 +02:00
Laurent Rineau 8f9332324a Smaller, faster code 2015-05-18 14:22:38 +02:00
Laurent Rineau e0c1bae205 cleanup
Remove:
  - unwanted copy constructors and operator= (apply the rule-of-zero)
  - unwanted std::cerr displays
2015-05-11 17:39:21 +02:00
Laurent Rineau 2e13efa16e Fix Triangulation_2 projection traits with arbitrary plane 2015-05-08 17:49:49 +02:00
Guillaume Damiand 9c78897ba5 Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin 2015-03-16 14:00:43 +01:00
Andreas Fabri 31855de8be Merge branch 'Advancing_front_surface_reconstruction-afabri-old' into Advancing_front_surface_reconstruction-afabri
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h
2015-01-15 18:56:05 +01:00
Andreas Fabri 8929fd43c1 Merge branch 'Triangulation_2-NewPolylineConstraint-GF'
Approved by the release manager
Conflicts:
	Documentation/resources/how_to_cite_cgal.bib.in
2015-01-12 11:44:32 +01:00
Andreas Fabri 9453a6710e rename file 2015-01-07 14:23:40 +01:00
Andreas Fabri 913539c006 mv new code of Constrained_triangulation_plus_2 2015-01-07 14:15:19 +01:00
Andreas Fabri bbdc196034 remove old code of Constrained_triangulation_plus_2 2015-01-07 14:14:48 +01:00
Andreas Fabri 766673bd8c resolve merge conflicts 2014-12-22 17:46:59 +01:00
Andreas Fabri 87db2e1163 add license header, description.txt 2014-12-22 15:00:38 +01:00
Andreas Fabri 9f6807b005 Add Tds_2::collapse_edge() 2014-12-18 08:25:57 +01:00
Andreas Fabri be5cf9eb5a put a unused variable in assertion code 2014-12-16 16:16:50 +01:00
Andreas Fabri ca9e8d4948 achieve backwardcompatibility to the code not to the documentation 2014-12-12 17:28:44 +01:00
Andreas Fabri 7d8f9ebe95 get rid of warnings 2014-12-11 12:55:57 +01:00
Andreas Fabri af996380a0 make Constraint_id backward compatible with the documentation 2014-12-08 12:00:57 +01:00
Laurent Rineau 0991efefee Make the new CDT deterministic again
That is a followup of the following two commits. The "polyline CDT" has
been branched from CDT before those patches were in CGAL:

  | commit 49404f75f5
  | Author: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
  | Date:   Thu Jun 28 09:16:23 2012 +0000
  |
  |     Improved patch
  |
  |     The Constraint_hierarchy is now templated by T, an anonymous type (that is
  |     a Vertex_handle when the constraint hierarchy is used in Ct_plus_2), and a
  |     Compare operator, that have a comparison member function:
  |       bool operator()(T, T);
  |
  |     In Ct_plus_2, the Compare operator passed to the Constraint_hierarchy
  |     compares the vertices with a Less_xy_2, implemented by Less_x_2, and
  |     Less_y_2.
  |
  |     The test test/Triangulation_2/include/CGAL/_test_cls_hierarchy_2.h has been
  |     tweaked, to check that the type T passed in the hierarchy no longer needs
  |     to have a point() member function, as it was before May 2010 (when GF has
  |     determinized the Cdt_plus_2 using too simple patch).
  |
  | Notes:
  |     r70132 branches/features/Triangulation_2_UseTraitsInHierarchy-GF

  | commit 7cb640d05d
  | Author: Andreas Fabri <Andreas.Fabri@geometryfactory.com>
  | Date:   Mon Jun 25 10:11:56 2012 +0000
  |
  |     The Constraint_hierarchy_2 gets an additional LessXY_2 functor as template argument so that it no longer applies operator<(Point,Point)
  |
  | Notes:
  |     r70018 branches/features/Triangulation_2_UseTraitsInHierarchy-GF
2014-12-04 15:19:22 +01:00
Andreas Fabri b1532991e5 int -> size_t 2014-11-30 18:43:38 +01:00
Jane Tournois e31df9644b fix compilation for Linux 2014-11-24 15:03:07 +01:00
Jane Tournois 0be3dd708b cleaning 2014-11-21 11:23:53 +01:00
Andreas Fabri 42a1c49066 The class Triangulation_2 (but neither TDS2 nor DT_2) should now be a model of FaceListGraph (but not Mutable) 2014-11-20 15:39:56 +01:00
Sébastien Loriot 70502effac change Subconstraint_iterator to ensure backward compatibility 2014-11-14 12:21:24 +01:00
Guillaume Damiand f6faf3fee2 Add missing impl file; protect static variable to use it only in the case CGAL_HEADER_ONLY, in FPU_set_cw, replace one more IO::mode. 2014-11-14 12:11:33 +01:00
Sébastien Loriot d4af8c8d48 change Constraint_id to ensure backward compatibility 2014-11-14 11:58:43 +01:00
Jane Tournois bd0917d7a9 little cleaning 2014-11-13 17:20:21 +01:00
Jane Tournois e02773efd1 move files about sizing, and change template parameter. Geom_traits is enough 2014-11-12 15:42:27 +01:00
Jane Tournois e24ea9175a fix bug : we should not have 2 default constructed rays in every CVD cell 2014-11-07 14:08:57 +01:00
Jane Tournois b29a041c00 fix functions that tag faces as blind 2014-11-06 16:03:17 +01:00
Andreas Fabri 0e535324f0 cleanup 2014-11-06 15:50:05 +01:00
Andreas Fabri 7074432e56 draw vertices smaller and in black 2014-11-06 14:41:00 +01:00
Andreas Fabri c593ee59ba Be more precise in case of degenerate polyline constraints (length 0,1; identical points) 2014-11-05 17:13:19 +01:00
Andreas Fabri 42d04ea13f take into account Jane's review 2014-11-04 12:24:12 +01:00
Jane Tournois ee5c1cea4b add code for optimization.
- Lloyd move should be ok, but faces blindness is not updated properly until now
- ODT move still needs to be redefined when constraints appear
2014-10-10 15:37:25 +02:00
Jane Tournois 84ca2d460b add functionalities to CVD cells 2014-10-09 16:58:35 +02:00
Jane Tournois 2d007d3bf2 fix macro's name 2014-10-09 13:48:55 +02:00
Jane Tournois 4cf43198e2 dual(v) returns an OutputIterator that collects rays and segments
to do so, use the Dispatch_output_iterator

- Constrained Voronoi diagram is now a class that has a pointer to a CDT
as member. We don't need an extra CDT anymore
- update examples
- also update the CDT 2 demo to see Voronoi cells, that are only valid when the
triangulation is Delaunay (constrained or not)
2014-10-07 15:03:41 +02:00
Jane Tournois 8d87ccf8c2 add a dual(vertex) function to DT2 and CDT2
- in DT2, it returns the Voronoi cell as a Polygon_2
- in CDT2, it returns the - possibly clipped - "bounded Voronoi cell"
see Seidel1988 or http://hal.inria.fr/docs/00/54/68/79/PDF/centroidal-vd.pdf

also add an example that computes the full BVD
2014-10-03 16:52:48 +02:00
Andreas Fabri 17ca29713a Add a forwarding function as we had to remove a using statement 2014-08-22 15:14:19 +02:00
Andreas Fabri ab7f0189bd remove debug output 2014-08-22 15:13:32 +02:00