5cee5c6348
Remove the typedefs for the iterators as we offer ranges
...
Remove the free functions for accessing properties
2014-09-30 11:28:45 +02:00
08a033ffb4
Integrate remarks from the review by Michael and Guillaume.
...
Switch from pair of iterators to a range class
2014-09-26 16:53:37 +02:00
43b8390a70
Merge branch 'Triangulation_2-NewPolylineConstraint-GF-old' into Triangulation_2-NewPolylineConstraint-GF
2014-08-08 12:47:15 +02:00
333854f38a
Fix the license of two files
...
Trivial fix for master.
2014-07-31 16:19:05 +02:00
3deb8e7910
Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
...
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.
There was a conflict with two features recently merged into 'master' for
CGAL-4.5:
- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
the small feature:
http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper
- parallelism for Triangulation_3 and Mesh_3:
http://cgal.org/wiki/Features/Parallel_Mesh_3
Conflicts:
Combinatorial_map/include/CGAL/Cell_attribute.h
Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
Polyhedron/demo/Polyhedron/Polyhedron_type.h
STL_Extension/include/CGAL/Compact_container.h
STL_Extension/test/STL_Extension/test_Compact_container.cpp
I also modified the following files during the conflict resolution:
Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
2014-07-18 15:47:14 +02:00
fbf824c711
Merge branch 'Mesh_3-parallel-cjamin'
...
This branch introduces parallel algorithms in Triangulation_3 and Mesh_3,
as well as a Concurrent_compact_container. The corresponding features are:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_triangulation_3
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_Mesh_3
Tested in CGAL-4.5-Ic-98.
Approved by the Release Manager.
2014-07-17 19:08:24 +02:00
2ae815910e
Switch to LGPL
2014-07-17 18:36:21 +02:00
b1f4afbd33
Macros MUST be prefixed with CGAL_
...
-pedantic does not like extra semicolons
todo: cleanup: The macro is there twice.
2014-07-09 15:41:08 +02:00
2aadba50d7
Merge branch 'BGL-redesign_final-GF'
...
Introduces a redesign of the CGAL extension of the BGL API
Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager
Conflicts:
Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
2014-07-08 19:45:16 +02:00
f742be081b
Fix spaces
2014-07-08 15:40:29 +02:00
f7396790ff
Fix merge function
...
Fixes memory leaks, and maybe some other potential problems
2014-07-07 13:41:33 +02:00
a9887cbe9f
Remove a useless constructor that was causing an error
2014-07-04 11:56:02 +02:00
fee85470c1
Merge branch 'Triangulation_3-determinism-gf' into to-be-tested/Triangulation_3-determinism-gf
...
Conflicts:
.gitattributes
Matrix_search/include/CGAL/rectangular_3_center_2.h
Spatial_sorting/include/CGAL/spatial_sort.h
2014-07-03 16:34:46 +02:00
6aeaf509cf
Add line break at the end of the file
2014-07-02 09:03:21 +02:00
e3abf7fc40
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-07-01 10:38:14 +02:00
675d26e884
add non-documented remove_const fcts to turn a const-iterator to an iterator
2014-06-24 16:35:10 +02:00
6ed794da5b
Replace ">>" by "> >"
2014-06-19 19:09:31 +02:00
c9c8335811
More code clean-up
2014-05-27 13:46:34 +02:00
dfe800bc40
Clean-up debug code (global lock)
2014-05-27 12:16:29 +02:00
de485dfc10
Use s_iterator_to and remove the constructor I had added temporarily
2014-05-23 17:17:16 +02:00
c7df582fc2
Revert "add the time stamper mecanism into In_place_list"
...
This reverts commit 5e2ab7fddc
2014-05-22 11:18:55 +02:00
2d14739716
additional fixes for Combinatorial map package
2014-05-21 18:47:33 +02:00
3fa09693a3
Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
...
Conflicts:
Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h
Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
Mesh_3/include/CGAL/Mesh_polyhedron_3.h
Mesh_3/test/Mesh_3/test_meshing_polylines_only.cpp
STL_Extension/include/CGAL/Compact_container.h
STL_Extension/test/STL_Extension/test_Compact_container.cpp
2014-05-21 18:24:17 +02:00
5e2ab7fddc
add the time stamper mecanism into In_place_list
2014-05-21 16:33:54 +02:00
1bffc44ed4
factorize the mecanism to define the time stamper in a container
2014-05-21 16:30:32 +02:00
c6fa3f4a3a
add missing namespace
2014-05-21 12:51:20 +02:00
82f9a83e2d
move the Time stamper into a separate file
2014-05-21 12:20:50 +02:00
cbd50574e4
clean up comments, include and copyright
2014-05-21 12:08:12 +02:00
2f967ba6e4
the testsuite for the new version of the Constrained_triangulation_plus_2 passes
2014-05-19 15:57:24 +02:00
85b29aed5f
treat merge conflicts
2014-05-15 16:09:24 +02:00
f3c00442fd
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-05-14 19:05:40 +02:00
897f585f12
Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse
...
Need the Interval_nt/long interoperability for Eigen.
2014-05-07 18:41:17 +02:00
24d396afb2
Micro-optimization: do the opaque call first so it does not hinder optimizers.
...
(don't expect to measure the difference)
2014-05-05 19:13:31 +02:00
bcdfdf5335
Cleanup trailing spaces
2014-04-16 15:42:46 +02:00
239b6d0932
Merge branch 'STL_extension-Compact_container_as_vector-cjamin-old' into STL_extension-Compact_container_as_vector-cjamin
2014-04-16 14:14:24 +01:00
a2ef3c10f0
Change the name of timestamp policies
2014-04-16 12:36:40 +02:00
1396d65b48
Test the time stamper policy in the testsuite
2014-04-16 12:34:30 +02:00
28e60a5460
Cosmetic changes
2014-04-16 12:33:57 +02:00
36e61bf091
Fix the implementation of CC_ts_impl_aux
...
CC_ts_impl_aux is the new name of CC_ts_impl_impl
2014-04-16 12:24:14 +02:00
cf3eee72ae
Add comments
2014-04-16 12:22:49 +02:00
75c61a687d
New implementation of Has_timestamp
2014-04-15 18:07:23 +02:00
993541644c
move Has_timestamp to STL_extension/include/CGAL directory
...
to avoid that Compact_container depends on Mesh_3
2014-03-27 13:57:47 +01:00
458dcbf96d
Add a comment that says why a warning must be disabled
2014-03-26 17:36:19 +01:00
fa9d5b7f93
Suppress a warning issued by VC12
2014-03-26 09:16:02 +01:00
b54be0ee3c
Update the copyright header
2014-03-25 16:42:23 +01:00
3168c851a1
Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse
...
Conflicts:
Kernel_d/doc_tex/Kernel_d/kernel_representation_d.tex
Kernel_d/doc_tex/Kernel_d_ref/Homogeneous_d.tex
Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex
Kernel_d/doc_tex/Kernel_d_ref/main.tex
Resolved by dropping those files.
2014-03-12 12:38:08 +01:00
157cd0465f
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Mesh_3/demo/Mesh_3/Mesh_3_optimization_plugin_cgal_code.cpp
Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h
Mesh_3/include/CGAL/Mesh_3/config.h
Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
Mesh_3/include/CGAL/exude_mesh_3.h
Mesh_3/test/Mesh_3/test_meshing_utilities.h
Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h
2014-03-10 17:01:03 +01:00
6af720cde8
remove useless typename(s)
2014-02-21 17:14:13 +01:00
9d19ac0f96
add a "less" function to CGAL_time_stamper
...
and handle null pointers given to comparison
it is necessary for example in Triangulation_3::remove_3D
2014-02-21 14:41:41 +01:00
22153ac273
make private the time_stamp_ variable
...
and add time_stamp() and set_time_stamp() methods everywhere
2014-02-20 16:18:49 +01:00
0740b3652f
add class Has_timestamp not to modify the API of Compact_container
...
- use the Has_timestamp operator in Compact_container
- add partial specialization to classes that need the time stamp (i.e.
Mesh_vertex_base, Compact_mesh_cell_base_3 and Mesh_cell_base_3)
- remove "ts" from classes where they were actually needed for compilation
purpose only (i.e. Kd_tree_node and Triangulation_ds_cell_base_3)
- rename "ts" to time_stamp_
2014-02-20 15:53:36 +01:00
b3eccc5905
determinism : add a template parameter to Compact_container
...
we add a template parameter to Compact_container that is able to
set and get the "time stamps" stored in Vertex_handle, Cell_handle etc.
We previously made sure that these pointers are always compared using
the operator< of CC_iterator, inside Compact_container.h
2014-02-18 17:25:50 +01:00
6db28ed43d
move ts from Tds to Compact_container
...
Tds now is back to its original version (not different from master)
2014-02-14 17:15:33 +01:00
83546c53b1
Add a time stamp in vertices and cells of triangulations and polyhedra
...
and use this for operator< of handles in order to make mesh generation
deterministic
2014-02-13 19:46:34 +01:00
da3d641efe
Add comments to #ifndef/endif
2014-01-31 16:50:20 +01:00
3ed92e1c1a
Merge branch 'STL_Extension-Boolean_tag_Boost_Integral_Constant-lrineau'
...
Small feature:
cgal.org/wiki/Features/Small_Features/Boolean_tag_is_a_Boost_Integral_Constant
Now CGAL::Boolean_tag<true> and CGAL::Boolean_tag<true> are model of the
Boost concept "Integral Constant".
Tested in CGAL-4.4-Ic-84.
2014-01-09 17:54:28 +01:00
c81531bc80
Oops, I removed a line by mistake
2013-12-20 15:11:36 +01:00
28c5fde142
Add an increment policy to the Compact_container, and an operator[]
2013-12-20 15:03:37 +01:00
59f476b5b4
Merge branch 'STL_Extension-fix_make_sorted_pair-local'
...
Bug-fix when using make_sorted_pair on different types
Successfully tested in CGAL-4.4-Ic-62
Approved by the release manager
2013-12-20 08:44:23 +01:00
3adb58e046
better support of heterogeneous but compatible types
2013-12-17 20:37:19 +01:00
5d1eacf16f
rename get_erase_counter => erase_counter
...
And add it to the concept ObjectWithEraseCounter
2013-12-12 07:23:07 +01:00
dc6c20cfdb
merge branch origin/Fix_leak-STL_Extension-GF
...
Remove memory leaks detected by AddressSanitizer.
Tested in CGAL-4.4-Ic-54 and CGAL-4.4-Ic-55.
Approved by the release manager.
2013-12-11 13:42:31 +01:00
8ddf8255d5
Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse
...
Hopefully the doc will be easier to build this way.
2013-11-23 12:34:18 +01:00
ec8e949d21
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-11-21 10:50:55 +01:00
b319b31825
Assume refcount>0 when copying.
...
Hopefully it will help compilers understand that destructing a copy
can't bring the counter to 0.
2013-11-16 12:14:44 +01:00
d8da1137cc
Fix a memory leak in Handle_with_policy:
...
A rep that points to another rep is like a handle
So if such a rep gets deleted the reference counter must be decremented
2013-11-15 16:20:01 +01:00
61298d3925
Fix memory leak in Compact_container::merge()
...
We forgot to merge all_items
2013-11-08 13:55:40 +01:00
fd0e7756d5
add missing include
...
trivial bugfix
2013-10-29 13:05:44 +01:00
5f9ab81512
add the function make_sorted_pair
2013-10-18 10:44:54 -07:00
6a30252a82
remove not needed include directive
2013-10-18 09:22:14 -07:00
6b65ad71da
Changes in the "lock data structure" concept and models
...
The concept is now much more generic (SurjectiveLockDataStructure).
The names have been changed accordingly.
2013-10-16 12:17:56 +02:00
29525dfcb7
Back-quotes for could_lock_zone and true + minor fixes + replace 0 by NULL
2013-10-15 10:27:35 +02:00
a199ec9332
Rename params
2013-10-14 18:07:50 +02:00
e03b9aa762
get_cc_iterator => cc_iterator
2013-10-14 17:50:37 +02:00
5ff923bcfb
Bug fix: use the right namespace (CCC_internal)
2013-10-02 10:48:59 +02:00
2706cbfeff
Compact_container: erase counter strategy is now automatically deduced from T.
...
If the T::increment_erase_counter() function exists, then the erase counter
value will be updated by the Compact_container.
2013-09-30 18:25:41 +02:00
41929ed520
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
Mesh_3/dont_submit
Triangulation_3/doc/TDS_3/CGAL/Triangulation_data_structure_3.h
Triangulation_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Delaunay_triangulation_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_3.h
Triangulation_3/doc/Triangulation_3/PackageDescription.txt
2013-09-25 11:47:43 +02:00
6c547e5663
Mainly added includes
2013-09-13 22:24:30 +02:00
4a9be1f608
put the 'deprecated' macro at the right spot and add a testsiuite
2013-09-10 11:37:08 +02:00
224a54303a
Make Tag_true and Tag_false be models of the Boost Integral Constant model
...
http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html
2013-08-27 17:07:24 +02:00
7c574d3dd8
Rename Filtered_predicate since it isn't compatible with the old version.
2013-07-22 14:23:08 +02:00
dafdb45786
Move is_iterator changes back to the original file.
2013-07-19 21:55:34 +02:00
838439b038
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d.h
Installation/cmake/modules/FindTBB.cmake
Installation/cmake/modules/UseTBB.cmake
Mesh_3/doc/Mesh_3/CGAL/Mesh_triangulation_3.h
Mesh_3/doc/Mesh_3/Mesh_3.txt
Mesh_3/include/CGAL/Mesh_triangulation_3.h
Surface_mesher/doc/Surface_mesher/Surface_mesher.txt
2013-07-11 09:58:51 +02:00
8b0edee1f4
Merge branch 'concurrency_in_cgal-cjamin-old' into concurrency_in_cgal-cjamin
2013-07-03 17:17:34 +02:00
206b20bc15
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-07-02 17:37:50 +02:00
119675c970
Keep a copy of the bbox
2013-07-02 12:53:34 +02:00
44355c9f11
Rename get_cc_handle => get_cc_iterator
2013-06-27 17:00:00 +02:00
c8afb5e76a
Use of an std::vector instead of a dynamic array
2013-06-27 14:01:52 +02:00
c09ec2beaa
Merge branch 'Kernel-replace_object-pmoeller'
...
Successfully tested in CGAL-4.3-Ic-59
Approved by the release manager
Conflicts:
Kernel_23/doc/Kernel_23/CGAL/intersections.h
Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
Kernel_d/doc/Kernel_d/Kernel_d.txt
STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-06-14 14:26:05 +02:00
b30d3daa2b
do not use exception in Object::assign. g++3.4 produces a segfault with -O2
2013-06-12 17:39:31 +02:00
bc360c8b13
Changes for GCC compilation + removed some trailing spaces
2013-06-07 17:40:53 +02:00
0e51e92656
Introduces a new CC_safe_handle class
...
Helper class which embed a `Compact_container` (or `Concurrent_compact_container`) iterator and is able to know if the pointee has been erased since the creation of the `CC_safe_handle` instance.
2013-06-06 16:49:23 +02:00
0c9656f553
add missing overload of operator= if EDG is defined
2013-06-04 16:53:05 +02:00
2997e8ae08
Dispatch_(or_drop_)output_iterator<V,O> now accepts a tuple V put in it ...
...
...and makes the correct dispatch to the output iterators in O
2013-05-31 17:20:47 +02:00
bbb5fec836
The Parallel_tag inherits Sequential_tag
2013-05-31 10:44:41 +02:00
81f9c675c5
P3::x/y/z() functions can now be any model of the concept of RealEmbeddable
2013-05-30 13:38:58 +02:00
f5fae5ab23
Smaller tag names + removed "Tag_non_blocking_with_mutexes" from documentation
2013-05-28 15:38:20 +02:00
127926aa14
Proof-reading + minor changes
...
Renamed unlock_all_tls_locked_locations => unlock_all_points_locked_by_this_thread
2013-05-28 15:07:20 +02:00
4a3a43d0e6
Minor fix + output
2013-05-23 17:48:32 +02:00
3a4caaaa1c
Changed the place of the erase counters.
...
Changed Compact_container_strategy_XXX::Uses_erase_counter type + moved the erase counters from Triangulation_ds_xxx_base_3 to Mesh_xxx_base_3.
2013-04-16 15:31:36 +02:00
Andreas Fabri
Laurent Rineau
Clement Jamin
Sébastien Loriot
Marc Glisse
Jane Tournois