Commit Graph

958 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 1f34ef2b2d Add Construct_point_2/3 to the concepts of triangulation traits
-- TriangulationTraits_2 requires Point_2 construct_point_2(Point_2)
-- RegularTriangulationTraits_2 requires Point_2 construct_point_2(Weighted_point_2)
-- TriangulationTraits_3 requires Point_3 construct_point_3(Point_3)
-- RegularTriangulationTraits_3 requires Point_3 construct_point_3(Weighted_point_3)
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 6e89b7fb63 Triangulation_2 test traits must define Construct_point_2 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é d6efc61ddd Trimmed Regular triangulation euclidean traits (doc version)
Now that the traits is exactly the kernel, there isn't a big need for a lot of
documentation.
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
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
Laurent Rineau c754fc70d2 Merge pull request #2046 from MaelRL/Kernel-Fix_weighted_point-GF
Improve the implementation of weighted_point_23
2017-05-09 12:08:05 +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
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é ef17853876 Minor documenation fixes 2017-04-07 03:46:05 +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
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 0270ec473a Merge pull request #1255 from afabri/CGAL-license_check-GF
Add a license check mechanism
2017-01-25 17:14:55 +01:00
Andreas Fabri 9dbfffc996 Triangulation_2: Add an example that combines Projection_traits and vertex_with_info 2017-01-23 09:18:39 +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