songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
73,053 Commits 3 Branches 156 Tags 966 MiB
Commit Graph

459 Commits

Author SHA1 Message Date
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
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
Andreas Fabri 575b9081a7 make Constaint_id a struct so that we can write operator pair<Vertex_handle,Vertex_handle>() 2014-05-19 11:49:08 +02:00
Andreas Fabri a0d8e81a6f Fix the Polyline_constrained_triangulation for the Exact_constructions_tag 
To avoid cascading the intersection is done with endpoints of segment constraints
For polyline constraints we cannot take the endpoints of the polyline
but must find input points of the polyline.
 2014-05-16 14:48:20 +02:00
Andreas Fabri 85b29aed5f treat merge conflicts 2014-05-15 16:09:24 +02:00
Andreas Fabri c5ae1d35a9 Merge branch 'Advancing_front_surface_reconstruction-afabri-old' into Advancing_front_surface_reconstruction-afabri 2014-03-26 12:55:58 +01:00
Laurent Rineau ab7f9d0047 Fix a warning -Wmaybe-uninitialized 
With g++48, with -Wall -O3, there was the following warning:

include/CGAL/Weighted_point.h:137:5: warning: '*((void*)& p +8)' may be used uninitialized in this function [-Wmaybe-uninitialized]
     wp = Weighted_point<Point,Weight>(p,w);
     ^
include/CGAL/Weighted_point.h:130:9: note: '*((void*)& p +8)' was declared here
   Point p;
         ^
include/CGAL/Weighted_point.h:137:5: warning: 'p' may be used uninitialized in this function [-Wmaybe-uninitialized]
     wp = Weighted_point<Point,Weight>(p,w);
     ^

Trivial bug-fix for master.
 2013-12-12 17:44:00 +01:00
Sébastien Loriot 84d97f385d add insert_constraints functions to Constrained_Delaunay_triangulation_2 2013-12-02 22:48:38 +01:00
Andreas Fabri 6802db2f6b Merge branch 'old' into Advancing_front_surface_reconstruction-afabri 
Apply "My branch is really old.." from the FAQ

Conflicts:
	Installation/changes.html
	Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp
	Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.h
	Polyhedron/demo/Polyhedron/include/CGAL/gl_render.h
 2013-11-28 14:58:29 +01:00
Andreas Fabri 9ed4f837c3 Merge branch 'CGAL-compilable_headers-GF' 
The conflict was about whitesapce
Approved by the release manager

Conflicts:
	Polyhedron/include/CGAL/Polyhedron_copy_3.h
 2013-09-23 14:50:17 +02:00
Laurent Rineau 650419f631 Trivial warning bug-fix for master (for CGAL-4.3) 2013-09-16 12:16:27 +02:00
Andreas Fabri 5c454cec64 add missing includes 2013-09-13 12:43:01 +02:00
Andreas Fabri d93bc127db Qualify call of derived function with this-> 2013-09-13 12:42:37 +02:00
Andreas Fabri 56d31513e6 fix incllude file. was not from the base class 2013-09-13 12:19:01 +02:00
Andreas Fabri 121ada60a4 Function must not only be declared but also defined to avoid VC++ warning 2013-09-12 12:49:04 +02:00
Sébastien Loriot 22b0d44f4a make the move function private to disable the inherited version 2013-08-02 07:52:09 +02:00
Sébastien Loriot f82d049dd1 make the triangulation iterator convertible to non-const handle 
this pleases clang++3.2 with -std=cpp11 option
 2013-07-25 07:40:38 +02:00
Jane Tournois 56d733b254 Merge remote-tracking branch 'origin/Mesh_3-improvements-GF' 
Several improvements of Mesh_3, including
- speedup of optimizers,
- make inexact_locate public in Triangulation_2 and Triangulation_3,
- compactify mesh_cell_base and mesh_vertex_base,
- fix of documentation,
- and more

Small feature :
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Various_improvements_of_Mesh_3

Approved by the release manager.
 2013-07-01 16:25:56 +02:00
Guillaume Damiand 6ba0055694 Trivial bug-fix qualified for master: 
/Users/cgaltester/cgal_test/CGAL-4.3-Ic-71/include/CGAL/Triangulation_data_structure_2.h:1858:41: warning: unused parameter 'src' [-Wunused-parameter]
    Face_tgt operator()(const Face_src& src) const
 2013-06-25 12:32:59 +02:00
Jane Tournois 404f2e0e3c merge 2013-06-21 10:01:19 +01:00
Sébastien Loriot 8d602ed8c2 Merge branch 'triangulation_3-copy_tds-sloriot' 
Approved by the release manager

Conflicts:
	Alpha_shapes_3/test/Alpha_shapes_3/copy_tds.h
	Triangulation_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h

it introduces a more general copy_tds that allows to copy tds with different types of simplices.
 2013-04-29 11:09:01 +02:00
Sébastien Loriot bb7f025512 more permissive copy_tds for compatible vertex types with the same point type 2013-04-19 08:44:45 +02:00
Andreas Fabri 76a386bd18 make polylines.cpp work with EPEK 2013-04-17 09:38:23 +02:00
Andreas Fabri e4306a0d3d fixed -> unremovable; fixed is no longer used in Polyline_constrained_trioangulation 2013-04-16 16:01:09 +02:00
Andreas Fabri 94567d8745 wip 2013-04-16 15:09:05 +02:00
Andreas Fabri 80ef57d590 rename class 2013-04-16 12:46:34 +02:00
Sébastien Loriot 62fcc226b8 add a method to insert a range of points with info in cdt 2013-04-16 07:37:51 +02:00
Jane Tournois a9275d1a5b add default value for start of inexact_locate 2013-04-12 14:48:10 +02:00
Jane Tournois e023f42a51 make inexact_locate public also in Triangulation_2 2013-04-12 14:32:16 +02:00
Sébastien Loriot f9e0c97aac for convenience add a default to simple converter 
it is useful if you want to copy the tds of a familly
alpha-shape into a fixed one
 2013-04-11 20:03:32 +02:00
Sébastien Loriot 2143378f58 remove a warning and simplify the implementation 2013-04-09 19:33:47 +02:00
Andreas Fabri 5e08e87d3d Make the example more interesting. 
Fix const correctness.
Fix the Subconstraint_iterator.
Improve the manual.
 2013-04-03 15:28:46 +02:00
Andreas Fabri f7d7395864 Merge branch 'OLD' into CGAL-use_leda-GF 
Conflicts:
	Boolean_set_operations_2/test/Boolean_set_operations_2/test_polygon_validation.cpp
	Envelope_2/test/Envelope_2/test_envelope_segments.cpp
	Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp
 2013-03-27 20:22:54 +01:00
Laurent Rineau b6ffa7c425 Merge branch 'CGAL-fix_warnings-GF' 
That branch was successfully tested in CGAL-4.2-Ic-205.
 2013-03-27 12:23:31 +01:00
Andreas Fabri 8a45fcea5a Merge branch 'OLD' into Triangulation_2-NewPolylineConstraint-GF 
Conflicts:
	Triangulation_2/doc/Triangulation_2/Triangulation_2.txt
 2013-03-21 13:41:53 +01:00
Laurent Rineau 6026df138a Fix mis-compilations of Triangulation_2 with -O3 -DCGAL_NDEBUG 
With recent g++ versions, when -DCGAL_NDEBUG and -O3 was in the compilation
flags, my patch using 'CGAL_assume' triggered mis-compilation of cases
where the dimension() was 1, for all uses of the following pattern:

  CGAL_assume(i>=0 && i<= 1);
  [...] 1-i [...]

The fix is to use "(i==0)?1:0" instead.
 2013-03-19 14:29:18 +01:00
Andreas Fabri 67226de083 use CGAL::compare instead of compare to avoid Koenig lookup 2013-03-15 16:25:05 +01:00
Andreas Fabri 950e858555 remove unused parameters 2013-03-12 09:50:46 +01:00
Andreas Fabri 1ee52525ab No need for the hierarchy. Makes it simpler and faster 2013-03-07 17:44:31 +01:00
Andreas Fabri e7900a02a3 made two private functions public, so that we can modify a TDS_2 2013-03-06 18:08:37 +01:00
Laurent Rineau ef37a934a6 Fix warning "_ri may be used uninitialized" 2013-02-27 19:35:56 +01:00
Laurent Rineau 403031ce7f Fix warnings 2013-02-27 18:21:24 +01:00
Andreas Fabri c7e68385be remove unused variables and #if 0 buggy non used code 2013-02-26 16:52:55 +01:00
Laurent Rineau 2d8da664a3 Merge branch 'CGAL-fix_warnings-gdamiand' 
Conflicts:
	.gitignore
	Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
 2013-02-22 13:02:37 +01:00
Laurent Rineau 66c5d23154 Use CGAL_assume to remove warnings 2013-02-20 18:55:43 +01:00
Sébastien Loriot e9e31dc6f3 remove unused file 2013-02-19 13:57:41 +01:00
Andreas Fabri 2740aa9c05 use size_type instead of int 2013-02-07 15:16:03 +01:00
Andreas Fabri c6dd56cf0f suppress a warning. The hypothetical problem cannot occur 2013-02-07 15:15:27 +01:00
Andreas Fabri 462ad57712 Remove a declaration without definition 2013-02-07 15:13:48 +01:00
Andreas Fabri f9cd5ec08a Merge remote-tracking branch 'origin/Triangulation_2-NewPolylineConstraint-GF' into Triangulation_2-NewPolylineConstraint-GF 
Conflicts:
	.gitattributes
 2013-01-21 14:33:33 +01:00
Andreas Fabri b307771892 bug fix for natural_neighbor_coordinates_2 using a small feature in the conflict zone functions of Delaunay_triangulation_2 2013-01-08 12:34:37 +01:00
Philipp Möller 0f34f2a89e Merge branch 'Maintenance-include-less-boost-pmoeller' 2012-12-21 09:44:18 +01:00
Sébastien Loriot 41362b6b57 Merge branch 'triangulation_2-cstr_using_ranges' 2012-12-21 08:42:25 +01:00
Sébastien Loriot 84caad7137 using the regular triangulation filtered traits using flags in the kernel 2012-12-20 16:12:38 +01:00
Sébastien Loriot 59f9e8a778 add constructor from range for 2D Delaunay and Regular triangulation 2012-12-19 17:10:57 +01:00
Sébastien Loriot 09e42c760e fix source vertex and face types 2012-12-19 10:52:56 +01:00
Sébastien Loriot 853c658a18 add copy_tds with converter in TDS2 2012-12-19 10:15:03 +01:00
Philipp Möller 71ea8e6e22 Minimal boost includes 
Replace type_traits.hpp and utility.hpp with the respective
fine-grained includes.
 2012-12-14 18:13:59 +01:00
Laurent Rineau 96319a1365 reintegrate '^/branches/features/Triangulation_2_UseTraitsInHierarchy-GF' 2012-11-07 14:59:00 +00:00
Sébastien Loriot ef81760b85 macro renaming 2012-11-02 08:58:21 +00:00
Laurent Rineau ef5b895a93 merge from next 2012-11-02 08:49:12 +00:00
Sébastien Loriot 6ff851e791 macro renaming 2012-11-02 08:44:08 +00:00
Sébastien Loriot 6da5e9e84d unrecursive version of propagating_flip and propagate_conflicts 
for CDT2 and DT2 using 100 recursive calls before switching to
a local stack in a function.
 2012-10-30 13:16:52 +00:00
Sébastien Loriot 720244f8f8 apply the same choice as the one made in r73262 for CDT_2 2012-10-24 21:39:38 +00:00
Sébastien Loriot cd165546fc Remove all alternatives to propagating_flip to keep one that allow to use the call 
stack for at most 100 recursive calls and switch to a non-recursive function
that uses a local std::stack to emulate the call stack.

Benchmarks show the following results:

7 runs on 10,000,000 random in unit circle points

43.67074 : Old implementation
43.91474 : use stack for 100 first call then non-recursive with stack
44.07075 : use stack for 100 first call then non-recursive with vector
44.57079 : Local vector
45.0068 : Local stack
45.87886 : Local fixed size array
46.3829 : Local "home-made" small vector
53.41534 : Thread-local vector
 2012-10-24 21:35:17 +00:00
Sébastien Loriot a7b02bd716 merge experimental-packages/Triangulation_2-unrecursive 2012-10-24 09:26:32 +00:00
Sébastien Loriot 5c4ae5d477 windows mixes up Fb template parameter with nested Fb type from base class 2012-08-22 06:48:49 +00:00
Laurent Rineau db194534c7 First big patch to fix -Wunused-local-typedefs 
-Wunused-local-typedefs is a new warning flag of gcc-4.7, and it will enabled
 by -Wall since gcc-4.8 (not yet released).

The fix is a big set of removals of unused typedefs (or comments, or moves,
depending on the context).
 2012-08-01 13:29:16 +00:00
Marc Glisse a758751485 Remove / comment out unused local typedefs. Fix one place where FT was used instead of RT (homogeneous coordinates, probably never compiled). 2012-07-28 06:21:06 +00:00
Sébastien Loriot 3e750c6fd7 temporary hack to work around assertion 2012-07-17 12:08:49 +00:00
Laurent Rineau 49404f75f5 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).
 2012-06-28 09:16:23 +00:00
Andreas Fabri 7cb640d05d The Constraint_hierarchy_2 gets an additional LessXY_2 functor as template argument so that it no longer applies operator<(Point,Point) 2012-06-25 10:11:56 +00:00