Commit Graph

757 Commits

Author SHA1 Message Date
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