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
e96f05f31b
Fixed Bare_point / Weighted_point usage in Triangulation_2
2017-06-28 10:14:35 +02:00
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
22bd3538a0
Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits
2017-06-28 10:14:35 +02:00
f0ec03218d
using type from the base class
2017-06-28 10:14:35 +02:00
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
83b0d24df8
make it work for the triangulation hierarchy with regular
2017-06-28 10:14:35 +02:00
d73be575f5
Do in 2D what we did in 3D
2017-06-28 10:14:35 +02:00
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
1fc06e0550
add missing include directive to use CGAL::to_double()
2017-06-26 07:06:20 +02:00
c7bd6a7403
Include licence check header
2017-06-23 10:41:05 +02:00
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
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
98800d2de8
Fixed regular triangulation capitalization across CGAL
2017-06-15 10:34:15 +02:00
8fbe17c080
Fixed minor mistakes from a rebase
2017-06-15 10:34:15 +02:00
9872edfe93
Fixed wrong template type (which induced taking references of references)
2017-06-15 10:34:15 +02:00
8ad34307ad
Fixed Has_nested_type_Bare_point includes
2017-06-15 10:34:15 +02:00
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
d26954a341
Projection traits must define Construct_point_2 and Construct_weighted_point_2
2017-06-15 10:34:15 +02:00
c210c4d9b8
Fixed point type in the line face circulator 2
2017-06-15 10:34:15 +02:00
f2eeffcc15
Changed some output from french to english
2017-06-15 10:34:15 +02:00
357ca0bc1b
Fixed Triangulation_2's spatial_sorts on weighted points
2017-06-15 10:34:15 +02:00
c1a6bf0849
Triangulation_2's point type is deduced from the TDS::Vb, not from the traits
2017-06-15 10:34:15 +02:00
a97db4fe62
Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2
2017-06-15 10:34:15 +02:00
09d4a3e8dc
Removed useless class Regular_traits_adaptor_2.h
2017-06-15 10:34:15 +02:00
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
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
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
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
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
89d095d683
Fixed Bare_point / Weighted_point usage in Triangulation_2
2017-06-15 10:32:03 +02:00
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
a0153d77ce
Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits
2017-06-15 10:32:03 +02:00
5a3fe64d71
using type from the base class
2017-06-15 10:32:03 +02:00
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
2b2de1bf22
make it work for the triangulation hierarchy with regular
2017-06-15 10:29:26 +02:00
21395c7d5e
Do in 2D what we did in 3D
2017-06-15 10:29:26 +02:00
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
5f1ba08d52
Fixed minor mistakes from a rebase
2017-06-08 13:23:10 +02:00
42469ac33a
Fixed wrong template type (which induced taking references of references)
2017-06-08 13:23:10 +02:00
e861cc0f61
Fixed Has_nested_type_Bare_point includes
2017-06-08 13:23:10 +02:00
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
f54ec34d1a
Projection traits must define Construct_point_2 and Construct_weighted_point_2
2017-06-08 13:23:10 +02:00
be154515fc
Fixed point type in the line face circulator 2
2017-06-08 13:23:10 +02:00
0181e353dd
Changed some output from french to english
2017-06-08 13:23:10 +02:00
a45325a20e
Fixed Triangulation_2's spatial_sorts on weighted points
2017-06-08 13:23:10 +02:00
50670b1303
Triangulation_2's point type is deduced from the TDS::Vb, not from the traits
2017-06-08 13:23:10 +02:00
3a48794d5c
Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2
2017-06-08 13:23:10 +02:00
a54d9c9148
Removed useless class Regular_traits_adaptor_2.h
2017-06-08 13:23:10 +02:00
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
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
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
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
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
4baa9531c1
Fixed Bare_point / Weighted_point usage in Triangulation_2
2017-06-08 13:23:10 +02:00
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
f5d617f50c
Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits
2017-06-08 13:23:10 +02:00
4037d48fca
using type from the base class
2017-06-08 13:23:10 +02:00
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
92bf9ffe2c
make it work for the triangulation hierarchy with regular
2017-06-08 13:23:10 +02:00
858e846b72
Do in 2D what we did in 3D
2017-06-08 13:23:10 +02:00
9b5f5be821
Fixed bad merge and removed the last include of Reg_tr_euclidean_traits_2
2017-05-24 14:08:23 +02:00
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
b65bfb3a4e
Fixed minor mistakes from a rebase
2017-05-22 11:27:02 +02:00
9debfdfd78
Fixed wrong template type (which induced taking references of references)
2017-05-22 11:27:02 +02:00
70e1ac97f6
Fixed Has_nested_type_Bare_point includes
2017-05-22 11:27:02 +02:00
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
1526241f91
Projection traits must define Construct_point_2 and Construct_weighted_point_2
2017-05-22 11:27:02 +02:00
a147bdfc13
Fixed point type in the line face circulator 2
2017-05-22 11:27:02 +02:00
c4277cca60
Changed some output from french to english
2017-05-22 11:27:02 +02:00
f55f6e2db9
Fixed Triangulation_2's spatial_sorts on weighted points
2017-05-22 11:27:02 +02:00
acc94726ec
Triangulation_2's point type is deduced from the TDS::Vb, not from the traits
2017-05-22 11:27:02 +02:00
a575f5a875
Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2
2017-05-22 11:27:02 +02:00
fb363681b7
Removed useless class Regular_traits_adaptor_2.h
2017-05-22 11:27:02 +02:00
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
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
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
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
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
ef262c9d24
Fixed Bare_point / Weighted_point usage in Triangulation_2
2017-05-22 11:20:45 +02:00
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
4f81c8c794
Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits
2017-05-22 11:20:45 +02:00
09f0be4418
using type from the base class
2017-05-22 11:20:45 +02:00
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
556d73819d
make it work for the triangulation hierarchy with regular
2017-05-22 11:20:45 +02:00
b621a425b5
Do in 2D what we did in 3D
2017-05-22 11:20:45 +02:00
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
0feb23ec43
Re-add <CGAL/config.h> to avoid a conflict with `master`
...
The `#include` was removed by error by:
73122ac202
2017-05-16 10:53:44 +02:00
424c01285d
Change comment to avoid warning
2017-05-16 10:19:54 +02:00
73122ac202
Change comment to avoid warning
2017-05-16 10:19:54 +02:00
0cd98e6ff1
Silenced depreciation warnings from Weighted_point.h
2017-05-16 10:17:41 +02:00
266775bafa
Silenced depreciation warnings from Regular_triangulation_euclidean_traits_23
2017-05-16 10:17:41 +02:00
cd2a562ffa
Fixed improper guards against the inclusion of deprecated headers
2017-05-16 10:17:41 +02:00
c353f0f49c
Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits
2017-05-16 10:17:41 +02:00
d07976b2ac
All triangulations now use Perturbation_order in tests using symbolic perturbations
2017-05-15 17:13:38 +02:00
9f865e87bb
Fixed wrong template type (which induced taking references of references)
2017-05-12 12:21:39 +02:00
46b489b2b5
Fixed Has_nested_type_Bare_point includes
2017-05-10 12:33:43 +02:00
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
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
57199b822b
Projection traits must define Construct_point_2 and Construct_weighted_point_2
2017-05-01 16:23:27 +02:00
869ab89553
Fixed point type in the line face circulator 2
2017-05-01 16:22:47 +02:00
d7680ad54b
Changed some output from french to english
2017-05-01 16:22:29 +02:00
6bbeee9186
Fixed Triangulation_2's spatial_sorts on weighted points
2017-05-01 16:21:34 +02:00
2a8d77882e
Triangulation_2's point type is deduced from the TDS::Vb, not from the traits
2017-05-01 16:20:29 +02:00
206247744b
Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2
2017-05-01 16:19:31 +02:00
fbbd583b79
Removed useless class Regular_traits_adaptor_2.h
2017-05-01 16:17:55 +02:00
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
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
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
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
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
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
33fab40dc0
Fixed Bare_point / Weighted_point usage in Triangulation_2
2017-04-14 16:53:18 +02:00
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
863584e863
Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits
2017-04-14 10:59:42 +02:00
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
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
8cbbe0e165
Remove dependencies of Triangulation_3 on Triangulation_2
2017-04-06 11:08:37 +02:00
e64884da90
Also add support for Regular_triangulation_2
2017-03-31 12:38:17 +02:00
3c6741feba
typename typename -> typename
2017-03-29 15:00:15 +02:00
a6d43f0a15
capitalize file name that gets included; fix typo
2017-03-24 08:44:18 +01:00
08eacf9d02
forward the types from the template parameter
2017-03-23 15:20:57 +01:00
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
3f0040ef63
Add types and property maps so that the triangulations become a model of FaceGraph
2017-03-23 14:26:51 +01:00
ba148d1dd8
Add types and property maps so that the triangulations become a model of FaceGraph
2017-03-23 12:51:04 +01:00
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
1e4bba379b
using type from the base class
2017-03-06 12:11:09 +01:00
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
9dd7b63e2a
make it work for the triangulation hierarchy with regular
2017-03-03 16:25:09 +01:00
f6cf296d5f
Do in 2D what we did in 3D
2017-03-03 15:32:24 +01:00
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
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
e50ae3c7bf
fix copy-paste bug
2017-01-18 15:29:35 +01:00
9ae7b37845
Merge pull request #1745 from sloriot/Polyhedra_corefinement-enhancements-sloriot
...
Add corefinement operations in PMP
2017-01-12 12:05:18 +01:00
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
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
a2a3daed85
capitalize
2016-12-30 10:48:16 +01:00
9fd4e03a0d
Use Prevent_deref
2016-12-29 14:06:04 +01:00
b4d1f8f0f7
Use Prevent_deref
2016-12-29 13:17:38 +01:00
b867150561
Use Prevent_deref
2016-12-29 13:12:00 +01:00
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
15b7f052da
remove an extra const
...
follow-up of dbafcaa0
2016-12-15 17:30:53 +01:00
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
b354b24270
Merge pull request #1712 from sloriot/CGAL-add_missing_include
...
add missing include directive
2016-12-02 11:37:08 +01:00
5b61aa18a8
workaroung a bug in g++ 4.4
2016-11-30 08:49:19 +01:00
2ab268965f
LCC for CMap and GMap; incremental builder; save and load; test.
2016-11-29 11:43:36 +01:00
728bc98d37
add missing include directive
2016-11-22 16:23:22 +01:00
d624271315
Remove usage of Regular_triangulation_euclidean_traits_3
2016-11-21 16:43:40 +01:00
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
8b8c52cf7f
fix typos in the doc
...
Add boost::graph_traits for a TDS_2
2016-11-18 09:41:40 +01:00
490949efa7
fix Interpolation package
2016-11-16 09:58:23 +01:00
e87351e51a
A typname too much
2016-11-16 08:20:44 +01:00
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
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
66ed20d389
fix typo
2016-11-03 14:53:54 +01:00
ad9d2c369c
Rename tests following Olivier's recommendations
2016-11-03 14:53:54 +01:00
537bdc00de
Reintroduce Regular_triangulation_filtered_traits_2
2016-11-03 13:10:27 +01:00
0ec908b981
Why does g++ need the this-> here ???
2016-11-03 13:10:00 +01:00
44d0fa4d6f
fix the 2D triangulations
2016-11-03 13:08:31 +01:00
9dde08c414
WIP
2016-11-03 13:07:50 +01:00
bbfb20d3c3
and remove the file where the content was moved before
2016-11-03 13:07:50 +01:00
7d35bb0a8b
First move the C2 and H2 pedicate and construction files operating on the RT
2016-11-03 13:07:50 +01:00
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
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
c826500c7d
Merge pull request #1551 from mglisse/Number_types-gmpxx_coercion-glisse
...
Misc GMPXX fixes
2016-10-20 09:47:39 +02:00
76d751be01
Use CGAL_FALLTHROUGH
2016-10-17 13:45:42 +02:00
89242f2687
When the dimension is 0, we can only have 0 or 1 vertices
2016-10-17 13:45:42 +02:00
aac821a61d
Deal with an empty range as input
2016-10-15 08:18:01 +02:00
60806b035b
Specify the number type, for expression templates.
2016-10-13 08:49:22 +02:00
cf719f65cd
intialize to avoid warning with -Wall on CentOS6-CXX11-Boost157_?
2016-10-12 09:15:56 +02:00
223c1cf5a4
Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
...
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
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
cf8c1a6cdf
Dispatch import functions to Polyhedron, T2, T3
2016-09-30 15:23:15 +02:00
1aefb3b0f3
include <CGAL/config.h>, not <CGAL/basic.h>
2016-09-30 15:23:14 +02:00
51f5697d3d
Add missing #include
2016-09-30 15:23:14 +02:00
7ff83d1b8c
dispatch files to the appropriate package: T2,Polyhedro,HDS
2016-09-30 15:23:14 +02:00
dda0c4f29b
Fix package Triangulation_3: include headers
2016-09-30 15:22:29 +02:00
40e9c6f735
Move specializations of graph_traits the packages that are concerned
2016-09-30 15:22:29 +02:00
91c6426ae2
Move info_check from T3 to T2
2016-09-30 15:22:28 +02:00
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
e2d04e54e0
Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch'
...
> 3176b37#1452 from mglisse/Number_types-Eigen_Literal-glisse
> 1705702#1417 from afabri/Polyline_simplification-Bugfix_choose_correct_Itag-GF
> 3bef239#1462 from sloriot/PMP-add_missing_include
2016-09-15 17:25:20 +02:00
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
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
ef00da9bc8
remove commented code
2016-09-06 23:04:58 +02:00
77f2f7f992
Use transform_iterator
2016-09-06 18:43:56 +02:00
835605a06d
Do not include a header file that is not used
2016-09-06 18:10:24 +02:00
791c385a3a
fix polyline simplification
2016-08-23 11:30:21 +02:00
784c1b82f3
fix polyline simplification
2016-08-14 17:20:56 +02:00
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
c9e1f30df1
add missing traits to avoid using the default constructed one
2016-06-29 09:41:22 +02:00
96f0f39113
Updates the CDT constructors, the tests and the doc.
2016-06-07 17:40:26 +02:00
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
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
f1be63c5d9
add deprecation warnings for the former header
2016-05-04 17:09:22 +02:00
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
db4c17ad68
fixes after Sebastien's remarks
2016-04-25 16:05:28 +02:00
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
7f6550a48d
Remove the xy_3 traits classes; Deprecate Triangulation_euclidean_traits_2
2016-04-12 17:38:25 +02:00
6d72405658
Simplify Constrained_delaunay_triangulation_2
2016-04-01 12:58:59 +02:00
9776c053d6
simplify template parameters, Add _ postfix to Itag (thank you Marc)
2016-03-31 13:09:54 +02:00
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
31dae1898f
Just Default as default does not compile, so we put the 'real' default types
2016-03-23 16:51:13 +01:00
7a0c53496d
Mention Default in the ref manual
2016-03-23 12:43:17 +01:00
47090906f0
Introduce CGAL::Default for the TDS of constrained triangulations
2016-03-23 10:27:39 +01:00
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
d5a5e6abe8
Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch'
2016-02-24 18:57:43 +01:00
9b4714a684
protect against inserting a zero length constraint (that is what is documented)
2016-02-23 12:58:27 +01:00
beb1417477
remove unused header files; remove commented includes; changed include paths
2016-02-15 14:20:12 +01:00
d019207e81
Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch'
2016-01-20 16:46:29 +01:00
4a697500be
Use std::set in case of VC++ and boost 1.55
2016-01-18 09:28:40 +01:00
94fb95118a
Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch'
2016-01-08 13:57:57 +01:00
b3b700dee8
switch to boost::container::flat_set
2016-01-06 15:13:57 +01:00
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
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
4d324c704f
Move Triangulation_structural_filtering_traits and specialize in Epic and Epec headers
2015-12-31 09:17:18 +01:00
4fec754ef8
put static into the macro and rename it
2015-12-02 20:40:15 +01:00
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
37677ededc
cleanup: reinsert the repetitive code that was temporarily in a repetitively included .h
2015-11-19 09:08:02 +01:00
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
6b2c4dd7c6
Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF
2015-11-09 14:26:42 +01:00
948651d961
Merge branch 'releases/CGAL-4.7-branch'
2015-10-27 08:59:20 +01:00
7e3fe6c776
fix a warning
2015-10-27 08:58:49 +01:00
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
31e8415983
Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF
2015-10-01 14:51:09 +02:00
1a4faa8575
Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF
2015-10-01 10:03:04 +02:00
3d4a1be429
WIP with Clement
2015-10-01 09:47:47 +02:00
cf1c0ea0ca
Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin
2015-10-01 09:12:55 +02:00
cdfc7f1c31
Merge branch 'old/CGAL-split_packages-GF' into CGAL-split_packages-GF
2015-09-23 10:08:41 +02:00
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
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
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
22beee18a6
Merge remote-tracking branch 'cgal-dev/Triangulation_2-uninitialized_warning-GF'
2015-09-11 08:39:33 +02:00
3cee140708
fix warning about uninitialized hcl and cleaner assertion code
2015-09-10 10:54:37 +02:00
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
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
3175ad74d4
add missing ref
2015-09-08 16:33:39 +02:00
21b5f653f6
avoid copying lists
2015-09-07 21:14:53 +02:00
220651bc88
Use CGAL_THREAD_LOCAL as thread_local only comes with VC201
2015-09-04 18:09:50 +02:00
847efcd2b4
fix typo
2015-08-28 11:00:56 +02:00
1e2ff1131e
assert -> CGAL_assertion
2015-08-27 16:51:55 +02:00
e9df6fa6cf
fix typo
2015-08-25 21:54:38 +02:00
91543fd382
move header files to TDS_2 and TDS_3
2015-08-23 15:36:12 +02:00
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
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
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
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
c80a9aaa6c
Fix a bug in CDT_plus_2
...
Fix issue #122
2015-06-17 18:52:30 +02:00
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
1faf51b7b1
remove useless include
2015-05-19 09:04:27 +02:00
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
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
8f9332324a
Smaller, faster code
2015-05-18 14:22:38 +02:00
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
2e13efa16e
Fix Triangulation_2 projection traits with arbitrary plane
2015-05-08 17:49:49 +02:00
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
9c78897ba5
Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin
2015-03-16 14:00:43 +01:00
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
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
9453a6710e
rename file
2015-01-07 14:23:40 +01:00
913539c006
mv new code of Constrained_triangulation_plus_2
2015-01-07 14:15:19 +01:00
bbdc196034
remove old code of Constrained_triangulation_plus_2
2015-01-07 14:14:48 +01:00
766673bd8c
resolve merge conflicts
2014-12-22 17:46:59 +01:00
87db2e1163
add license header, description.txt
2014-12-22 15:00:38 +01:00
9f6807b005
Add Tds_2::collapse_edge()
2014-12-18 08:25:57 +01:00
be5cf9eb5a
put a unused variable in assertion code
2014-12-16 16:16:50 +01:00
ca9e8d4948
achieve backwardcompatibility to the code not to the documentation
2014-12-12 17:28:44 +01:00
7d8f9ebe95
get rid of warnings
2014-12-11 12:55:57 +01:00
af996380a0
make Constraint_id backward compatible with the documentation
2014-12-08 12:00:57 +01:00
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 49404f75f57cb640d05d
2014-12-04 15:19:22 +01:00
b1532991e5
int -> size_t
2014-11-30 18:43:38 +01:00
e31df9644b
fix compilation for Linux
2014-11-24 15:03:07 +01:00
0be3dd708b
cleaning
2014-11-21 11:23:53 +01:00
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
70502effac
change Subconstraint_iterator to ensure backward compatibility
2014-11-14 12:21:24 +01:00
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
d4af8c8d48
change Constraint_id to ensure backward compatibility
2014-11-14 11:58:43 +01:00
bd0917d7a9
little cleaning
2014-11-13 17:20:21 +01:00
e02773efd1
move files about sizing, and change template parameter. Geom_traits is enough
2014-11-12 15:42:27 +01:00
e24ea9175a
fix bug : we should not have 2 default constructed rays in every CVD cell
2014-11-07 14:08:57 +01:00
b29a041c00
fix functions that tag faces as blind
2014-11-06 16:03:17 +01:00
0e535324f0
cleanup
2014-11-06 15:50:05 +01:00
7074432e56
draw vertices smaller and in black
2014-11-06 14:41:00 +01:00
c593ee59ba
Be more precise in case of degenerate polyline constraints (length 0,1; identical points)
2014-11-05 17:13:19 +01:00
42d04ea13f
take into account Jane's review
2014-11-04 12:24:12 +01:00
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
84ca2d460b
add functionalities to CVD cells
2014-10-09 16:58:35 +02:00
2d007d3bf2
fix macro's name
2014-10-09 13:48:55 +02:00
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
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
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
17ca29713a
Add a forwarding function as we had to remove a using statement
2014-08-22 15:14:19 +02:00
ab7f0189bd
remove debug output
2014-08-22 15:13:32 +02:00
43b8390a70
Merge branch 'Triangulation_2-NewPolylineConstraint-GF-old' into Triangulation_2-NewPolylineConstraint-GF
2014-08-08 12:47:15 +02:00
9243e1eb69
Unify APIs: Add insertion of a polyline
2014-07-16 15:30:14 +02:00
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
eebad0e1a4
Add applications to help comparison between T2/T3 and Td
2014-06-16 19:35:04 +02:00
2c08831b35
add missing typename
2014-05-23 08:47:56 +02:00
c6bf236909
include header files where they are used
2014-05-22 14:49:38 +02:00
8423854c95
Add Constrained_Delaunay_triangulation_2::insert_constraint(PointIterator,PointIterator)
2014-05-21 18:25:27 +02:00
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
6b129f3ad0
unify API
2014-05-20 17:39:56 +02:00
2f967ba6e4
the testsuite for the new version of the Constrained_triangulation_plus_2 passes
2014-05-19 15:57:24 +02:00
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
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
85b29aed5f
treat merge conflicts
2014-05-15 16:09:24 +02:00
c5ae1d35a9
Merge branch 'Advancing_front_surface_reconstruction-afabri-old' into Advancing_front_surface_reconstruction-afabri
2014-03-26 12:55:58 +01:00
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
84d97f385d
add insert_constraints functions to Constrained_Delaunay_triangulation_2
2013-12-02 22:48:38 +01:00
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
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
650419f631
Trivial warning bug-fix for master (for CGAL-4.3)
2013-09-16 12:16:27 +02:00
5c454cec64
add missing includes
2013-09-13 12:43:01 +02:00
d93bc127db
Qualify call of derived function with this->
2013-09-13 12:42:37 +02:00
56d31513e6
fix incllude file. was not from the base class
2013-09-13 12:19:01 +02:00
121ada60a4
Function must not only be declared but also defined to avoid VC++ warning
2013-09-12 12:49:04 +02:00
22b0d44f4a
make the move function private to disable the inherited version
2013-08-02 07:52:09 +02:00
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
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
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
404f2e0e3c
merge
2013-06-21 10:01:19 +01:00
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
bb7f025512
more permissive copy_tds for compatible vertex types with the same point type
2013-04-19 08:44:45 +02:00
76a386bd18
make polylines.cpp work with EPEK
2013-04-17 09:38:23 +02:00
e4306a0d3d
fixed -> unremovable; fixed is no longer used in Polyline_constrained_trioangulation
2013-04-16 16:01:09 +02:00
94567d8745
wip
2013-04-16 15:09:05 +02:00
80ef57d590
rename class
2013-04-16 12:46:34 +02:00
62fcc226b8
add a method to insert a range of points with info in cdt
2013-04-16 07:37:51 +02:00
a9275d1a5b
add default value for start of inexact_locate
2013-04-12 14:48:10 +02:00
e023f42a51
make inexact_locate public also in Triangulation_2
2013-04-12 14:32:16 +02:00
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
2143378f58
remove a warning and simplify the implementation
2013-04-09 19:33:47 +02:00
5e08e87d3d
Make the example more interesting.
...
Fix const correctness.
Fix the Subconstraint_iterator.
Improve the manual.
2013-04-03 15:28:46 +02:00
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
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
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
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
67226de083
use CGAL::compare instead of compare to avoid Koenig lookup
2013-03-15 16:25:05 +01:00
950e858555
remove unused parameters
2013-03-12 09:50:46 +01:00
1ee52525ab
No need for the hierarchy. Makes it simpler and faster
2013-03-07 17:44:31 +01:00
e7900a02a3
made two private functions public, so that we can modify a TDS_2
2013-03-06 18:08:37 +01:00
ef37a934a6
Fix warning "_ri may be used uninitialized"
2013-02-27 19:35:56 +01:00
403031ce7f
Fix warnings
2013-02-27 18:21:24 +01:00
c7e68385be
remove unused variables and #if 0 buggy non used code
2013-02-26 16:52:55 +01:00
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
66c5d23154
Use CGAL_assume to remove warnings
2013-02-20 18:55:43 +01:00
e9e31dc6f3
remove unused file
2013-02-19 13:57:41 +01:00
2740aa9c05
use size_type instead of int
2013-02-07 15:16:03 +01:00
c6dd56cf0f
suppress a warning. The hypothetical problem cannot occur
2013-02-07 15:15:27 +01:00
462ad57712
Remove a declaration without definition
2013-02-07 15:13:48 +01:00
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
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
0f34f2a89e
Merge branch 'Maintenance-include-less-boost-pmoeller'
2012-12-21 09:44:18 +01:00
41362b6b57
Merge branch 'triangulation_2-cstr_using_ranges'
2012-12-21 08:42:25 +01:00
84caad7137
using the regular triangulation filtered traits using flags in the kernel
2012-12-20 16:12:38 +01:00
59f9e8a778
add constructor from range for 2D Delaunay and Regular triangulation
2012-12-19 17:10:57 +01:00
09e42c760e
fix source vertex and face types
2012-12-19 10:52:56 +01:00
853c658a18
add copy_tds with converter in TDS2
2012-12-19 10:15:03 +01:00
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
96319a1365
reintegrate '^/branches/features/Triangulation_2_UseTraitsInHierarchy-GF'
2012-11-07 14:59:00 +00:00
ef81760b85
macro renaming
2012-11-02 08:58:21 +00:00
ef5b895a93
merge from next
2012-11-02 08:49:12 +00:00
6ff851e791
macro renaming
2012-11-02 08:44:08 +00:00
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
720244f8f8
apply the same choice as the one made in r73262 for CDT_2
2012-10-24 21:39:38 +00:00
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
a7b02bd716
merge experimental-packages/Triangulation_2-unrecursive
2012-10-24 09:26:32 +00:00
5c4ae5d477
windows mixes up Fb template parameter with nested Fb type from base class
2012-08-22 06:48:49 +00:00
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
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
3e750c6fd7
temporary hack to work around assertion
2012-07-17 12:08:49 +00:00
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
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
5f6b09c484
Fix types of loop counters to size_t.
2012-06-20 09:15:34 +00:00
19857458b6
deprecation warnings
2012-05-28 07:28:03 +00:00
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
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
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
bd81c4fe68
Minor copy&paste fix
2012-05-11 15:14:02 +00:00
af62f9848b
constness, insert pair<Point, Point>, Self typedef
2012-05-11 13:27:17 +00:00
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
918a6084ab
Node is now entirely encapsulated.
2012-05-10 14:26:46 +00:00
a2c0e017e3
Dropped the H_ prefix and purged some typedefs.
2012-05-10 13:53:43 +00:00
cfea03d54b
Dropped out-dated examples, simplify.cpp example compiles.
2012-05-10 13:35:00 +00:00
9464dccbb5
Clean up and Node conversions.
2012-05-10 09:51:09 +00:00
3c98b60509
Removed simplification from this package.
2012-05-09 15:38:28 +00:00
092f09e490
Replaces Squared_distance_cost with the version from the Triangulation_2 package.
2012-05-09 15:36:59 +00:00
57417b0050
Removed executable property.
2012-05-09 15:34:38 +00:00
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
9d91dcc2ef
proper naming
2012-05-04 16:24:30 +00:00
f43213905b
Removed unnecessary include.
2012-05-04 16:22:23 +00:00
328e59e04e
A vertex base for Polyline_constraint_hierarchy
2012-05-04 15:55:02 +00:00
da6f1be1d2
Typenamified constrained_triangulation, partially integrated skiplist
2012-05-04 13:39:22 +00:00
f9489d4dc5
insert_polyline ->insert_constraint
2012-05-03 15:10:34 +00:00
e2b039379b
Add remove_points_from_constraints
2012-04-26 11:36:13 +00:00
97949be7cb
Add remove_points_from_constraint
2012-04-26 11:31:04 +00:00
e650998cc3
code follows doc
2012-04-26 09:41:56 +00:00
bf657edffc
Duplicate and modify functions as they are more efficient
2012-04-20 22:31:23 +00:00
271f52dbd4
Add an error function for polyline simplification
2012-04-20 10:33:46 +00:00
c19ff964b2
Add files for Polyline_constrained_triangulation_2
2012-04-20 10:11:18 +00:00
c8c67ab24c
Add insert_constraint(Vertex_handle vaa, Vertex_handle vbb, OutputIterator out)
2012-04-20 10:10:08 +00:00
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
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
1eb0ad5c1b
optimize
2012-01-24 16:24:56 +00:00
8722c292d7
replace inexact_locate by has_inexact_negative_orientation
2012-01-24 09:45:13 +00:00
a7456a2736
merge from next
2012-01-16 15:28:51 +00:00
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
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
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
5b5dd33848
merge changes from next
2012-01-09 12:33:39 +00:00
eddf2131d6
merge from next
2011-12-30 11:09:29 +00:00
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
6ed56d75b5
merge from next
2011-10-25 15:48:02 +00:00
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
91a5327fa8
change LGPLv2 -> LGPLv3
2011-10-10 13:48:25 +00:00
ef043927fd
too conservative check removed, for fast removal in delaunay 2d
2011-09-06 15:21:27 +00:00
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
19b75ba29c
Remove unused lines
2011-04-12 10:08:00 +00:00
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
fc2e05e67d
Triangulation_2_projection_traits_3 is now a model of DelaunayMeshTraits_2.
2011-03-23 17:28:51 +00:00
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
3e04fb16fb
merge packages related to projection traits into the trunk.
2011-01-11 07:18:36 +00:00
5f674516b0
add precondition to dual functions to check that objects are from the triangulation.
2010-12-23 15:55:50 +00:00
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
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
a9fc8fc464
Remove unused variable
2010-11-22 07:56:00 +00:00
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
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
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
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
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
3b66f50862
Make operator<< of Weighted_point compatible with the pretty-mode (of
...
CGAL::set_pretty_mode).
2010-10-14 13:52:18 +00:00
ef9882a4e4
Use the renamed class which now is in the Kernel package
2010-10-11 13:27:39 +00:00
335fd1825f
Move implementation of Projection_traits from Triangulation_2 to Kernel
2010-10-11 13:14:31 +00:00
5bde754940
remove warnings
2010-07-15 09:14:09 +00:00
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
acd9a77bf7
add missing requirements to be used with natural_neighbor_coordinates_2
2010-07-05 10:07:39 +00:00
049a45f32f
Remove useless default and copy ctors, and assignment operator.
2010-06-29 14:55:59 +00:00
7254994bc3
Fix a warning (base class must be initialized).
2010-06-29 12:34:53 +00:00
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
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
4d5300f583
Finally use ptrdiff_t as return type for insert(beg, end)
2010-06-23 13:29:04 +00:00
9eb297b9e6
Integer32 -> size_t
2010-06-22 20:44:46 +00:00
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
8e75125383
int -> size_type/std::size_t
2010-06-21 13:19:03 +00:00
29acae75e0
correct bug:
...
could not call points_begin() with regular_triangulation
2010-06-14 13:49:28 +00:00
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
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
8948095088
adding this->
2010-06-01 07:29:36 +00:00
9778b2d9a2
remove warning unused variable
2010-05-31 10:05:12 +00:00
49d210b07d
fixing missing this->
2010-05-31 09:56:00 +00:00
d168a37440
Merge the branch /branches/candidate-packages/Triangulation_2
...
- Work from:
Pedro Machado Manhaes de Castro <Pedro.Machado@sophia.inria.fr>
Olivier Devillers <Olivier.Devillers@sophia.inria.fr>
- The work is:
- fast removal for Delaunay_2 (Olivier)
- displacement for 2D triangulation (Olivier and Pedro)
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Move_T2T3
2010-05-31 08:24:29 +00:00
75cc6f6057
Better C++ compliance (errors detected by Intel Compiler strict-ansi mode)
2010-05-08 10:07:13 +00:00
b6f7fc6b47
Add this-> for Ansi compliance (why not using??)
2010-05-07 12:48:44 +00:00
e91fc65a70
Add 'using' for strict ANSI compliance
2010-05-05 12:36:24 +00:00
d0ffd795ee
Add 'this->' for strict ANSI compliance
2010-05-04 11:35:23 +00:00
ec840a9cbf
add missing Using detected by intel compiler
2010-04-26 08:20:17 +00:00
ea5bd97d6d
removed code that I had added (face data)
2010-03-30 20:03:26 +00:00
0f863c0d69
moved Face_data code further down so as to use typenames that have been defined
2010-03-29 19:29:24 +00:00
7a633c5ed5
added additional data and methods for the in-place edge list
2010-03-29 19:17:25 +00:00
10d919fffd
added data associated with each face of the triangulation. Like TDS3 the
...
data are to be used when computing the conflict region of an object
(applies to segments and circles) instead of using an std::map for
faces. the code is inside an #ifdef/#endif block and is activated by
defining the macro: CGAL_TDS2_DATA
2010-03-16 14:11:11 +00:00
54a73ce38a
- Determinize the Constraint_hierarchy, to determinize Mesh_2 with
...
C_t_plus_2<CDT>.
- [documentation] Add something about the symbolic perturbation in
Delaunay_triangulation_2.tex
2010-03-16 11:03:14 +00:00
c2d00a4274
The perturbation must not be used in is_valid().
2010-03-11 09:40:53 +00:00
ee6850eb2a
Determinize Constraint_hierarchy_2.
2010-03-10 18:05:13 +00:00
c0524c9d24
Fix to Constrained_Delaunay_triangulation_2, after the following revision:
...
| ------------------------------------------------------------------------
| r54312 | afabri | 2010-02-25 16:29:19 +0100 (Thu, 25 Feb 2010) | 1 line
|
| Use a symbolic perturbation so that in the grid case all diagonals have the same orientation
| ------------------------------------------------------------------------
2010-03-10 16:34:43 +00:00
274143fa4d
- Fix the Mesh_2 test suite: previously it was no longer testing anything!
...
- Fix the handling of the cdt with the triangulation plus_2.
- Add tests with CDT_plus_2.
2010-03-09 15:25:12 +00:00
e3bc2bbf10
We used a functor not required by the traits class
2010-03-01 11:03:06 +00:00
cc383a42f5
missing typename
2010-02-26 07:25:29 +00:00
2ae72afd4d
Use a symbolic perturbation so that in the grid case all diagonals have the same orientation
2010-02-25 15:29:19 +00:00
6cae267c0f
Use the traits for comparing points, not ==
2010-02-02 13:26:07 +00:00
439ac1c864
iterators are handles
2010-02-01 14:35:40 +00:00
85dc12f2a7
Remove empty lines at beginning and end of files
...
(apply Scripts/developer_scripts/remove_empty_lines.pl).
2010-02-01 12:55:28 +00:00
2353094b9e
luckily Sylvain reads my commits, and luckily I switched from release to debug mode in my local testsuite
2010-01-27 16:04:42 +00:00
be700acaba
Change rng; Remove random_shuffle
2010-01-27 15:22:31 +00:00
038616e6d3
Partially revert r53691 from Andreas.
2010-01-20 15:13:34 +00:00
cda55de625
VC mixes up the local Ambient_dimension and CGAL::Ambient_dimension
2010-01-20 15:12:13 +00:00
30e969ccff
Weighted_point : add constructors from Cartesian coordinates (2D and 3D).
...
They hardcode weight=0 and do not provide room for an "hw" homogeneous
argument, in order to avoid any potential ambiguity.
2010-01-11 12:50:50 +00:00
98fe0b9439
Merged revisions 53426,53428 via svnmerge from
...
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.5-branch
........
r53426 | lrineau | 2009-12-15 16:14:57 +0100 (Tue, 15 Dec 2009) | 1 line
Merge from trunk revisions 53423-53425 (teillaud)
........
r53428 | lrineau | 2009-12-15 17:41:27 +0100 (Tue, 15 Dec 2009) | 5 lines
- Fix a bug in Constraint_hierarchy_2 (see the big comment inserted in the
code).
- Add a test in the testsuite, to assure that this bug will never be
reintroduced.
........
2009-12-15 16:58:02 +00:00
b1022ef45b
Result from:
...
svn merge
'^/branches/experimental-packages/Triangualtion_2-projection_traits/Triangulation_2@48316'
'^/branches/experimental-packages/Triangulation_2-projection_traits/Triangulation_2'
.
I have merged the Triangulation_2 part of the branch
experimental-packages/Triangulation_2-projection_traits into the trunk.
This adds two files (traits classes), and a small patch to
Contrained_triangulation_2 (pass geomtraits by const ref instead of a
copy).
T2 testsuite locally launched successfully.
2009-12-08 11:11:33 +00:00
14d46e3e5f
templatize Triangulation_line_face_circulator so that it can be used with other classes than CGAL::Triangulation_2
2009-11-16 20:05:44 +00:00
85c2848fa3
Make use of set_adjacency().
2009-11-02 23:02:16 +00:00
8dceee4164
Add include<CGAL/assertions.h> in *_assertion files.
2009-10-07 13:16:13 +00:00
770492c1c7
Use new version of script create_assertions.sh to generate *_assertions.h files.
...
Diffs are:
* #undef added
* in old files, (void)0 is replaced by static_cast<void>(0)
* in old files, lines as "# define CGAL_xxx_assertion 1" are added
* in point_set_processing_assertions.h, surface_mesh_parameterization_assertions.h, surface_reconstruction_points_assertions.h, "|| defined(CGAL_NDEBUG)" is replaced by "|| defined (NDEBUG)"
* protective macros (if any) are removed
* included files if any (<CGAL/assertions.h>, <CGAL/trace.h>) are removed
2009-10-07 07:49:44 +00:00
516f8d5eee
Same as revision 51948 on CGAL-3.5-branch :
...
Rename following the converging convention to prevent future incompatibility :
- Vertex_container -> Vertex_range
- Face_container -> Face_range
- Cell_container -> Cell_range
2009-09-15 17:12:03 +00:00
78e138ea32
clean-up move stuffs, since they are not documented yet
2009-09-03 11:44:12 +00:00
ec84ec13f7
orientation_2 -> orientation
2009-06-17 09:00:37 +00:00
17b9d16680
Add nearest_vertex() for Delaunay hierarchies.
2009-04-22 12:43:33 +00:00
c1ae415b18
Remove short name macros. See PR 1551.
2009-04-21 18:28:04 +00:00
6bcc8a8e5d
Document TDS::Face_container, Vertex_container, faces() and vertices().
...
(renamed from vertex_container() and face_container()).
2009-04-10 15:45:02 +00:00
5bf299c4a7
- Cleanup: use the global function and member functions of Line_3, Vector_3,
...
and so on, instead of using the functors of the kernel.
- Add a new class Triangulation_2_filtered_projection_traits_3
- Rename all classes Coplanar_* to Projected_*
2009-02-06 15:33:41 +00:00
e8394435df
Cleanup: remove everything that is not used or commented.
2009-02-05 12:43:48 +00:00
e3306db3d2
- Add <CGAL/Triangulation_2_projection_traits_3.h> (need to be polished a
...
bit)
- demo/Triangulation_2/Terrain/ now use that projection traits, with a
normal that can be changed interactively.
2009-02-04 22:56:45 +00:00
4aa1cb057a
Remove my email adress from header files.
2008-10-11 20:21:08 +00:00
474d133ae7
improves speed form water to whine in the average
2008-10-08 13:44:06 +00:00
eeb6c8982e
Fix "warning: array subscript is above array bounds".
2008-08-20 08:39:08 +00:00
26e0fde130
Fix a warning with g++-4.3.1 and "-O3 -Wall". I am not sure to know why
...
that fixes the warning. For the record, it was:
-------------------------------------------
Compiling linking_2d_and_3d ...
make[1]: Entering directory `/home/lrineau/CGAL/releases-and-testsuites/CGAL-3.4-I-407/test_i686_Linux-2.6_g++-4.3.1_CentOS-5.1-O3/Triangulation_3_Examples'
/usr/local/gcc43/bin/g++ -I../../include -Wall -frounding-math '-I/home/lrineau/CGAL/releases-and-testsuites/CGAL-3.4-I-407/include/CGAL/config/i686_Linux-2.6_g++-4.3.1_CentOS-5.1-O3' '-I/home/lrineau/CGAL/releases-and-testsuites/CGAL-3.4-I-407/include' -O3 -pipe -I/home/lrineau/CGAL/bimap -I/usr/lib/qt-3.3/include -DCGAL_USE_F2C -DCGAL_USE_F2C -c linking_2d_and_3d.cpp
../../include/CGAL/Compact_container.h: In member function 'typename CGAL::Triangulation_data_structure_2<Vb, Fb>::Vertex_handle CGAL::Triangulation_data_structure_2<Vb, Fb>::insert_dim_up(typename CGAL::Compact_container<typename Vb::Rebind_TDS<CGAL::Triangulation_data_structure_2<Vb, Fb> >::Other, CGAL::Default_argument>::iterator, bool) [with Vb = My_vertex_2<CGAL::Dummy_tds_3, CGAL::Triangulation_ds_vertex_base_2<void> >, Fb = CGAL::Triangulation_ds_face_base_2<void>]':
../../include/CGAL/Compact_container.h:772: warning: array subscript is above array bounds
/usr/local/gcc43/bin/g++ -o linking_2d_and_3d linking_2d_and_3d.o '-L/home/lrineau/CGAL/releases-and-testsuites/CGAL-3.4-I-407/lib/i686_Linux-2.6_g++-4.3.1_CentOS-5.1-O3' -L/usr/lib/qt-3.3/lib -Wl,-R/home/lrineau/CGAL/releases-and-testsuites/CGAL-3.4-I-407/lib/i686_Linux-2.6_g++-4.3.1_CentOS-5.1-O3:/usr/lib/qt-3.3/lib -lCGAL -lCGALcore++ -lCGALQt -lCGALimageIO -lCGALPDB -lqt-mt -llapack -lGL -lGLU -lblas -lz -lmpfr -lgmpxx -lgmp -lX11 -lboost_thread -lboost_program_options -lm
make[1]: Leaving directory `/home/lrineau/CGAL/releases-and-testsuites/CGAL-3.4-I-407/test_i686_Linux-2.6_g++-4.3.1_CentOS-5.1-O3/Triangulation_3_Examples'
Executing linking_2d_and_3d ...
-------------------------------------------
Maybe a gcc bug. Howerver, with that patch, the code seems easier to read
(the variable that contains the dimension is now named "dim", instead of
"i", and is filled as soon as the dimension() of the triangulation is
updated).
2008-08-18 14:59:24 +00:00
24699dda52
Add missing header <CGAL/utility.h>
2008-07-27 11:32:19 +00:00
79864c0c8e
Remove Arity_tag.
2008-07-22 12:29:01 +00:00
5ee8c389fb
Use Kernel_traits.
2008-07-17 08:34:39 +00:00
bf1614bfa1
Use the new kernel typedefs K::Comparison_result and co.
2008-07-17 08:10:22 +00:00
2eb0d8f9e9
certainly() -> possibly().
2008-07-14 11:16:41 +00:00
eff6efd3af
CGAL_NULL and CGAL_NULL_TYPE are now constant macros, so replace them by:
...
- CGAL_NULL -> NULL
- CGAL_NULL_TYPE -> CGAL::Nullptr_t (typedef to const void *)
2008-07-12 21:58:52 +00:00
9d7a609ff2
Make assertions trigger an error only for *certain* conditions (using CGAL::certainly()).
...
This is useful for interval arithmetic code.
(replay of r44002 with the header order hopefully fixed)
2008-07-10 21:49:17 +00:00
2b4ebf01f7
Undo r44002 as it's buggy
2008-07-06 20:47:29 +00:00
514a17ad4f
Improve the interaction of assertions and interval computations.
...
Things like "CGAL_assertion(denominator != 0)" produced assertion failures for no gain.
So now, the assertion is triggered only if the condition is certain, using CGAL::certainly().
That is, change the following in all assertion files :
((EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
to :
(CGAL::certainly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
2008-07-06 17:05:47 +00:00
488775954d
In Constrained_triangulation_plus_2, rename the method "copy" into
...
"copy_triangulation", so that the operator= of
Triangulation_hierarchy_2<Constrained_triangulation_plus_2<...>> can do the
right job.
2008-06-27 15:51:48 +00:00
1d8779b171
Rename the following functions:
...
det2x2_by_formula
det3x3_by_formula
det4x4_by_formula
det5x5_by_formula
det6x6_by_formula
to:
determinant
How cute... a name independent of the dimension, and even readable !
2008-04-09 13:35:34 +00:00
b0f2c77fdc
Remove casts to Oriented_side.
...
They are useless since we merged the various enum types.
2008-04-09 12:35:10 +00:00
b740e90de0
Rename the following functions:
...
sign_of_determinant2x2
sign_of_determinant3x3
sign_of_determinant4x4
sign_of_determinant5x5
sign_of_determinant6x6
to:
sign_of_determinant
So that we have less dimension-dependent namings, at least internally...
2008-04-09 12:20:25 +00:00
c3ee0c0087
Remove CGAL_T2_USE_ITERATOR_AS_HANDLE and CGAL_T3_USE_ITERATOR_AS_HANDLE
...
as they are now always defined and things work.
2008-04-03 12:14:58 +00:00
44f0158408
A small precondition
2008-03-31 17:33:48 +00:00
64ae70e699
convex hull do not matter (even in this case) + little optimization
2008-03-21 15:32:54 +00:00
1d47b96e3c
Remove more useless enum_cast<>.
2008-03-20 16:46:25 +00:00
55b1c90e6b
little optimization
2008-03-14 12:46:43 +00:00
c50c75af92
little optimization for vertices of degree 3
2008-03-13 12:31:52 +00:00
960f122b28
Optimizing move()
2008-03-10 11:07:15 +00:00
606f62f2e4
Optimizing move()
2008-03-10 11:06:44 +00:00
5924c97751
well_oriented() feets better in Triangulation_2.h
2008-03-06 12:05:36 +00:00
927812ecad
(not yet)
2008-03-05 15:38:33 +00:00
1f8b9028ab
trfixing
2008-03-05 15:20:46 +00:00
879235ee1c
Optimization on move() (that works only for Triangulation_2)
2008-02-28 16:00:38 +00:00
8e40af475e
Flexibility
2008-02-26 15:38:19 +00:00
a02fa7d3b5
flexibility
2008-02-26 15:37:55 +00:00
a79f32b497
fixing move(It, It)
2008-02-22 14:05:30 +00:00
418185aa44
fixing move(It, It)
2008-02-22 14:05:01 +00:00
8c07487188
Adding a method that moves a vertex from its coordinate to another one given by an arg. point. Also including a method that moves a set of points by giving a list of pairs (Vertex, Point).
2008-02-20 13:10:05 +00:00
2cc11539f5
Adding a method that moves a vertex from its place to another one located at the arg. point coordinate. Also including a version that moves a set of points, giving a list of (vertex_handle, point).
2008-02-20 13:05:56 +00:00
55c65d6efc
Adding a method that changes the dimension of the data structure from 2D to 1D.
2008-02-20 13:03:58 +00:00
ef6370cf40
Retrivied from version 42050 and fixed the bug
2008-02-08 10:20:17 +00:00
fcbf9fb2ff
Bug fix: overload the finite_vertex function
2008-02-08 09:23:00 +00:00
6a9740d043
Remove obsolete workarounds for __sgi.
2008-01-20 23:09:58 +00:00
d437e38edf
Remove comment about Borland, it's nice to have the Rebind here anyway.
2008-01-20 22:47:22 +00:00
7f21002a5a
Remove comment about Borland. It's nice to have the Rebind here anyway.
2008-01-20 22:46:28 +00:00
eb945bae48
SUNPRO workaround not needed anymore
2008-01-20 20:47:32 +00:00
9d1a94c894
Remove unused/bitrotten sweep algorithm
...
(was only used by the obsolete leda-window demo which I just removed).
2008-01-12 16:07:55 +00:00
687b1a97f1
Add preconditions in set_neighbor() that a face is not the neighbor of itself.
2008-01-10 22:39:55 +00:00
b10d06a9f3
Get rid of obsolete Window_stream (LEDA window) code.
2008-01-10 17:47:25 +00:00
484dd113ce
Fix bug in split_vertex() reported by Richard Maierhofer.
2008-01-08 20:47:51 +00:00
c2651f99e7
Get rid of CGAL_REP_CLASS_DEFINED
2008-01-03 18:49:18 +00:00
88ed563f44
Remove some workarounds for SunPRO + RW's STL:
...
CGAL_CFG_MISSING_TEMPLATE_VECTOR_CONSTRUCTORS_BUG
CGAL_CFG_RWSTD_NO_MEMBER_TEMPLATES (partially so far)
CGAL_make_vector
CGAL_make_list
2008-01-03 14:50:13 +00:00
ea0b9ea02b
Disable short name macros for T2 and T3 to see if they are
...
still really needed.
2007-12-30 23:54:19 +00:00
d49e006c53
Remove default argument "0" to calls to assertion_fail() et al,
...
as the default is now the empty string "".
It should fix the problem that we have lost the assertion messages
(seeing "what(): basic_string::_S_construct NULL not valid" instead),
for packages that use package-specific assertion macros.
2007-12-21 21:58:27 +00:00
cccd5229ab
fixed the include statement.
2007-12-07 13:14:48 +00:00
c1692c50bf
Let's see what happens when VC++ uses iterators as handles
2007-11-08 10:25:52 +00:00
fdeedcf8b0
some low level code cleanup. renamed
...
* CGAL_error to CGAL_error_msg
* introduced a macro CGAL_error()
* added some words about CGAL_error to the developers manual
* renamed most of assert(x) into CGAL_assertion(x)
* renamed exit(x) with x != 0 , CGAL_assertion(false) and assert(false) into CGAL_error
* CORE left untouched, OpenNL changed
2007-11-07 16:51:18 +00:00
d3c7269dba
Replace abort() by assertion (in commented code).
2007-11-05 10:09:02 +00:00
ef264999b3
Renaming of Compact_container's construct_insert() to emplace() to match C++0x.
...
It breaks backward compat, but I doubt many people use Compact_container directly.
Make it use variadic templates, while at it.
2007-10-20 20:51:59 +00:00
a25c35c992
Add declaration of Regular_triangulation_filtered_traits_2 to prevent problems
...
due to cyclic dependency.
2007-10-03 14:13:50 +00:00
cfa52e21ed
Update following renaming EK -> Exact_kernel and FK -> Approximate_kernel.
2007-09-07 09:47:42 +00:00
3feac5dc4c
Faster insert for iterator ranges in Triangulation_hierarchy_2.
2007-09-05 13:57:52 +00:00
76408cc24f
Remove obsolete config flag CGAL_CFG_USING_BASE_MEMBER_BUG_3.
2007-08-09 09:48:44 +00:00
Mael Rouxel-Labbé
Sébastien Loriot
Andreas Fabri
Laurent Rineau
Clement Jamin
Guillaume Damiand
Jane Tournois
Marc Glisse
Maxime Gimeno
Sebastien Loriot
Philipp Möller
Laurent Rineau
Philipp Möller
Menelaos Karavelas
Olivier Devillers
Sylvain Pion
Stéphane Tayeb
Pedro Machado Manhaes de Castro
Trung Nguyen
Mariette Yvinec
Andreas Meyer
Christophe Delage