Andreas Fabri
787d46ffb8
Disable Point_3(const Weighted_point_3&)
2017-06-28 10:14:35 +02:00
Andreas Fabri
2f895335d0
The Weighted_point_mapper becomes a traits class; test_regular_3.cpp passes
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé
1761ec3294
Mesh_3 criteria is_bad() now additionally takes the triangulation as parameter
...
Instead of calling Criteria(element), one must now call Criteria(tr, element).
The idea is that the triangulation should be responsible of geometric data
while elements only handle connectivity (using ids for example).
This is already the case for Periodic_3_mesh_3 which must obtain
"true" geometric information through the (periodic) triangulation class's
methods.
These changes are transparent for Mesh_3 but allow Periodic_3_mesh_3 to use
Mesh_3's criteria.
2017-06-19 15:15:20 +02:00
Mael Rouxel-Labbé
7c014c9e27
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
...
Based on cgal-public-dev/Periodic_3_Regular...
@ 7efd46f427580437943fa549bdbf1159f35b1edb
2017-06-16 11:21:52 +02:00
Mael Rouxel-Labbé
5018c014b7
Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle
...
Based on Kernel_Weighted_point_without...
@ 41e7520b3e
2017-06-15 15:07:53 +02:00
Mael Rouxel-Labbé
98800d2de8
Fixed regular triangulation capitalization across CGAL
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
9872edfe93
Fixed wrong template type (which induced taking references of references)
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
bbccf42ef9
Removed an ugly static_cast
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
40566671c7
Misc minor changes
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
0d352759e6
Use boost::function_property_map to apply spatial_sort to weighted points
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
a4503e7edc
Moved facet dual computation functions from Mesh_3 to Regular_triangulation_3
...
... and improved them and gave them more overloads
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
02732237aa
Avoid copies by using result_of in boost::bind() return type
...
Copies were previously done on purpose to go around the Lazy kernel, but this
can be done without copies (for all kernels) by using result_of.
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
411fbe4ea0
Removed useless include
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
c0e71d3fae
Reorganized Regular_triangulation_3 dual functions
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
1ef25bdfcf
Copy boost::bind return object
...
The lazy kernel returns temporaries and gives garbage to compare_xyz_3...
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
2644989471
Renamed Regular_triangulation base typedef (Base > Tr_Base)
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
d5c54f68b7
Removed useless construct_point_3
...
Construct_weighted_circumcenter_3 already returns a Bare_point
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
49625a6093
Fixed compilation of add_temporary_points_on_far_sphere()
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
15f2e6d7a7
Adapted the call to spatial_sort() to handle weighted points
...
Downside: we copy points at each comparison, which is terrible! No noticeable
changes when profiling the construction of a triangulation.
We need this copy because of Lazy kernel: despite construct_point_3 having
const Point_3& construct_point_3_object()(const Point_3&)
the Lazy kernel can return some copies.
Other solutions that were not used:
-- Distinguish the Ouput type of Unary_function_to_property map depending on
the type of Kernel (ugly and not safe)
-- Use Weighted_point_mappers traits (but that blood will not be on my hands)
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
196afa074b
Adapted sorting algorithms based on compare_xyz to handle weighted point vectors
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
713eccb729
Construct_plane() must use bare points arguments
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
70d7823c6b
Removed Weighted_point_mapper_3 and RegTraits_3 shenanigans
...
There is no need anymore for sneaky traits adaptors to make Triangulation_3
a compatible base of Regular_triangulation_3:
- The Point type in Triangulation_3 is obtained through TDS::Vertex::Point (see
commit 13d5e89 )
- Triangulation_3 always ensures that we are passing bare points to the kernel
functors that require bare point arguments (see commit db5da73 )
This greatly clarifies the code of Regular_triangulation_3: there is only a
single traits type, a single base type, etc.
2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé
fb8c22c3a1
Do not provide Bare_point overloads in Regular_triangulation
2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé
73b572a7f0
Fixed usage of Bare point and Weighted point across Triangulation_3
2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé
2e379fb032
Cleaned #if 0 code
2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé
c2ad237670
Fixed hide_point()
...
Hide weighted points since they can be re-inserted afterwards
2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé
65a2c08d2d
Fixed initialization order warning
2017-06-15 10:32:03 +02:00
Andreas Fabri
58c8d7cb1a
WIP: test_meshing_polyhedron_with_features compiles and crashes in odt
2017-06-15 10:29:26 +02:00
Andreas Fabri
6a1b4c154b
Changes after making Weighted_point_3(const Point_3) explicit
2017-06-15 10:29:26 +02:00
Andreas Fabri
80224bf2c8
Disable Point_3(const Weighted_point_3&)
2017-06-15 10:29:26 +02:00
Andreas Fabri
64e5c887ec
The Weighted_point_mapper becomes a traits class; test_regular_3.cpp passes
2017-06-15 10:29:26 +02:00
Mael Rouxel-Labbé
dca4a3ff32
Hid main encroachment code in P3_mesh_triangulation_3
...
End goal is to hide periodic details in P3MT3 so that the criteria of Mesh_3
can be fully used without change in P3M3
2017-06-13 17:53:31 +02:00
Mael Rouxel-Labbé
dbc98ac410
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
Mael Rouxel-Labbé
de3874f1ef
All triangulations now use Perturbation_order in tests using symbolic perturbations
2017-05-15 17:13:38 +02:00
Mael Rouxel-Labbé
9f865e87bb
Fixed wrong template type (which induced taking references of references)
2017-05-12 12:21:39 +02:00
Mael Rouxel-Labbé
97b789a741
Merge branch 'Kernel_Weighted_point_without_conversion-GF-old' into Kernel_Weighted_point_without_conversion-GF
2017-05-10 12:32:46 +02:00
Mael Rouxel-Labbé
be441f8dd1
Removed an ugly static_cast
2017-05-01 16:15:40 +02:00
Mael Rouxel-Labbé
169d0be212
Misc minor changes
2017-05-01 16:15:31 +02:00
Mael Rouxel-Labbé
d6576d1857
Use boost::function_property_map to apply spatial_sort to weighted points
2017-05-01 16:14:57 +02:00
Mael Rouxel-Labbé
6610dc7116
Moved facet dual computation functions from Mesh_3 to Regular_triangulation_3
...
... and improved them and gave them more overloads
2017-04-28 17:51:22 +02:00
Mael Rouxel-Labbé
5e9bad8e5d
Avoid copies by using result_of in boost::bind() return type
...
Copies were previously done on purpose to go around the Lazy kernel, but this
can be done without copies (for all kernels) by using result_of.
2017-04-28 17:30:37 +02:00
Mael Rouxel-Labbé
2e78fee32e
Removed useless include
2017-04-28 17:24:44 +02:00
Mael Rouxel-Labbé
31f82720e8
Reorganized Regular_triangulation_3 dual functions
2017-04-28 15:00:29 +02:00
Mael Rouxel-Labbé
fe3c728a42
Copy boost::bind return object
...
The lazy kernel returns temporaries and gives garbage to compare_xyz_3...
2017-04-28 14:38:27 +02:00
Mael Rouxel-Labbé
88f97d2974
Renamed Regular_triangulation base typedef (Base > Tr_Base)
2017-04-27 16:31:35 +02:00
Mael Rouxel-Labbé
3681ec4460
Removed useless construct_point_3
...
Construct_weighted_circumcenter_3 already returns a Bare_point
2017-04-27 16:13:48 +02:00
Mael Rouxel-Labbé
863a223860
Fixed compilation of add_temporary_points_on_far_sphere()
2017-04-27 14:01:58 +02:00
Mael Rouxel-Labbé
2a06660a2b
Adapted the call to spatial_sort() to handle weighted points
...
Downside: we copy points at each comparison, which is terrible! No noticeable
changes when profiling the construction of a triangulation.
We need this copy because of Lazy kernel: despite construct_point_3 having
const Point_3& construct_point_3_object()(const Point_3&)
the Lazy kernel can return some copies.
Other solutions that were not used:
-- Distinguish the Ouput type of Unary_function_to_property map depending on
the type of Kernel (ugly and not safe)
-- Use Weighted_point_mappers traits (but that blood will not be on my hands)
2017-04-27 13:56:01 +02:00
Mael Rouxel-Labbé
9651371c6f
Adapted sorting algorithms based on compare_xyz to handle weighted point vectors
2017-04-27 13:52:20 +02:00
Mael Rouxel-Labbé
7108383498
Construct_plane() must use bare points arguments
2017-04-27 12:03:47 +02:00
Mael Rouxel-Labbé
450c78e814
Removed Weighted_point_mapper_3 and RegTraits_3 shenanigans
...
There is no need anymore for sneaky traits adaptors to make Triangulation_3
a compatible base of Regular_triangulation_3:
- The Point type in Triangulation_3 is obtained through TDS::Vertex::Point (see
commit 13d5e89 )
- Triangulation_3 always ensures that we are passing bare points to the kernel
functors that require bare point arguments (see commit db5da73 )
This greatly clarifies the code of Regular_triangulation_3: there is only a
single traits type, a single base type, etc.
2017-04-27 08:44:32 +02:00
Mael Rouxel-Labbé
f1c1cd26c4
Do not provide Bare_point overloads in Regular_triangulation
2017-04-14 16:49:50 +02:00
Mael Rouxel-Labbé
5856c7de2b
Fixed usage of Bare point and Weighted point across Triangulation_3
2017-04-14 16:48:31 +02:00
Mael Rouxel-Labbé
2b8684c874
Cleaned #if 0 code
2017-04-12 15:06:03 +02:00
Mael Rouxel-Labbé
2c79d6e939
Fixed hide_point()
...
Hide weighted points since they can be re-inserted afterwards
2017-04-11 17:04:34 +02:00
Mael Rouxel-Labbé
77c83642f2
Fixed initialization order warning
2017-04-11 17:04:03 +02:00
Andreas Fabri
8cbbe0e165
Remove dependencies of Triangulation_3 on Triangulation_2
2017-04-06 11:08:37 +02:00
Andreas Fabri
741838b9c4
WIP: test_meshing_polyhedron_with_features compiles and crashes in odt
2017-03-02 15:51:41 +01:00
Andreas Fabri
30b7f131d7
Changes after making Weighted_point_3(const Point_3) explicit
2017-02-17 16:38:39 +01:00
Andreas Fabri
4922f9e86d
Disable Point_3(const Weighted_point_3&)
2017-02-15 14:33:31 +01:00
Andreas Fabri
2fab595c19
The Weighted_point_mapper becomes a traits class; test_regular_3.cpp passes
2017-02-08 16:24:14 +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
Andreas Fabri
2a27d4ff38
Fix the Vertex_remover
2016-11-22 16:03:13 +01:00
Andreas Fabri
b978fa8fdd
Fix the typedef for the Bare_point
2016-11-21 15:49:43 +01:00
Andreas Fabri
d35c6c913d
Use Weighted_point_mapper_3
2016-11-21 15:33:27 +01:00
Andreas Fabri
4ab59919e6
Use Regular_triangulation_vertex_base_3
2016-11-20 19:06:08 +01:00
Andreas Fabri
310845f01e
Add class Regular_triangulation_vertex_base_3
2016-11-19 11:07:52 +01:00
Laurent Rineau
57f0b33eb6
Fix Alpha_shapes_3
...
Alpha_shapes_3 needs to know a lot about its template parameter `Dt`. To
simplify the code, I have chosen to make the typedef `Tr_Base` public in
3D Delaunay and Regular triangulations.
2016-11-18 17:36:50 +01:00
Jane Tournois
3b5e069325
add constructors to Regular_triangulation_euclidean_traits_3,
...
and fix constructors from Regular_triangulation_3
Revert "introduce Has_nested_type_Bare_point to keep backward compatible"
This reverts part of the commit 98b43b1a49fb2dfb3baee0a532bf5d097f2f4ebd.
2016-11-03 14:57:10 +01:00
Jane Tournois
0f569a8fd6
introduce Has_nested_type_Bare_point to keep backward compatible
...
it is needed when Regular_triangulation_euclidean_traits is used the first
template parameter for Regular_triangulation (both 2d and 3d)
2016-11-03 14:57:10 +01:00
Laurent Rineau
3353d4d64d
Kernel now refines RegularTriangulationTraits_3
...
ie all CGAL kernels are now models of `RegularTriangulationTraits_3`.
2016-11-03 14:55:39 +01:00
Jane Tournois
6af2db1b91
Use Power_side_of_bounded_power_sphere instead of Side_of_bounded_orthogonal_sphere
...
both functors made the same computation, up the sign of the result.
The return type now is CGAL::Bounded_side, which makes things easier
to understand and use
2016-11-03 14:55:39 +01:00
Andreas Fabri
ad9d2c369c
Rename tests following Olivier's recommendations
2016-11-03 14:53:54 +01:00
Jane Tournois
4bcd272a99
compute dual only after infinity test has been performed
2016-11-03 13:10:27 +01:00
Andreas Fabri
9e94ee6178
Change the Power_test
2016-11-03 13:07:17 +01:00
Andreas Fabri
ea6e48e1e4
Don't use the internal traits adapter
2016-11-03 13:07:17 +01:00
Andreas Fabri
5edd015669
Use Weighted_point_triangulation_traits_3
2016-11-03 13:06:42 +01:00
Andreas Fabri
6a8f77c5ff
Added CGAL::Weighted_point_3<K> and the predicates and constructions of the Regular Traits to the kernel
...
- The Regular 3 testsuite passes
- only 3D
- not documented
2016-11-03 13:04:43 +01:00
Sébastien Loriot
7f3772a50b
replace the usage of raw pointer as property map
...
It was deprecated in boost 1.55
http://www.boost.org/users/history/version_1_55_0.html
2016-07-13 13:53:00 +02:00
Clement Jamin
6fc4dd7dd3
Enable parallel insertion of points with info
...
There was a bug preventing the parallelism to be activated when
using points with info
2015-10-27 12:17:58 +01:00
Laurent Rineau
72e0a3e677
Fix warnings about signed/unsigned
...
The code involved is about TBB.
2015-01-21 12:59:07 +01:00
Clement Jamin
078e89f55f
Add the possibility to remove the far points
...
The far points are added by the parallel version to reduce the contention
on the infinite vertex
2014-07-08 15:37:59 +02:00
Clement Jamin
982f140911
Use tbb::task_scheduler_init::default_num_threads...
...
... instead of boost:🧵 :hardware_concurrency
2014-07-02 15:10:34 +02:00
Clement Jamin
55ff0a9404
Add a warning in comments
2014-07-02 10:49:44 +02:00
Clement Jamin
5a6623c3fa
Move typedef since Vector_3 is not available in all kernels
...
TODO: find a better fix later
2014-07-01 17:00:05 +02:00
Clement Jamin
7af8f8b768
Fix compilation with GCC
2014-06-30 19:58:44 +02:00
Clement Jamin
7145f7db0b
Replaced some C++11 lambda functions by functors +change mutex (static=>member)
2014-06-03 18:18:12 +02:00
Clement Jamin
c9c8335811
More code clean-up
2014-05-27 13:46:34 +02:00
Clement Jamin
2f78d27bd3
Code clean-up
2014-05-27 13:21:16 +02:00
Clement Jamin
f3c00442fd
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-05-14 19:05:40 +02:00
Clement Jamin
e07baefb17
Change the way we compute the exact circumcenter when needed
...
In some rare cases, we need to switch to exact computation for the circumcenter.
Some code for this computation is now moved from RT3 to Refine_facets.
2014-04-15 18:54:12 +02:00
Jane Tournois
88666391da
introduce weighted_circumcenter() for RegularTriangulationCellBase_3
...
weighted_circumcenter() replaces circumcenter() in the regular framework,
which is not a member of TriangulationCellBase_3 anymore.
Triangulation_cell_base_with_circumcenter_3 is deprecated and replaced by:
Delaunay_triangulation_cell_base_with_circumcenter_3
and
Regular_triangulation_cell_base_with_circumcenter_3.
Implement the changes in documentation, Triangulation_3 code and Mesh_3 code.
2014-01-16 16:55:19 +01:00
Jane Tournois
bf9e964f0e
remove macro CGAL_REGULAR_TRIANGULATION_3_USE_CIRCUMCENTER_CACHE
...
has been checked and is always activated
2014-01-09 12:05:50 +01:00
Clement Jamin
5101c3d2e7
Added my name in a few places + implementation history
2013-10-15 11:14:58 +02:00
Clement Jamin
29525dfcb7
Back-quotes for could_lock_zone and true + minor fixes + replace 0 by NULL
2013-10-15 10:27:35 +02:00
Clement Jamin
8aaee67985
Removed some "p_" prefixes in variable names
2013-07-12 15:49:45 +02:00
Clement Jamin
fcdf906f06
Option to add temporary points on a far sphere before insertion
...
Helps to reduce contention on the infinite vertex
But removing those points in the end takes time
so it's only worth it when points lie on a surface.
2013-07-02 12:57:26 +02:00
Clement Jamin
8181587ed7
Fix tabs + better profiling
2013-07-02 11:37:32 +02:00
Clement Jamin
bc360c8b13
Changes for GCC compilation + removed some trailing spaces
2013-06-07 17:40:53 +02:00
Clement Jamin
440a654a58
Added a concurrency-safe version of DT3::find_conflicts + better doc
2013-06-05 17:23:19 +02:00
Clement Jamin
b43f28c6ab
Renamed p_could_lock_zone + use NULL instead of 0 + CGAL_TRIANGULATION_3_PROFILING
2013-06-05 13:44:34 +02:00
Clement Jamin
dbe1c9c597
Reversed the "facet_not_in_its_cz" variables by removing the "not"
2013-05-28 15:56:22 +02:00
Clement Jamin
2a7c402c07
Regular_triangulation_3 is now parallel (insert/remove)
2013-04-10 18:08:53 +02:00
Clement Jamin
44b8217d54
New/modified constructors for triangulations.
...
Can now take a lock data structure as parameter.
2013-02-19 10:39:39 +01:00
Clement Jamin
bce43fbb8e
Improved the way parallelism is handle in Mesh_3/Triangulation_3
...
Added a better support for parallelism in Triangulation_3.
Simplified how to enable/disable concurrency in Mesh_3.
Moved the Compact_container stategies to a new file.
2013-02-15 18:07:43 +01:00
Clement Jamin
eb2ed63d8b
Changed the way we activate concurrency in Triangulation_3 + Code clean-up
2013-02-11 19:12:30 +01:00
Laurent Rineau
70bf8d7e88
New branch to add c->circumcenter (and the verson with cache) to RT3
2013-02-07 19:07:42 +01:00
Clément Jamin
1c664776c9
The parallel version can now be built with GCC
2012-07-10 16:53:34 +00:00
Clément Jamin
41f9cbe411
Sequential Mesh_3 can now be compiled by GCC.
2012-07-09 15:44:58 +00:00
Clément Jamin
40f602fea9
Minor changes (comments, etc.)
2012-06-21 12:03:03 +00:00
Clément Jamin
b268598665
Replace LINKED_WITH_TBB by CGAL_LINKED_WITH_TBB.
2012-06-13 09:33:08 +00:00
Clément Jamin
b948543cc6
Use of a Tag (template parameter) to activate/deactivate concurrency in Mesh_3, instead of #ifdef macros.
2012-06-09 08:52:37 +00:00
Clément Jamin
dfbddff185
Bugfixes + some clean-up
2012-05-30 14:49:02 +00:00
Clément Jamin
a0a92cdf64
The problem "A facet is not in conflict with its refinement point" (can occur in sequential version too) is now solved => we switch to exact computation (for the dual) when it happens.
...
Note: don't try to #define CGAL_MESH_3_DO_NOT_LOCK_INFINITE_VERTEX, it doesn't work yet.
2012-04-04 07:05:46 +00:00
Clément Jamin
4fdf647428
"Re-tabulation"
2012-03-28 08:30:32 +00:00
Clément Jamin
da923ba811
Forget about yesterday. There was a studid mutex making the whole thing nearly sequential.
...
Anyway, now the refinement of the facets is parallel. The speedup is around 2-3 on a 12-core CPU. Can do better, but at least it shows it's not sequential.
The refinement of the cells is not parallel, yet.
One last thing: the program needs to be restarted between two refinements (should be fixed soon).
2012-03-23 18:05:24 +00:00
Clément Jamin
4ccf8e0447
First working parallel version. It's not faster than the sequential one, but not slower neither (depends if you're optimistic or not). The good news is that we found all (?) the sections to protect or to make thread-local.
2012-03-22 17:07:03 +00:00
Sébastien Loriot
498c0a6e1e
Make the insert-by-range function more permissive
...
The condition is now to be convertible to the point type, pair<point,info>,...
This was the behavior before the insert-by-range-with-info methods were
introduced.
2012-01-24 17:25:20 +00:00
Laurent Rineau
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
Sébastien Loriot
98ddbf9c7e
merge packages Spatial_sorting, Triangulation_2 and Triangulation_3 from branch spatial_sorting-add_info-sloriot
2011-05-24 15:48:31 +00:00
Sébastien Loriot
2c2ce21536
remove commented lines from example.
...
int -> size_type
2011-03-04 07:12:17 +00:00
Sébastien Loriot
af6f99ed1a
protect code using insert points with info by range using macro
...
CGAL_TRIANGULATION_3_DONT_INSERT_RANGE_OF_POINTS_WITH_INFO
2011-01-10 17:54:57 +00:00
Sébastien Loriot
3181ed9401
merge only the code to insert points with info by range from the branch
...
/branches/experimental-packages/Triangulation_insert_with_info/Triangulation_3
2011-01-10 16:00:51 +00:00
Laurent Rineau
eea1755591
Merge the candidate branch of
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Rt::vertices_inside_conflict_zone
in trunk.
2010-12-21 16:36:04 +00:00
Laurent Rineau
96162627aa
Merge the following small features in trunk:
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Remove_cluster
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Structural_filtering
Merge also a partial support of:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Rt::vertices_inside_conflict_zone
(vertices_inside_conflict_zone" is added in Regular_triangulation_3, without documenting it)
2010-12-10 17:02:10 +00:00
Stéphane Tayeb
ca4f9f11e8
Add an overload of insert_in_hole() in class Regular_triangulation_3 to ensure that hidden points are properly treated.
2010-08-04 15:36:38 +00:00
Sébastien Loriot
599b23129e
missing using
2010-07-08 09:04:57 +00:00
Stéphane Tayeb
771b6f1b79
Fix bug on g++-4.5 -std=c++0x: use int[3] instead of unsigned char[3] to store vertex indices.
2010-07-07 11:26:48 +00:00
Sébastien Loriot
238f5a8479
change a private into protecter to have access to hidden_tester in derived class
...
add a using find_conflicts so that can call T3 version from class inheriting from DT or RT
2010-06-25 21:13:06 +00:00
Andreas Fabri
d185e4152f
Finally use ptrdiff_t as return type for insert(beg, end)
2010-06-23 13:35:35 +00:00
Andreas Fabri
b456cdb994
int -> size_type/std::size_t
2010-06-21 20:31:19 +00:00
Andreas Fabri
97c2754da5
As the insertion of points in a regular triangulation can reduce the number of vertices we have to replace size_t with ptrdiff_t
2010-06-21 16:06:01 +00:00
Andreas Fabri
c79a1ebbf6
int -> size_type/std::size_t
2010-06-21 14:12:02 +00:00
Laurent Rineau
8679a3911e
Merged revisions 56835,56864-56870,56876,56895-56897 via svnmerge from
...
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch
........
r56835 | lrineau | 2010-06-17 12:56:52 +0200 (Thu, 17 Jun 2010) | 6 lines
Remove the constructor Gmpfr(long double) on Microsoft Visual C++. A big
comment in the source code explains why.
The testsuite will check that the construction of Gmpfr from a long double
on MSVC still works and produces the right Gmpfr.
........
r56864 | afabri | 2010-06-18 11:04:47 +0200 (Fri, 18 Jun 2010) | 1 line
Use tie from boost::
........
r56865 | afabri | 2010-06-18 11:11:49 +0200 (Fri, 18 Jun 2010) | 1 line
Use bind from boost::
........
r56866 | afabri | 2010-06-18 11:38:50 +0200 (Fri, 18 Jun 2010) | 1 line
Use bind from boost:: (detected in Mesh_3 VC10 testsuite)
........
r56867 | lrineau | 2010-06-18 11:39:24 +0200 (Fri, 18 Jun 2010) | 3 lines
cmake-2.8.2rc2 is out.
/bigobj is necessary
........
r56868 | afabri | 2010-06-18 11:52:37 +0200 (Fri, 18 Jun 2010) | 1 line
Add #include <fstream>
........
r56869 | afabri | 2010-06-18 11:55:33 +0200 (Fri, 18 Jun 2010) | 1 line
Shorten filename as with path it exceeds easily 256 letters which poor Visual C++ can't handle
........
r56870 | afabri | 2010-06-18 12:24:30 +0200 (Fri, 18 Jun 2010) | 1 line
Use tie from boost::
........
r56876 | lrineau | 2010-06-18 16:40:36 +0200 (Fri, 18 Jun 2010) | 3 lines
New try to fix the issue of Gmpfr(long double) with MSVC and libmpfr-1.dll
compiled by Mingw.
........
r56895 | lrineau | 2010-06-20 23:16:40 +0200 (Sun, 20 Jun 2010) | 3 lines
Using boost::bind is not sufficient" "bind" without qualifier was
ambiguous, according to MSVC2010, with std::bind (from C++0x).
........
r56896 | lrineau | 2010-06-20 23:18:29 +0200 (Sun, 20 Jun 2010) | 3 lines
Qualify "bind" with "boost::", to avoid the ambiguity (according to
MSVC2010), with std::bind (C++0x).
........
r56897 | lrineau | 2010-06-20 23:19:17 +0200 (Sun, 20 Jun 2010) | 2 lines
Stupid typo!
........
2010-06-20 21:48:20 +00:00
Sébastien Loriot
52317dd49f
add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
...
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
Laurent Rineau
7e87099363
Merge the branch /branches/candidate-packages/Triangulation_3
...
- Work from:
Pedro Machado Manhaes de Castro <Pedro.Machado@sophia.inria.fr>
Olivier Devillers <Olivier.Devillers@sophia.inria.fr>
- The work is:
- displacement for 3D triangulation (Olivier and Pedro)
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Move_T2T3
2010-05-31 08:48:09 +00:00
Andreas Fabri
beaff6d265
Add 'using' statement for ansi-compliance
2010-05-11 07:08:10 +00:00
Laurent Rineau
c4d182b8c7
Oops. Typo.
...
Locate testing was not testing the right headers.
2010-05-08 11:35:32 +00:00
Laurent Rineau
2257b8b2ab
Fix for strict-ansi compliance
2010-05-08 11:24:59 +00:00
Andreas Fabri
6edc1c3f73
Remove random_shuffle from insert(b,e) functions as spatial_sort does it now
2010-01-27 13:50:23 +00:00
Sylvain Pion
d09319501c
Use canonical form for for-loops over iterator ranges.
2009-11-10 12:53:07 +00:00
Sylvain Pion
0e456b39d7
Remove useless comment.
2009-09-23 18:39:08 +00:00
Sylvain Pion
443277dab0
Pass Cell_handle and Vertex_handle by value instead of by const&. This undoes :
...
r19107 | afabri | 2003-10-17 10:49:19 +0200 (Ven 17 oct 2003) | 2 lignes
Added const& for gaining performance
which was justified at the time by the fact that on VC++, handles encapsulated iterators.
2009-08-17 15:11:03 +00:00
Sylvain Pion
57603f0b3b
Allow CGAL::Default for the TDS parameters of the three main triangulation classes.
...
(patch extracted from the Triangulation_3_Location_policy branch as it is mostly orthogonal)
2009-08-17 09:48:07 +00:00
Sylvain Pion
919321e300
Give the TDS the ability to store a more general Cell_data in cells,
...
than just an implicit access to a conflict_flag.
2009-08-11 20:05:42 +00:00
Sylvain Pion
395b1d569e
Remove white spaces at end of lines.
2009-08-04 13:36:15 +00:00
Sylvain Pion
ffedfc0d58
Add some locate() and insert() convenient overloads, taking the start hint as a
...
Vertex_handle (instead of the Cell_handle currently).
2009-07-24 21:57:38 +00:00
Sylvain Pion
7df2a2df3b
Remover short name macros. See PR 1551.
2009-04-21 18:34:14 +00:00
Monique Teillaud
ba9b7b7143
incident_vertices(vertex) renamed as adjacent_vertices()
...
old name left for backward compatibility (and old functions still tested)
2009-04-08 10:06:32 +00:00
Sylvain Pion
4aa1cb057a
Remove my email adress from header files.
2008-10-11 20:21:08 +00:00