Commit Graph

324 Commits

Author SHA1 Message Date
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
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
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 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
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
Andreas Fabri 43b8390a70 Merge branch 'Triangulation_2-NewPolylineConstraint-GF-old' into Triangulation_2-NewPolylineConstraint-GF 2014-08-08 12:47:15 +02:00
Andreas Fabri 9243e1eb69 Unify APIs: Add insertion of a polyline 2014-07-16 15:30:14 +02:00
Sébastien Loriot 0230e979e2 Merge branch 'CGAL-use_leda-GF-OLD' into CGAL-use_leda-GF
Conflicts:
	Arrangement_on_surface_2/test/Arrangement_on_surface_2/construction_test_suite_generator.cpp
	Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp
	Documentation/doc/Installation.txt
	Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h
2014-06-18 22:50:06 +02:00
Andreas Fabri 2c08831b35 add missing typename 2014-05-23 08:47:56 +02:00
Andreas Fabri c6bf236909 include header files where they are used 2014-05-22 14:49:38 +02:00
Andreas Fabri 8423854c95 Add Constrained_Delaunay_triangulation_2::insert_constraint(PointIterator,PointIterator) 2014-05-21 18:25:27 +02:00
Andreas Fabri 80798869fc Add Constrained_triangulation_plus_2::insert_constraints(..)
Before it inherited from the base class and did not update
the constraint hierarchy.
2014-05-21 17:17:40 +02:00
Andreas Fabri 6b129f3ad0 unify API 2014-05-20 17:39:56 +02:00
Andreas Fabri 2f967ba6e4 the testsuite for the new version of the Constrained_triangulation_plus_2 passes 2014-05-19 15:57:24 +02:00