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

1081 Commits

Author SHA1 Message Date
Laurent Rineau 1c2e9df8cf Merge branch 'releases/CGAL-4.11-branch' 2017-12-19 16:29:10 +01:00
Laurent Rineau 5181cd7474 Merge branch 'releases/CGAL-4.10-branch' into releases/CGAL-4.11-branch 
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h
 2017-12-19 16:19:22 +01:00
Laurent Rineau 200a56eb9e Merge pull request #2625 from afabri/Triangulation_2-derecursification-GF 
Derecursify functions in Constrained Delaunay and Constrained Triangulation
 2017-12-19 16:13:18 +01:00
Andreas Fabri ef3c8a638e fix indentation 2017-12-07 08:18:45 +00:00
Andreas Fabri 3572246411 fix the derucursification 2017-11-29 07:20:42 +00:00
Andreas Fabri 62b9e59fa1 Derecursify in Constrained_triangulation_plus_2 2017-11-28 15:12:41 +00:00
Andreas Fabri 029888f85c Derecursify insert_constraint(Vhandle,Vhandle); Increment depth of propagating_flip() 2017-11-23 15:50:26 +00:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags 
Add SPDX License Identifier
 2017-11-15 16:48:27 +01:00
Laurent Rineau 78b8873433 Merge pull request #2572 from sloriot/T2-BGL_missing_null_descriptors 
Add missing null descriptor functions in graph_traits of triangulations
 2017-11-15 16:48:23 +01:00
Laurent Rineau d825ea3734 Merge pull request #2572 from sloriot/T2-BGL_missing_null_descriptors 
Add missing null descriptor functions in graph_traits of triangulations
 2017-11-15 16:44:38 +01:00
Sébastien Loriot ff26773f7b remove include directive for checking GPL compliance in LGPL headers 2017-11-12 10:21:35 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Sébastien Loriot 196603fc8a add missing null descriptors in graph_traits of triangulations 2017-11-03 10:07:52 +01:00
Laurent Rineau 46cc91e787 Merge pull request #2478 from mtola/master 
fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during …
 2017-10-13 17:06:22 +02:00
Laurent Rineau 8f46324806 Merge pull request #2475 from sgiraudot/Fix_counting_iterator_warning_everywhere-GF 
Fix counting iterator warnings
 2017-10-11 19:15:15 +02:00
Laurent Rineau 2b35bddfb2 Replace all std::binary_function by CGAL::binary_function 2017-10-04 16:36:32 +02:00
Simon Giraudot 1e7b9ea027 Fix counting iterator warnings 2017-09-29 14:47:17 +02:00
Mael Rouxel-Labbé 7e46e5c248 Fixed (?) uninitialized TVb_2 member 2017-08-29 11:22:28 +02:00
Mael Rouxel-Labbé aaeaf35380 Introduced the tag "Periodic_tag" to mark distinguish periodic triangulations 2017-08-23 16:18:05 +02:00
Mael Rouxel-Labbé d4d55453d7 Added a point() function to Triangulation_2 
Necessary for Alpha_shapes_2 because some triangulations (e.g. P2T2) cannot
use v->point() but must use tr.point(v)
 2017-08-23 11:00:50 +02:00
Sébastien Loriot 3131426c07 fix circumcenter in regular case 2017-08-01 21:30:59 +02:00
Laurent Rineau fc8aacc017 Fix compilation errors with non-MSVC compilers 2017-07-18 16:46:38 +02:00
Andreas Fabri 8463b1a251 Add implementation and test of Constrained_edges_iterator 2017-07-18 13:44:21 +02:00
Laurent Rineau 78f1988747 Merge pull request #2247 from lrineau/Surface_mesher-cleanup_after_Weighted_point_3-lrineau 
Surface mesher: cleanup files after the move to Weighted_point_3
 2017-07-17 12:24:03 +02:00
Laurent Rineau bad0922002 Re-introduce the deprecation warning for <CGAL/Weighted_point.h> 2017-07-12 10:19:59 +02:00
Laurent Rineau d5ada527ec Revert "Change comment to avoid warning" 
This reverts commit 424c01285d.
 2017-07-11 13:32:03 +02:00
Mael Rouxel-Labbé 71733cc689 Removed boost's function_property_map header includes 
(that were re-added by auto merges again...)
 2017-07-05 11:52:53 +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
Laurent Rineau d40fea257d Merge pull request #2198 from sloriot/T2-add_missing_include 
add missing include directive to use CGAL::to_double()

(Via a merge of 'cgal/releases/CGAL-4.9-branch')
 2017-06-28 10:52:12 +02:00
Mael Rouxel-Labbé 7bfd48d56d Minor include fix 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é 1fc2282350 Fixed regular triangulation capitalization across CGAL 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 11786a7b90 Fixed minor mistakes from a rebase 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
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é ff4888fb33 Projection traits must define Construct_point_2 and Construct_weighted_point_2 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 1ccf2f5fee Fixed point type in the line face circulator 2 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 13af4ebb1f Changed some output from french to english 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 688b495d6f Fixed Triangulation_2's spatial_sorts on weighted points 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 1e2057f982 Triangulation_2's point type is deduced from the TDS::Vb, not from the traits 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé d97da922f8 Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 2451c122d1 Removed useless class Regular_traits_adaptor_2.h 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é 860886dfc2 Improved readiblity of Regular_triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 5f37a4bea6 Improved readability of Triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 2dc4974871 Improved readability of Delaunay_triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 1091661007 Do not provide Bare_point overloads in Regular_triangulation_2 
Additional:
-- Simplify the hierarchy_2: there is no need to distinguish between
   Bare_point and Weighted_point, that is the point (!) of the type "Point"
   in Triangulation_2.
-- Use Weighted_point in tests
 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé e96f05f31b Fixed Bare_point / Weighted_point usage in Triangulation_2 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é 22bd3538a0 Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-06-28 10:14:35 +02:00
Sébastien Loriot f0ec03218d using type from the base class 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
Andreas Fabri 83b0d24df8 make it work for the triangulation hierarchy with regular 2017-06-28 10:14:35 +02:00
Andreas Fabri d73be575f5 Do in 2D what we did in 3D 2017-06-28 10:14:35 +02:00
Laurent Rineau 028213df6e Merge pull request #2198 from sloriot/T2-add_missing_include 
add missing include directive to use CGAL::to_double()
 2017-06-27 16:29:35 +02:00
Sébastien Loriot 1fc06e0550 add missing include directive to use CGAL::to_double() 2017-06-26 07:06:20 +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é 98800d2de8 Fixed regular triangulation capitalization across CGAL 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 8fbe17c080 Fixed minor mistakes from a rebase 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 9872edfe93 Fixed wrong template type (which induced taking references of references) 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 8ad34307ad Fixed Has_nested_type_Bare_point includes 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 451f084021 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-15 10:34:15 +02:00
Mael Rouxel-Labbé d26954a341 Projection traits must define Construct_point_2 and Construct_weighted_point_2 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé c210c4d9b8 Fixed point type in the line face circulator 2 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé f2eeffcc15 Changed some output from french to english 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 357ca0bc1b Fixed Triangulation_2's spatial_sorts on weighted points 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé c1a6bf0849 Triangulation_2's point type is deduced from the TDS::Vb, not from the traits 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé a97db4fe62 Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 09d4a3e8dc Removed useless class Regular_traits_adaptor_2.h 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 1e5ad8c41e 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-15 10:34:15 +02:00
Mael Rouxel-Labbé 840619c39c Improved readiblity of Regular_triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé 74cf687dd2 Improved readability of Triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé eb87c95956 Improved readability of Delaunay_triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé ccf1385adf Do not provide Bare_point overloads in Regular_triangulation_2 
Additional:
-- Simplify the hierarchy_2: there is no need to distinguish between
   Bare_point and Weighted_point, that is the point (!) of the type "Point"
   in Triangulation_2.
-- Use Weighted_point in tests
 2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé 89d095d683 Fixed Bare_point / Weighted_point usage in Triangulation_2 2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé 12a39cb727 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-15 10:32:03 +02:00
Mael Rouxel-Labbé a0153d77ce Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-06-15 10:32:03 +02:00
Sébastien Loriot 5a3fe64d71 using type from the base class 2017-06-15 10:32:03 +02:00
Sébastien Loriot 8b49402d80 version without partial specialization 
the norms says that partial specialization should be
done in a namespace (not inside a class)
 2017-06-15 10:32:03 +02:00
Andreas Fabri 2b2de1bf22 make it work for the triangulation hierarchy with regular 2017-06-15 10:29:26 +02:00
Andreas Fabri 21395c7d5e Do in 2D what we did in 3D 2017-06-15 10:29:26 +02:00
Mael Rouxel-Labbé 5955f9c7c0 Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle 
Based on Kernel_Weighted_point_without...
  @ 67c531af53
 2017-06-08 14:37:26 +02:00
Mael Rouxel-Labbé 5f1ba08d52 Fixed minor mistakes from a rebase 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 42469ac33a Fixed wrong template type (which induced taking references of references) 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé e861cc0f61 Fixed Has_nested_type_Bare_point includes 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé a2f5f64fc3 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-08 13:23:10 +02:00
Mael Rouxel-Labbé f54ec34d1a Projection traits must define Construct_point_2 and Construct_weighted_point_2 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé be154515fc Fixed point type in the line face circulator 2 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 0181e353dd Changed some output from french to english 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé a45325a20e Fixed Triangulation_2's spatial_sorts on weighted points 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 50670b1303 Triangulation_2's point type is deduced from the TDS::Vb, not from the traits 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 3a48794d5c Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé a54d9c9148 Removed useless class Regular_traits_adaptor_2.h 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 759d8b3a30 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-08 13:23:10 +02:00
Mael Rouxel-Labbé 8274aec2e0 Improved readiblity of Regular_triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé d277c44b7d Improved readability of Triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé eb837bfd39 Improved readability of Delaunay_triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 5205d3c1f3 Do not provide Bare_point overloads in Regular_triangulation_2 
Additional:
-- Simplify the hierarchy_2: there is no need to distinguish between
   Bare_point and Weighted_point, that is the point (!) of the type "Point"
   in Triangulation_2.
-- Use Weighted_point in tests
 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 4baa9531c1 Fixed Bare_point / Weighted_point usage in Triangulation_2 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé ee5b2d2876 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-08 13:23:10 +02:00
Mael Rouxel-Labbé f5d617f50c Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-06-08 13:23:10 +02:00
Sébastien Loriot 4037d48fca using type from the base class 2017-06-08 13:23:10 +02:00
Sébastien Loriot f783413de9 version without partial specialization 
the norms says that partial specialization should be
done in a namespace (not inside a class)
 2017-06-08 13:23:10 +02:00
Andreas Fabri 92bf9ffe2c make it work for the triangulation hierarchy with regular 2017-06-08 13:23:10 +02:00
Andreas Fabri 858e846b72 Do in 2D what we did in 3D 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 9b5f5be821 Fixed bad merge and removed the last include of Reg_tr_euclidean_traits_2 2017-05-24 14:08:23 +02:00
Mael Rouxel-Labbé 5354134469 Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle 2017-05-24 12:18:49 +02:00
Mael Rouxel-Labbé b65bfb3a4e Fixed minor mistakes from a rebase 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 9debfdfd78 Fixed wrong template type (which induced taking references of references) 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 70e1ac97f6 Fixed Has_nested_type_Bare_point includes 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 22322e3c83 Annihilated Regular_triangulation_euclidean_traits_23 across all packages 
Left a little bit alive in the tests and in the Triangulation_23/doc
 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 1526241f91 Projection traits must define Construct_point_2 and Construct_weighted_point_2 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé a147bdfc13 Fixed point type in the line face circulator 2 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé c4277cca60 Changed some output from french to english 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé f55f6e2db9 Fixed Triangulation_2's spatial_sorts on weighted points 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé acc94726ec Triangulation_2's point type is deduced from the TDS::Vb, not from the traits 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé a575f5a875 Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé fb363681b7 Removed useless class Regular_traits_adaptor_2.h 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 84d7f97975 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-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 1242ea4c00 Improved readiblity of Regular_triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-05-22 11:20:45 +02:00
Mael Rouxel-Labbé 0a556f9039 Improved readability of Triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-05-22 11:20:45 +02:00
Mael Rouxel-Labbé d5d6383842 Improved readability of Delaunay_triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-05-22 11:20:45 +02:00
Mael Rouxel-Labbé 4fba43fa35 Do not provide Bare_point overloads in Regular_triangulation_2 
Additional:
-- Simplify the hierarchy_2: there is no need to distinguish between
   Bare_point and Weighted_point, that is the point (!) of the type "Point"
   in Triangulation_2.
-- Use Weighted_point in tests
 2017-05-22 11:20:45 +02:00
Mael Rouxel-Labbé ef262c9d24 Fixed Bare_point / Weighted_point usage in Triangulation_2 2017-05-22 11:20:45 +02:00
Mael Rouxel-Labbé e041870954 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-05-22 11:20:45 +02:00
Mael Rouxel-Labbé 4f81c8c794 Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-05-22 11:20:45 +02:00
Sébastien Loriot 09f0be4418 using type from the base class 2017-05-22 11:20:45 +02:00
Sébastien Loriot 51bc69cca3 version without partial specialization 
the norms says that partial specialization should be
done in a namespace (not inside a class)
 2017-05-22 11:20:45 +02:00
Andreas Fabri 556d73819d make it work for the triangulation hierarchy with regular 2017-05-22 11:20:45 +02:00
Andreas Fabri b621a425b5 Do in 2D what we did in 3D 2017-05-22 11:20:45 +02:00
Mael Rouxel-Labbé f45c008721 Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle 
Using afabri/Kernel_Weighted_point_without_conversion-GF
  @ 5c2a089e3e
 2017-05-16 17:48:07 +02:00
Laurent Rineau 0feb23ec43 Re-add <CGAL/config.h> to avoid a conflict with `master` 
The `#include` was removed by error by:

    73122ac202
    Author: Andreas Fabri <andreas.fabri@geometryfactory.com>
    Date:   Tue May 16 08:26:08 2017 +0200

        Change comment to avoid warning
 2017-05-16 10:53:44 +02:00
Mael Rouxel-Labbé 424c01285d Change comment to avoid warning 2017-05-16 10:19:54 +02:00
Andreas Fabri 73122ac202 Change comment to avoid warning 2017-05-16 10:19:54 +02:00
Mael Rouxel-Labbé 0cd98e6ff1 Silenced depreciation warnings from Weighted_point.h 2017-05-16 10:17:41 +02:00
Mael Rouxel-Labbé 266775bafa Silenced depreciation warnings from Regular_triangulation_euclidean_traits_23 2017-05-16 10:17:41 +02:00
Mael Rouxel-Labbé cd2a562ffa Fixed improper guards against the inclusion of deprecated headers 2017-05-16 10:17:41 +02:00
Mael Rouxel-Labbé c353f0f49c Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-05-16 10:17:41 +02:00
Mael Rouxel-Labbé d07976b2ac All triangulations now use Perturbation_order in tests using symbolic perturbations 2017-05-15 17:13:38 +02:00
Mael Rouxel-Labbé 9f865e87bb Fixed wrong template type (which induced taking references of references) 2017-05-12 12:21:39 +02:00
Mael Rouxel-Labbé 46b489b2b5 Fixed Has_nested_type_Bare_point includes 2017-05-10 12:33:43 +02:00
Mael Rouxel-Labbé 97b789a741 Merge branch 'Kernel_Weighted_point_without_conversion-GF-old' into Kernel_Weighted_point_without_conversion-GF 2017-05-10 12:32:46 +02:00
Mael Rouxel-Labbé a7cabb5369 Annihilated Regular_triangulation_euclidean_traits_23 across all packages 
Left a little bit alive in the tests and in the Triangulation_23/doc
 2017-05-05 12:56:18 +02:00
Mael Rouxel-Labbé 57199b822b Projection traits must define Construct_point_2 and Construct_weighted_point_2 2017-05-01 16:23:27 +02:00
Mael Rouxel-Labbé 869ab89553 Fixed point type in the line face circulator 2 2017-05-01 16:22:47 +02:00
Mael Rouxel-Labbé d7680ad54b Changed some output from french to english 2017-05-01 16:22:29 +02:00
Mael Rouxel-Labbé 6bbeee9186 Fixed Triangulation_2's spatial_sorts on weighted points 2017-05-01 16:21:34 +02:00
Mael Rouxel-Labbé 2a8d77882e Triangulation_2's point type is deduced from the TDS::Vb, not from the traits 2017-05-01 16:20:29 +02:00
Mael Rouxel-Labbé 206247744b Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2 2017-05-01 16:19:31 +02:00
Mael Rouxel-Labbé fbbd583b79 Removed useless class Regular_traits_adaptor_2.h 2017-05-01 16:17:55 +02:00
Mael Rouxel-Labbé ac63b66286 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-04-18 15:16:43 +02:00
Mael Rouxel-Labbé fa6b7b7048 Improved readiblity of Regular_triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-04-15 20:29:33 +02:00
Mael Rouxel-Labbé ce44fd046b Improved readability of Triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-04-15 20:27:08 +02:00
Mael Rouxel-Labbé d9d54e287b Improved readability of Delaunay_triangulation_2.h (no real changes) 
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
 2017-04-15 20:26:23 +02:00
Laurent Rineau a1cd3fd9d5 Merge pull request #1991 from afabri/Triangulation_2-graph_traits_for_CDT-GF 
Triangulation_2: Add graph_traits for all triangulation classes
 2017-04-14 18:32:14 +02:00
Mael Rouxel-Labbé e4fc874acd Do not provide Bare_point overloads in Regular_triangulation_2 
Additional:
-- Simplify the hierarchy_2: there is no need to distinguish between
   Bare_point and Weighted_point, that is the point (!) of the type "Point"
   in Triangulation_2.
-- Use Weighted_point in tests
 2017-04-14 16:54:24 +02:00
Mael Rouxel-Labbé 33fab40dc0 Fixed Bare_point / Weighted_point usage in Triangulation_2 2017-04-14 16:53:18 +02:00
Mael Rouxel-Labbé 3c9063cd88 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-04-14 15:39:30 +02:00
Mael Rouxel-Labbé 863584e863 Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-04-14 10:59:42 +02:00
Laurent Rineau 87c9afd486 Fix the compilation of individual headers 
- in most cases, that was just adding missing #include
- I have removed the use of <CGAL/basic.h>
 2017-04-13 15:56:51 +02:00
Mael Rouxel-Labbé 2ee5b13e6f Merge branch 'Kernel_Weighted_point_without_conversion-GF-old' into Kernel_Weighted_point_without_conversion-GF 
Using Kernel-Fix_weighted_point-GF @ 8703f5c122
 2017-04-11 17:01:25 +02:00
Andreas Fabri 8cbbe0e165 Remove dependencies of Triangulation_3 on Triangulation_2 2017-04-06 11:08:37 +02:00
Andreas Fabri e64884da90 Also add support for Regular_triangulation_2 2017-03-31 12:38:17 +02:00
Andreas Fabri 3c6741feba typename typename -> typename 2017-03-29 15:00:15 +02:00
Andreas Fabri a6d43f0a15 capitalize file name that gets included; fix typo 2017-03-24 08:44:18 +01:00
Andreas Fabri 08eacf9d02 forward the types from the template parameter 2017-03-23 15:20:57 +01:00
Andreas Fabri de805a8934 Change the template parameter name as VC++ has a problem when combining the hierarchy with CDT_plus_2 2017-03-23 15:18:53 +01:00
Andreas Fabri 3f0040ef63 Add types and property maps so that the triangulations become a model of FaceGraph 2017-03-23 14:26:51 +01:00
Andreas Fabri ba148d1dd8 Add types and property maps so that the triangulations become a model of FaceGraph 2017-03-23 12:51:04 +01:00
Andreas Fabri 23814e692f Remove functions that already exist for the base class. Add graph_traits for the constrained triangulations 2017-03-23 11:58:46 +01:00
Sébastien Loriot 1e4bba379b using type from the base class 2017-03-06 12:11:09 +01:00
Sébastien Loriot ac0dfe3465 version without partial specialization 
the norms says that partial specialization should be
done in a namespace (not inside a class)
 2017-03-06 12:10:24 +01:00
Andreas Fabri 9dd7b63e2a make it work for the triangulation hierarchy with regular 2017-03-03 16:25:09 +01:00
Andreas Fabri f6cf296d5f Do in 2D what we did in 3D 2017-03-03 15:32:24 +01:00
Laurent Rineau 1a2f617d89 Merge pull request #1843 from afabri/BGL_accelerate_copy_face_graph-GF 
Accelerate copy_face_graph
 2017-02-08 17:32:47 +01:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files 
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
 2017-01-19 15:20:25 +01:00
Sébastien Loriot e50ae3c7bf fix copy-paste bug 2017-01-18 15:29:35 +01:00
Sébastien Loriot 9ae7b37845 Merge pull request #1745 from sloriot/Polyhedra_corefinement-enhancements-sloriot 
Add corefinement operations in PMP
 2017-01-12 12:05:18 +01:00
Sébastien Loriot 99234880c9 Merge pull request #1786 from afabri/Triangulation_2-Prevent_deref-GF 
Triangulation_2: Reduce code by switching to Prevent_deref
 2017-01-02 19:10:24 +01:00
Sébastien Loriot fe5e925367 Merge pull request #1701 from afabri/Convex_hull_3-FaceGraph-GF 
Convex_hull_3: Switch to FaceGraph
 2016-12-30 15:14:34 +01:00
Andreas Fabri a2a3daed85 capitalize 2016-12-30 10:48:16 +01:00
Andreas Fabri 9fd4e03a0d Use Prevent_deref 2016-12-29 14:06:04 +01:00
Andreas Fabri b4d1f8f0f7 Use Prevent_deref 2016-12-29 13:17:38 +01:00
Andreas Fabri b867150561 Use Prevent_deref 2016-12-29 13:12:00 +01:00
Laurent Rineau bbf430b0b1 Merge pull request #585 from afabri/Kernel-Weighted_point-GF 
Introduce Kernel::Weighted_point_3 together with functors
 2016-12-20 19:52:02 +01:00
Sébastien Loriot 15b7f052da remove an extra const 
follow-up of dbafcaa0
 2016-12-15 17:30:53 +01:00
Andreas Fabri 0b1ee33a60 Introduce and use a new filtered predicate class for predicates having states 
The exact predicate is constructed only when needed. In particular, the exact
version of the state is also constructed only when needed.

The constness of data members of predicates of Triangulation_2_filtered_traits
has been removed to allor operator= to be defined (and used by optional)
 2016-12-14 11:25:06 +01:00
Laurent Rineau b354b24270 Merge pull request #1712 from sloriot/CGAL-add_missing_include 
add missing include directive
 2016-12-02 11:37:08 +01:00
Sébastien Loriot 5b61aa18a8 workaroung a bug in g++ 4.4 2016-11-30 08:49:19 +01:00
Guillaume Damiand 2ab268965f LCC for CMap and GMap; incremental builder; save and load; test. 2016-11-29 11:43:36 +01:00
Sébastien Loriot 728bc98d37 add missing include directive 2016-11-22 16:23:22 +01:00
Andreas Fabri d624271315 Remove usage of Regular_triangulation_euclidean_traits_3 2016-11-21 16:43:40 +01:00
Laurent Rineau 2835e361c8 Fix the constructors of RT euclidian traits class 
@janetournois @afabri

That commit will fix both runtime errors in Interpolation and
compilation errors in KDS:

  - in Interpolation, the traits class carries a normal vector: it needs
  to be passed to the RT traits class as well,

  - Same in KDS: the compilation error was saying that the constructor
    of RT_euclidian_traits_3 must initialize it base class.
 2016-11-18 17:55:05 +01:00
Andreas Fabri 8b8c52cf7f fix typos in the doc 
Add boost::graph_traits for a TDS_2
 2016-11-18 09:41:40 +01:00
Andreas Fabri 490949efa7 fix Interpolation package 2016-11-16 09:58:23 +01:00
Andreas Fabri e87351e51a A typname too much 2016-11-16 08:20:44 +01:00
Jane Tournois 0f569a8fd6 introduce Has_nested_type_Bare_point to keep backward compatible 
it is needed when Regular_triangulation_euclidean_traits is used the first
template parameter for Regular_triangulation (both 2d and 3d)
 2016-11-03 14:57:10 +01:00
Jane Tournois 2c9a580c96 all CGAL kernels are now models of `RegularTriangulationTraits_2` 
wrapper Weighted_point_mapper_2 is not necessary anymore
 2016-11-03 14:55:39 +01:00
Andreas Fabri 66ed20d389 fix typo 2016-11-03 14:53:54 +01:00
Andreas Fabri ad9d2c369c Rename tests following Olivier's recommendations 2016-11-03 14:53:54 +01:00
Andreas Fabri 537bdc00de Reintroduce Regular_triangulation_filtered_traits_2 2016-11-03 13:10:27 +01:00
Andreas Fabri 0ec908b981 Why does g++ need the this-> here ??? 2016-11-03 13:10:00 +01:00
Andreas Fabri 44d0fa4d6f fix the 2D triangulations 2016-11-03 13:08:31 +01:00
Andreas Fabri 9dde08c414 WIP 2016-11-03 13:07:50 +01:00
Andreas Fabri bbfb20d3c3 and remove the file where the content was moved before 2016-11-03 13:07:50 +01:00
Andreas Fabri 7d35bb0a8b First move the C2 and H2 pedicate and construction files operating on the RT 2016-11-03 13:07:50 +01:00
Laurent Rineau 5aaa9c0c22 Merge pull request #1577 from afabri/Triangulation_2-fix_for_empty_range-GF 
(Merged from the merge of 'cgal/releases/CGAL-4.9-branch'.)
 2016-10-20 10:20:34 +02:00
Laurent Rineau c637a564f3 Merge pull request #1588 from afabri/CGAL-may_be_uninitialized_warnings-GF 
Triangulation_2: initialize data members to avoid warning
 2016-10-20 09:47:51 +02:00
Laurent Rineau c826500c7d Merge pull request #1551 from mglisse/Number_types-gmpxx_coercion-glisse 
Misc GMPXX fixes
 2016-10-20 09:47:39 +02:00
Andreas Fabri 76d751be01 Use CGAL_FALLTHROUGH 2016-10-17 13:45:42 +02:00
Andreas Fabri 89242f2687 When the dimension is 0, we can only have 0 or 1 vertices 2016-10-17 13:45:42 +02:00
Andreas Fabri aac821a61d Deal with an empty range as input 2016-10-15 08:18:01 +02:00
Marc Glisse 60806b035b Specify the number type, for expression templates. 2016-10-13 08:49:22 +02:00
Andreas Fabri cf719f65cd intialize to avoid warning with -Wall on CentOS6-CXX11-Boost157_? 2016-10-12 09:15:56 +02:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF 
Compute and fix packages dependencies
 2016-10-05 13:11:04 +02:00
Laurent Rineau 059cfb17cb Merge pull request #1435 from afabri/Triangulation_2-Iterator_project-GF 
Triangulation_2: Use boost::transform_iterator instead of CGAL::Iterator_project
 2016-10-05 13:02:23 +02:00
Andreas Fabri cf8c1a6cdf Dispatch import functions to Polyhedron, T2, T3 2016-09-30 15:23:15 +02:00
Laurent Rineau 1aefb3b0f3 include <CGAL/config.h>, not <CGAL/basic.h> 2016-09-30 15:23:14 +02:00
Laurent Rineau 51f5697d3d Add missing #include 2016-09-30 15:23:14 +02:00
Andreas Fabri 7ff83d1b8c dispatch files to the appropriate package: T2,Polyhedro,HDS 2016-09-30 15:23:14 +02:00
Andreas Fabri dda0c4f29b Fix package Triangulation_3: include headers 2016-09-30 15:22:29 +02:00
Andreas Fabri 40e9c6f735 Move specializations of graph_traits the packages that are concerned 2016-09-30 15:22:29 +02:00
Andreas Fabri 91c6426ae2 Move info_check from T3 to T2 2016-09-30 15:22:28 +02:00
Clement Jamin a664634a9f Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2016-09-20 16:10:13 +02:00
Laurent Rineau e2d04e54e0 Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch' 
> 3176b37 Merge pull request #1452 from mglisse/Number_types-Eigen_Literal-glisse
> 1705702 Merge pull request #1417 from afabri/Polyline_simplification-Bugfix_choose_correct_Itag-GF
> 3bef239 Merge pull request #1462 from sloriot/PMP-add_missing_include
 2016-09-15 17:25:20 +02:00
Andreas Fabri 147ebae4d6 Fix bug in polyline simplification: 
We had hardwired that we use Exact_predicates_tag which is slow for EPEC
in particular with Quotient<MP_float> or leda::real

We determine the appropriate tag using Algebraic_structure_traits<FT>::Is_exact
 2016-09-14 16:16:28 +02:00
Clement Jamin fa6ecf39be Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2016-09-09 12:55:43 +02:00
Andreas Fabri ef00da9bc8 remove commented code 2016-09-06 23:04:58 +02:00
Andreas Fabri 77f2f7f992 Use transform_iterator 2016-09-06 18:43:56 +02:00
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
Clement Jamin 9487c71ad1 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2016-05-18 19:41:22 +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
Clement Jamin 003b435a46 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2015-11-20 11:53:44 +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 8081234930 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2015-10-16 10:59:18 +02: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
Clement Jamin bcb523ba3e Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2015-09-09 14:21:30 +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
Clement Jamin 80d046bc81 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2015-07-20 12:17:03 +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
Clement Jamin 5f8ca65abf Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2015-03-25 13:48:38 +01: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
Clement Jamin 03253edf19 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2014-09-09 14:35:38 +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
Clement Jamin eebad0e1a4 Add applications to help comparison between T2/T3 and Td 2014-06-16 19:35:04 +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
Philipp Möller 5f6b09c484 Fix types of loop counters to size_t. 2012-06-20 09:15:34 +00:00
Sébastien Loriot 19857458b6 deprecation warnings 2012-05-28 07:28:03 +00:00
Menelaos Karavelas 9201c1f2c3 implementation and documentation for the Rebind_vertex and Rebind_face small 
feature of the TDS_2 concept.
The release manager has approved the commit directly into the next branch.
 2012-05-24 14:07:56 +00:00
Philipp Möller 8529612009 Drop some never implemented members from the hierarchy. 
Remove keep_points from PCT and PHierarchy.
Document the effect of the fixed member in simplify.
 2012-05-14 13:09:03 +00:00
Philipp Möller a3ae98b371 Add a range overload for insert_constraint and document it. 
Fix the return types in the documentation. 
Add both overloads of push_back to be more similar to C_t_plus
 2012-05-14 12:10:16 +00:00
Philipp Möller bd81c4fe68 Minor copy&paste fix 2012-05-11 15:14:02 +00:00
Philipp Möller af62f9848b constness, insert pair<Point, Point>, Self typedef 2012-05-11 13:27:17 +00:00
Philipp Möller c72b426896 Propagated that change up through the hierarchy. (*it)-> syntax for 
Vertex_it still feels a little bit awkward but is the best we can get.
 2012-05-10 16:02:11 +00:00
Philipp Möller 918a6084ab Node is now entirely encapsulated. 2012-05-10 14:26:46 +00:00
Philipp Möller a2c0e017e3 Dropped the H_ prefix and purged some typedefs. 2012-05-10 13:53:43 +00:00
Philipp Möller cfea03d54b Dropped out-dated examples, simplify.cpp example compiles. 2012-05-10 13:35:00 +00:00
Philipp Möller 9464dccbb5 Clean up and Node conversions. 2012-05-10 09:51:09 +00:00
Philipp Möller 3c98b60509 Removed simplification from this package. 2012-05-09 15:38:28 +00:00
Philipp Möller 092f09e490 Replaces Squared_distance_cost with the version from the Triangulation_2 package. 2012-05-09 15:36:59 +00:00
Philipp Möller 57417b0050 Removed executable property. 2012-05-09 15:34:38 +00:00
Philipp Möller 38228d6982 Added conversions to Skiplist, integrated it somewhat into 
constraint_hierarchy, merged some code there and added a Default to
the triangulation.
 2012-05-09 13:39:36 +00:00
Philipp Möller 9d91dcc2ef proper naming 2012-05-04 16:24:30 +00:00
Philipp Möller f43213905b Removed unnecessary include. 2012-05-04 16:22:23 +00:00
Philipp Möller 328e59e04e A vertex base for Polyline_constraint_hierarchy 2012-05-04 15:55:02 +00:00
Philipp Möller da6f1be1d2 Typenamified constrained_triangulation, partially integrated skiplist 2012-05-04 13:39:22 +00:00
Andreas Fabri f9489d4dc5 insert_polyline ->insert_constraint 2012-05-03 15:10:34 +00:00
Andreas Fabri e2b039379b Add remove_points_from_constraints 2012-04-26 11:36:13 +00:00
Andreas Fabri 97949be7cb Add remove_points_from_constraint 2012-04-26 11:31:04 +00:00
Andreas Fabri e650998cc3 code follows doc 2012-04-26 09:41:56 +00:00
Andreas Fabri bf657edffc Duplicate and modify functions as they are more efficient 2012-04-20 22:31:23 +00:00
Andreas Fabri 271f52dbd4 Add an error function for polyline simplification 2012-04-20 10:33:46 +00:00
Andreas Fabri c19ff964b2 Add files for Polyline_constrained_triangulation_2 2012-04-20 10:11:18 +00:00
Andreas Fabri c8c67ab24c Add insert_constraint(Vertex_handle vaa, Vertex_handle vbb, OutputIterator out) 2012-04-20 10:10:08 +00:00
Laurent Rineau 95bec3999c Use Unique_has_map instead of std::map (patch from Andreas Fabri) 
The gain on copies of T2 or T3 is the following:


afabri@klimt /cygdrive/c/cgal/next/Triangulation_3/benchmark/Triangulation_3
$ ./copy 1000000 2
36.806 sec

afabri@klimt /cygdrive/c/cgal/next/Triangulation_3/benchmark/Triangulation_3
$ ./copy 1000000 2
4.865 sec

The benchmarck copy.cpp is the following (not commited):

#define  CGAL_T3_HASH
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Timer.h>
#include <CGAL/point_generators_3.h>


#include <iostream>
#include <fstream>
#include <string>
#include <vector>

typedef CGAL::Exact_predicates_inexact_constructions_kernel  K;
typedef CGAL::Delaunay_triangulation_3<K> Delaunay;
typedef K::Point_3                                     Point;
typedef CGAL::Creator_uniform_3<double,Point>  Creator;



int main(int argc, char **argv)
{
  int n=1000000;
  int rep=100;
  if (argc>=2)
    n=atoi(argv[1]);
  if (argc>=3)
    rep=atoi(argv[2]);
  std::vector<Point> points;
  points.reserve(n);  
  CGAL::Random_points_in_sphere_3<Point,Creator> g(1);
  CGAL::copy_n( g, n, std::back_inserter(points));
  Delaunay original;
  original.insert(points.begin(),points.end());
  
  double res = 0;
  for (int r=0;r<rep;++r){
    CGAL::Timer t;    t.start();
    Delaunay delaunay=original;
    t.stop();
    res+=t.time();
  }

  std::cout << res << std::endl;
            
  return 0;
}
 2012-03-30 12:37:19 +00:00
Sébastien Loriot 498c0a6e1e Make the insert-by-range function more permissive 
The condition is now to be convertible to the point type, pair<point,info>,...
This was the behavior before the insert-by-range-with-info methods were
introduced.
 2012-01-24 17:25:20 +00:00
Olivier Devillers 1eb0ad5c1b optimize 2012-01-24 16:24:56 +00:00
Olivier Devillers 8722c292d7 replace inexact_locate by has_inexact_negative_orientation 2012-01-24 09:45:13 +00:00
Sébastien Loriot a7456a2736 merge from next 2012-01-16 15:28:51 +00:00
Laurent Rineau 0e3de8807e Fix performances of Triangulation_2 with EPEC 
There was a performance degradation between CGAL-3.7 and CGAL-3.8, when
Triangulation_2 is used with EPEC. This patch fixes the issue. Using a
functor that is specialized for EPEC, in inexact_orientation, to_double is
not called on p.x() but on p.approx().x().
 2012-01-16 13:45:16 +00:00
Sébastien Loriot fca9a7bf54 *add operator>> for Constrained_triangulation_2 
*update demo
*add save CDT for demo

see the related small feature:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_read_istream_for_constrained_triangulation.
 2012-01-16 13:32:05 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Sébastien Loriot eddf2131d6 merge from next 2011-12-30 11:09:29 +00:00
Sébastien Loriot 59b50cc467 make static variable in remove thread_safe. 
I choose this solution since making the container global variable of
the class penalize classes that do not use remove functions.
The overhead introduced is small (less than 2-3% of the total remove time).
 2011-12-29 16:35:40 +00:00
Laurent Rineau 6ed56d75b5 merge from next 2011-10-25 15:48:02 +00:00
Olivier Devillers 5f4f11e2df not turning always in the same manner in a triangle speed up the walk (for long walks) 2011-10-25 11:31:01 +00:00
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Olivier Devillers ef043927fd too conservative check removed, for fast removal in delaunay 2d 2011-09-06 15:21:27 +00:00
Sébastien Loriot 98ddbf9c7e merge packages Spatial_sorting, Triangulation_2 and Triangulation_3 from branch spatial_sorting-add_info-sloriot 2011-05-24 15:48:31 +00:00
Marc Glisse 19b75ba29c Remove unused lines 2011-04-12 10:08:00 +00:00
Laurent Rineau 5604fef79f Move <CGAL/apply_to_range.h> to trunk/Triangulation_2... 
... to avoid that useful file to be removed by error if we remove
trunk/Qt_widget one day (but also because it is more logical).
 2011-03-29 09:38:36 +00:00
Laurent Rineau fc2e05e67d Triangulation_2_projection_traits_3 is now a model of DelaunayMeshTraits_2. 2011-03-23 17:28:51 +00:00
Sébastien Loriot 6340a510c5 merge the code for Triangulation_2 to insert range of points with info 
protected by macro CGAL_TRIANGULATION_2_DONT_INSERT_RANGE_OF_POINTS_WITH_INFO
 2011-01-11 07:40:47 +00:00
Sébastien Loriot 3e04fb16fb merge packages related to projection traits into the trunk. 2011-01-11 07:18:36 +00:00
Sébastien Loriot 5f674516b0 add precondition to dual functions to check that objects are from the triangulation. 2010-12-23 15:55:50 +00:00
Laurent Rineau 96162627aa Merge the following small features in trunk: 
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Remove_cluster
  https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Structural_filtering

Merge also a partial support of:
  https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Rt::vertices_inside_conflict_zone
    (vertices_inside_conflict_zone" is added in Regular_triangulation_3,  without documenting it)
 2010-12-10 17:02:10 +00:00
Laurent Rineau 1caaf5665c - triangulate_half_hole was quadratic because std::list::size is a linear 
function (not with all compilers, but at least with g++-4.4).

I have a very nasty test case where list_edges.size is more than
700000. With a quadratic function, mmy cruncher computer was not even able
to insert *one* constraint in half a day.


- Remove also the unused variable vb, and the initialization of tempo
(which is re-initialized a second time later, without using its first
value).
 2010-11-23 11:07:42 +00:00
Andreas Fabri a9fc8fc464 Remove unused variable 2010-11-22 07:56:00 +00:00
Laurent Rineau 168d31b6d6 Commit that feature directly to trunk: 
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Triangulation_2::mirror_edge%28Edge%29
Code + manual + small test

Why directly to trunk: the patch is very low risk, I have ran the test
suite and the manual testsuite, and there is already a Triangulation_2
package in candidate packages (cannot have two candidates for one package).
 2010-11-16 17:27:06 +00:00
Laurent Rineau e90e28169a Apply the same patch as for Constrained_triangulation_2.h in revision 59626 
to Constrained_triangulation_plus_2.h:
  |------------------------------------------------------------------------
  |r59626 | lrineau | 2010-11-10 19:42:53 +0100 (Wed, 10 Nov 2010) | 3 lines
  |
  |Fix an infinite loop in CDT<EPIC, TDS, Exact_predicates_tag>
  |Add a test, that know passes, and previously failed.
  |
  |------------------------------------------------------------------------
 2010-11-12 10:39:22 +00:00
Laurent Rineau 8aaa43a8eb Cosmetic: minimize the diff between 
Constrained_triangulation_2::insert_constraint 
    and
  Constrained_triangulation_plus_2::insert_subconstraint

(Add a comment, adjust the whitespace)
 2010-11-12 10:26:33 +00:00
Laurent Rineau ecfd82e287 Fix an infinite loop in CDT<EPIC, TDS, Exact_predicates_tag> 
Add a test, that know passes, and previously failed.
 2010-11-10 18:42:53 +00:00
Laurent Rineau ea084037e3 Revert those commits: 
| ------------------------------------------------------------------------
  | r59165 | afabri | 2010-10-11 15:27:39 +0200 (Mon, 11 Oct 2010) | 1 line
  | Changed paths:
  |    M /trunk/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xy_3.h
  |    M /trunk/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xz_3.h
  |    M /trunk/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_yz_3.h
  | 
  | Use the renamed class which now is in the Kernel package
  | ------------------------------------------------------------------------
  | r59159 | afabri | 2010-10-11 15:14:31 +0200 (Mon, 11 Oct 2010) | 1 line
  | Changed paths:
  |    D /trunk/Triangulation_2/include/CGAL/internal/Triangulation_euclidean_traits_projected_3.h
  | 
  | Move implementation of Projection_traits from Triangulation_2 to Kernel
  | ------------------------------------------------------------------------
Now the work is in a branch.
 2010-11-04 11:04:12 +00:00
Laurent Rineau 3b66f50862 Make operator<< of Weighted_point compatible with the pretty-mode (of 
CGAL::set_pretty_mode).
 2010-10-14 13:52:18 +00:00
Andreas Fabri ef9882a4e4 Use the renamed class which now is in the Kernel package 2010-10-11 13:27:39 +00:00
Andreas Fabri 335fd1825f Move implementation of Projection_traits from Triangulation_2 to Kernel 2010-10-11 13:14:31 +00:00
Sébastien Loriot 5bde754940 remove warnings 2010-07-15 09:14:09 +00:00
Olivier Devillers 974a5380d0 restore the old removal procedure for removal in Delaunay triangulation 
if degree of removed point is > 7

The fast removal is still effective since the
specialized functions for degrees 3,4,5,6, and 7 are used.

Differences in benchmarks for high degrees between old and new was not
big anyway.
 2010-07-15 07:51:12 +00:00
Sébastien Loriot acd9a77bf7 add missing requirements to be used with natural_neighbor_coordinates_2 2010-07-05 10:07:39 +00:00
Sylvain Pion 049a45f32f Remove useless default and copy ctors, and assignment operator. 2010-06-29 14:55:59 +00:00
Laurent Rineau 7254994bc3 Fix a warning (base class must be initialized). 2010-06-29 12:34:53 +00:00
Sébastien Loriot 5767088b4f merge from branches/experimental-packages/Triangulation_2_new_projection_traits: 
-factorization of projection trait classes into an internal trait class
-add missing functors to Triangulation_euclidean_traits_XX_3 required by CDT with intersections.
 2010-06-24 15:34:38 +00:00
Laurent Rineau 7a8b79aa18 Merged revisions 57043-57044,57048,57055,57059,57069,57071 via svnmerge from 
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r57043 | sloriot | 2010-06-24 09:56:01 +0200 (Thu, 24 Jun 2010) | 3 lines
  
  bug fix: missing Compare_distance in Triangulation_euclidean_traits_XX_3.h
........
  r57044 | sloriot | 2010-06-24 10:04:32 +0200 (Thu, 24 Jun 2010) | 2 lines
  
  update CHANGES
........
  r57048 | sloriot | 2010-06-24 10:45:57 +0200 (Thu, 24 Jun 2010) | 2 lines
  
  add missing const (thx Sylvain)
........
  r57055 | sloriot | 2010-06-24 11:43:38 +0200 (Thu, 24 Jun 2010) | 2 lines
  
  update doc
........
  r57059 | lrineau | 2010-06-24 14:13:53 +0200 (Thu, 24 Jun 2010) | 2 lines
  
  Yet another typo. I hope this it the last one.
........
  r57069 | lrineau | 2010-06-24 17:12:43 +0200 (Thu, 24 Jun 2010) | 2 lines
  
  cmake 2.8rc3 is published.
........
  r57071 | lrineau | 2010-06-24 17:20:21 +0200 (Thu, 24 Jun 2010) | 2 lines
  
  Fix yet another typo about CGAL_AUTO_?LINK_(GMP|MPFR)... :-(
........
 2010-06-24 15:22:12 +00:00
Andreas Fabri 4d5300f583 Finally use ptrdiff_t as return type for insert(beg, end) 2010-06-23 13:29:04 +00:00
Andreas Fabri 9eb297b9e6 Integer32 -> size_t 2010-06-22 20:44:46 +00:00
Andreas Fabri 3bdbbd1404 As the insertion of points in a regular triangulation can reduce the number of vertices we have to replace size_t with ptrdiff_t (Thank you Sylvain for pointing this out) 2010-06-21 16:12:59 +00:00
Andreas Fabri 8e75125383 int -> size_type/std::size_t 2010-06-21 13:19:03 +00:00
Sébastien Loriot 29acae75e0 correct bug: 
could not call points_begin() with regular_triangulation
 2010-06-14 13:49:28 +00:00
Sébastien Loriot 52317dd49f add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE 
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
 2010-06-09 07:37:13 +00:00
Sébastien Loriot 5d2ee0dc70 add missing using push_back 
(was unable to call push_back(Constraint) defined in base class)
 2010-06-08 11:25:58 +00:00
Olivier Devillers 8948095088 adding this-> 2010-06-01 07:29:36 +00:00
Olivier Devillers 9778b2d9a2 remove warning unused variable 2010-05-31 10:05:12 +00:00
Olivier Devillers 49d210b07d fixing missing this-> 2010-05-31 09:56:00 +00:00