a09ed46810
Thread-safe version of incident_cells and incident_facets
2014-06-23 10:45:26 +02:00
9f5927af61
Move function from C3T3_helpers to TDS
...
Move C3T3_helpers::get_incident_cells_without_using_tds_data to TDS::incident_cells_threadsafe
2014-06-23 08:21:09 +02:00
a181490bff
Fix clang compilation
2014-06-19 17:01:13 +02:00
451e6e9cff
Missing typename/using/etc.
2014-06-13 13:46:12 +02:00
1a8bc68ade
Fixed compilation with GCC + removed useless template params
2014-06-12 17:27:14 +02:00
6fa129c630
is_XXX_locked + missing lock
2014-06-06 10:32:31 +02:00
58f82a58eb
Fix Update_facet functor
...
It is only used when CGAL_INTRUSIVE_LIST is not defined,
so it hadn't been properly tested.
2014-06-05 17:15:22 +02:00
d6693f3319
Replaced some C++11 lambda functions by functors
2014-06-04 16:46:20 +02:00
23e1ac17b3
Added "const" to the "move_point_XXX" function family
2014-06-04 16:45:09 +02:00
40d597594e
Add reset_sliver_cache call in the parallel version
2014-06-04 11:51:56 +02:00
7145f7db0b
Replaced some C++11 lambda functions by functors +change mutex (static=>member)
2014-06-03 18:18:12 +02:00
52e83256ec
last_cell_ should be private, not protected
2014-06-03 18:16:38 +02:00
e176240e31
Replaced some C++11 lambda functions by functors
2014-06-02 12:52:53 +02:00
a8df04b794
Moved the functor
2014-06-02 10:41:42 +02:00
de1ae6e608
Replaced C++11 lambda function by functor
2014-05-28 18:57:28 +02:00
f2ad628aee
Replaced C++11 lambda function by functor
2014-05-28 16:29:24 +02:00
dc808a81cb
Replaced C++11 lambda function by functor
2014-05-27 17:21:18 +02:00
2f78d27bd3
Code clean-up
2014-05-27 13:21:16 +02:00
d2f2f9c482
Remove temporary test code
2014-05-27 13:19:45 +02:00
0b74b6a8c4
Use s_iterator_to
2014-05-27 13:15:19 +02:00
cfae6c3bca
Remove assertion which is not valid in parallel
2014-05-27 13:14:42 +02:00
de485dfc10
Use s_iterator_to and remove the constructor I had added temporarily
2014-05-23 17:17:16 +02:00
d130b32702
Clean-up
2014-05-23 15:48:49 +02:00
5b7549f2fd
Remove get_ prefix
2014-05-23 15:48:21 +02:00
6a2739845b
Bugfix: v is needed outside the if block
2014-05-23 15:45:58 +02:00
ca2a2878b4
Clean-up temporary/debug code
2014-05-23 15:34:27 +02:00
5576570846
Clean-up temporary/debug code
2014-05-23 14:42:51 +02:00
88a66a5780
Remove get_ prefix
2014-05-22 19:10:50 +02:00
f2f83135eb
Fix previous commit: one #ifdef and one ":" were missing
2014-05-22 18:57:41 +02:00
9b2162b2a9
Make Boost.Program_options optionnal
2014-05-22 17:49:44 +02:00
6dd5949933
remove extra template parameter
2014-05-22 11:25:05 +02:00
23adab2cd2
add random generator to forwarding constructors
...
the two argument version was accidently removed in 1c1b65ae
2014-05-22 10:55:26 +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
9f11f46077
Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'
...
This small feature adds a new constructor in Labeled_mesh_domain_3 and
a new function wrapper. A Labeled_mesh_domain_3 can be built from an
Iso_cuboid_3 now.
(cf. https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper )
The new wrapper, Implicit_multi_domain_to_labeling_function_wrapper, is a
helping class to get a function with integer values labeling the
components of a multi-domain. This small feature was successfully tested in
the internal release CGAL-4.5-Ic-45.
Approved by the Release Manager.
Conflicts:
Installation/changes.html
2014-05-21 18:01:42 +02:00
cbd50574e4
clean up comments, include and copyright
2014-05-21 12:08:12 +02:00
a942d057fe
Better error message
2014-05-20 20:07:16 +02:00
27dccd8710
Missing CGAL_ prefix
2014-05-20 19:14:55 +02:00
566ad109eb
Use CGAL macros for indicating deprecated headers.
2014-05-16 13:40:49 +02:00
319680fc97
Use unordered_set instead of set
2014-05-15 14:53:41 +02:00
1ec6cd429a
Be able to deal with Patch_id=pair<int,int>
...
So far, the files
<CGAL/Mesh_3/Detect_features_in_polyhedra.h>
<CGAL/Mesh_polyhedron_3.h>
were assuming that the Patch_id was an integral type. Now they assumes
that it is either an integral type, or a pair of integral types.
2014-05-15 10:57:03 +02:00
09e56c5bfd
Fix some warnings for Windows.
...
In the deprecated class Implicit_vector_to_labeled_function_wrapper,
an implicit conversion from an unsigned int to a signed int caused a warning.
On windows, pragma message needs parenthesis.
2014-05-14 19:42:04 +02:00
f3c00442fd
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-05-14 19:05:40 +02:00
6682dc8781
Remove temporary error message.
2014-05-14 17:26:12 +02:00
0fd7474b06
Add two pragmas because the warning macro isn't available with all platforms.
2014-05-13 19:47:08 +02:00
e97506adb7
Merge branch 'Triangulation_3-regular_cell_base_with_circumcenter-GF'
...
Resolve conflicts in Mesh_3/include/CGAL/Mesh_3/config.h
This branch implements the small feature described here :
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/circumcenter%28%29_in_RT3_cell_base
It makes consistent implementations of dual(cell) in RT3 and DT3 :
they both return cell->circumcenter(gt) now
Approved by the release manager
2014-05-13 14:52:13 +02:00
80ec1ff80b
Merge branch 'Mesh_3-fix_Mesh_3_CGAL_4.3-lrineau'
...
Fix bugs introduced in CGAL-4.3.
Tested in CGAL-4.5-Ic-35
Approved by the release manager
2014-05-12 14:42:40 +02:00
cd94d98168
Revert "Revert an incorrect push I did"
...
This reverts commit 33cb60cc29
2014-05-07 15:24:25 +02:00
33cb60cc29
Revert an incorrect push I did
2014-05-07 15:18:53 +02:00
bcefbcb8bd
Merge remote-tracking branch 'origin/Periodic_3_mesh_3-Extended_mesh_3-MBogdanov' into Periodic_3_mesh_3-Extended_mesh_3-MBogdanov
2014-05-07 13:56:27 +02:00
68c367a2df
Revert "Revert "Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'""
...
This reverts commit 2e58135751
2014-05-07 13:56:20 +02:00
57050c3470
Fix another bug introduced in CGAL-4.3
...
An assertion was added, but that assertion cannot work if the set of
initial points is collinear (dimension 1).
2014-05-07 12:05:43 +02:00
de44fdf27e
Fix a bug introduced in CGAL-4.3
...
The Mesh_3 experimental feature "PROTECTION_NON_LINEAR" was not
correctly disabled when the development branch of Mesh_3 was merged into
CGAL-4.3.
2014-05-07 12:05:43 +02:00
0264e0a14c
Add tests for old versions of Labeled_mesh_domain_3 and Implicit_vector_to_labeled_function_wrapper.
2014-04-29 19:44:09 +02:00
9ec6d6c248
Missing #include
2014-04-23 10:41:06 +02:00
d3dc9be69c
Adds two compatibilty headers.
...
CGAL/Mesh_3/Labeled_mesh_domain_3.h
CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h
So, some branches in development using theses features won't be broken.
2014-04-16 20:05:53 +02:00
a12fe7b728
Some classes are moved from the namespace CGAL::Mesh_3 to the namespace CGAL.
...
Labeled_mesh_domain_3.
Implicit_to_labeling_function_wrapper.
Implicit_vector_to_labeling_function_wrapper.
Implicit_multi_domain_to_labeling_function_wrapper.
2014-04-16 19:57:21 +02:00
2e58135751
Revert "Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'"
...
This reverts commit 2ec2fb3c8e2ed7784521
2014-04-16 17:37:04 +02:00
2ec2fb3c8e
Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'
...
- This small feature adds a method to locate point with inexact predicates in
Periodic_3_triangulation_3.
(cf. https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_inexact_locate_in_Periodic_3_triangulation_3 )
- Tested in CGAL-4.5-Ic-12
- Approved by the Release Manager.
2014-04-16 16:22:31 +02:00
bcdfdf5335
Cleanup trailing spaces
2014-04-16 15:42:46 +02:00
aeb1d17cf6
"fix" the test
...
It seems that 700 was not a correct lower bound for the number of
protecting balls.
2014-04-16 14:59:54 +02:00
cf3eee72ae
Add comments
2014-04-16 12:22:49 +02:00
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
75c61a687d
New implementation of Has_timestamp
2014-04-15 18:07:23 +02:00
3c69735dde
Fix the deletion of p_rng_
2014-04-15 18:00:18 +02:00
16d8494018
fix the use of namespaces in previous commits
...
in particular, fix commit 490a79566f
2014-04-15 16:24:31 +02:00
97b6fc5dcf
fix include
2014-04-15 16:20:58 +02:00
490a79566f
add Has_timestamp partial specialization for primitives in Mesh_polyhedron_3
...
they are needed to have determinism since commit
b7b1d297e9
2014-04-15 15:56:44 +02:00
b7b1d297e9
fix compilation of Polyhedron demo
...
and make use of any Polyhedron possible
(note that if you're not using Mesh_polyhedron_3, then Mesh_3 will not be
deterministic)
2014-04-15 14:14:38 +02:00
f008c28f7f
The implicit wrapper had bad template parameter in test_labeled_mesh_domain_3.
...
Fix a warning : explicit conversion for the return value in
Implicit_multi_domain_to_labeling_function_wrapper.
2014-04-14 18:41:16 +02:00
60016bec63
Remove an extra ';', added by error in previous commits
2014-04-14 14:13:11 +02:00
e8134e5f25
Merge branch 'Mesh_3-fix_warnings-lrineau'
...
Fix warnings about unused variables/parameters
Use pragmas, when that is needed (for Boost named parameters)
Tested in CGAL-4.5-Ic-7.
Approved by the Release Manager.
2014-04-11 11:33:11 +02:00
cf5d6e041e
Use pragmas to fix warnings
2014-04-10 20:06:04 +02:00
45ea888972
Missing template parameter
2014-04-08 10:27:05 +02:00
6e8625845b
Code and comments clean-up
2014-04-08 10:26:00 +02:00
30e71be043
Labeled_mesh_domain_3.h and Implicit_to_labeling_function_wrapper are moved.
...
These files are moved to Mesh_3/include/CGAL/ because they are documented,
so they can be used by users.
2014-04-07 19:12:30 +02:00
477f0a4ac1
Add a test for Implicit_multi_domain_to_labeling_function_wrapper.
...
Fix a bug with the constructor taking one parameter only.
2014-04-01 16:30:32 +02:00
0e9e80b872
Point type is deduced from the ImplicitFunction in the new wrapper.
...
In Implicit_multi_domain_to_labeling_function_wrapper, the point
type is deduced if ImplicitFunction is a pointer function, else it must
be a nested type of ImplicitFunction.
BGT isn't required anymore for this wrapper.
The constructor of Implicit_multi_domain_to_labeling_function_wrapper taking
only one argument has a new way for auto-making the vector of vector of
positions. In this case, the union of the components equals to the union
of the functions.
2014-03-31 18:42:47 +02:00
6649036c80
Fix a bug in Mesh_3
...
Benjamin Kehlet reported on CGAL-discuss (Tue, 25 Mar 2014 13:45:24
+0100) that Mesh_3 was not able to mesh the simple following OFF:
OFF
4 4 0
0 0 0
0 0 1
0 1 0
1 0 0
3 3 1 2
3 0 1 3
3 0 3 2
3 0 2 1
The unit tetrahedron!!
The bug was in the robust weighted circumcenter traits. The traits
checks that the circumcenter of four points is at least in the circum
sphere of the four points. But for weighted points, that is
"power_test" that must be tested, instead of "side_of_oriented_sphere".
2014-03-31 15:44:59 +02:00
1b0323c8b8
Merge branch 'Mesh_3-add_random_generator_to_mesh_domain-GF' into Mesh_3-compare_index-GF
2014-03-28 11:01:40 +01: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
673d1f03cd
Merge branch 'Mesh_3-fix_set_facet_surface_center-jtournois'
...
This branch fixes a potential bug, that the facet surface center
is sometimes not updated properly in mirror_facet(f) when it is in f.
Tested in testsuite CGAL-4.4-Ic-155
Approved by the release manager
2014-03-27 11:16:36 +01:00
c15ff1c19c
New implementation of Implicit_multi_domain_to_labeling_function_wrapper.
...
The user can indicate more precisely which components he wants.
For each component that the user want, he must provide the matching
vector of signs. All these vector of positions must be put in a vector
passed as second parameter to the constructor of that wrapper.
Doc and examples are updated.
2014-03-26 19:02:27 +01:00
533fa556d6
reorder parameters to keep old code valid (error_bound is documented)
2014-03-25 18:21:11 +01:00
215b463812
use CGAL::Random* as member variable
...
it avoids using temporary CGAL::Random(0) that would be deleted
as soon as we get out of the constructor
+ make examples deterministic and tests not (all but test_meshing_determinism)
2014-03-25 17:47:15 +01:00
31767a8411
Rename ..._labeled_function_wrapper to ..._labeling_function_wrapper.
...
Implicit_vector_to_labeled_function_wrapper is deprecated.
Examples, tests, docs are updated.
2014-03-25 15:25:42 +01:00
98e8e85364
remove wrong 'const'
2014-03-25 15:16:02 +01:00
6521f8d474
Revert "replace CGAL::Random& by mutable CGAL::Random for member variable type"
...
This reverts commit 1c1b65ae39
2014-03-25 12:43:53 +01:00
1c1b65ae39
replace CGAL::Random& by mutable CGAL::Random for member variable type
...
and make use of const everywhere else
2014-03-25 11:39:12 +01:00
6792a899de
fix compilation of Polyhedral_mesh_domain_with_features_3
...
when a random generator which does not have the default value is chosen
2014-03-24 17:25:10 +01:00
6566c592c2
remove new template parameter RNG
...
using CGAL::Random everywhere is simpler and definitely enough
note we are using CGAL::Random& as in Random_generator_base
(see CGAL/generators.h)
2014-03-24 12:50:18 +01:00
61c245e0ea
add a random number generator (RNG) template parameter to mesh domains
...
a default value (CGAL::Random(0)) is given to avoid non-determinism
2014-03-21 10:35:01 +01:00
5c5aa5d702
Workaround for an ICE with VC12
...
The return type optional<tuple...> leads to the crash
One workaround had been to move the body of the function
into the class.
As the function is private I instead return through a reference instead.
2014-03-21 10:27:59 +01:00
e4b2e1997e
Workaround for VC12' new (and not yet well understood) problem with 'using'
2014-03-21 10:26:51 +01:00
b80f5f6ef4
Move the default constructor in the section with hand written variadic templates
2014-03-21 10:24:27 +01:00
0d1f136b85
New constructor for Implicit_multi_domain_to_labeled_function_wrapper.
...
This new constructor takes only one parameter : a vector of functions.
The mask will be automatically built with positive signs.
2014-03-20 16:18:18 +01:00
ea1c29e9d3
bug fix : set_facet_surface_center needs to be done in mirror_facet too
2014-03-20 10:16:22 +01:00
9f67ee99c7
Revert "sort facets and tetrahedra with indices, to get always the same file for the same mesh"
...
This reverts commit 2ab45a8514
2014-03-18 16:45:23 +01:00
1fd86adab6
remove useless include
2014-03-18 15:37:47 +01:00
8e3bef2e87
remove useless sort (and useless diff with master)
2014-03-18 15:32:05 +01:00
c515a414e6
get verbose stuff back (it was a mistake to commit this)
2014-03-18 15:27:46 +01:00
0554bfc6e8
Fix compilation on Linux
...
Template explicit specialization cannot be nested in a class.
http://stackoverflow.com/questions/3052579/explicit-specialization-in-non-namespace-scope
2014-03-14 14:46:14 +01:00
6b141cc848
replace hashing function when time_stamp is available
...
it used to be computed in the address of the Vertex_handle
--> not deterministic
2014-03-11 17:56:28 +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
4891e7dadb
Fix : Remove periodic_cuboid method in Labeled_mesh_domain_3.
2014-03-05 21:37:08 +01:00
3c0316e3a2
Add a new type in Implicit_multi_domain_to_labeled_function_wrapper.
...
Add the type definition Function_vector in the wrapper
Implicit_multi_domain_to_labeled_function_wrapper.
2014-03-04 18:30:50 +01:00
355ab2d8cf
Fix : #include <boost/dynamic_bitset.hpp> was missing.
...
boost::dynamic_bitset was used in Implicit_to_labeled_function_wrapper.h,
but the header file wasn't never included.
2014-03-03 10:57:09 +01:00
5df506fe5b
A new wrapper is added : Implicit_multi_domain_to_labeled_function_wrapper.
...
This wrapper allow the user to define a domain following several functions.
A point will be in the domain if the result sign of each function
matches the ones expected by the user.
2014-02-28 14:07:46 +01:00
1515e3bb76
The old changes in Implicit_mesh_domain_3 are obsolete.
...
Periodic domain isn't based on Implicit_mesh_domain_3 anymore.
So, these modifications making Implicit_mesh_domain_3 compatible with
periodic cases are obsolete.
2014-02-28 12:46:42 +01:00
5964ef650f
Labeled_mesh_domain_3 has a new constructor taking an Iso_cuboid.
...
In periodic cases, we may want to pass an bouding box with exact coordinates.
But, this is impossible to do with Bbox_3 which always has double
coordinates.
2014-02-28 07:58:01 +01:00
922d7cd439
A new wrapper is added : Implicit_multi_domain_to_labeled_function_wrapper.
...
This wrapper allow the user to define a domain following several functions.
A point will be in the domain if the result sign of each function
matches the ones expected by the user.
2014-02-28 07:55:35 +01:00
11ecfe7943
these sorts are not needed anymore
...
because everything else is deterministic
2014-02-25 17:48:45 +01:00
6c0ee83719
remove more useless diffs with integration
2014-02-24 16:20:56 +01:00
bf03d6964d
remove useless diff with integration
2014-02-24 14:37:20 +01:00
4a83e56066
remove compare.h. It is not needed anymore
2014-02-21 17:29:55 +01:00
4212eb5cf7
fix warnings about ordering variables in constructor
2014-02-21 17:19:08 +01:00
d16f83ab97
output_to_medit : write in a ostream instead of ofstream (more general)
2014-02-21 16:40:39 +01:00
28f68bbfe9
add a default time_stamp_
...
to Mesh_vertex_base_3, Mesh_cell_base_3 and Compact_mesh_cell_base_3
2014-02-21 14:35:37 +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
c7eabc4f64
rename ts to time_stamp_
2014-02-20 15:46:10 +01:00
3ec781ccd2
remove useless cout's
2014-02-14 17:18:11 +01:00
2034529d10
remove useless cout
2014-02-14 17:16:50 +01:00
6f88ef05c0
get perturbers back
2014-02-14 17:16:18 +01:00
0e7ddc7fe7
make ts local
2014-02-14 13:12:59 +01:00
5d40dcfd4a
remove cout
2014-02-14 12:54:13 +01:00
422c7b87f7
debug printouts
2014-02-13 19:46:40 +01:00
1fb697f162
Add compare.h
2014-02-13 19:46:39 +01:00
723281d3ec
make facet dual segment orientation deterministic, to compute always exactly the same intersection with domain
2014-02-13 19:46:37 +01:00
44fa8f7a93
compute distances in a canonical order to make ODT deterministic
2014-02-13 19:46:36 +01:00
f4ae054d81
compute volume and centroid of cell by taking the points always in the same order to improve consistency
2014-02-13 19:46:35 +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
2ab45a8514
sort facets and tetrahedra with indices, to get always the same file for the same mesh
2014-02-13 19:46:30 +01:00
75771bacb3
rename Regular_triangulation_cell_base_with_circumcenter_3
...
to Regular_triangulation_cell_base_with_weighted_circumcenter_3
2014-02-06 15:50:38 +01:00
4d47194a7b
Merge branch 'Mesh_3-fix_perturber_slivers_empty_bug-GF-rebased'
...
This branch fixes a bug in the sliver perturber.
It introduces some new data structures to backup the metadata
stored in cells before each perturbation. This allows to
recover these data without recomputing them in case the move
is reverted.
The bug fix comes from the fact that rec-omputed values might
have been different after the move from what they were before the
move, in a tetrahedron which is the same but for which the
Cell_handle is new.
Approved by the release manager.
2014-02-06 11:24:41 +01:00
bfbe63275a
Define macros to 1 instead of empty values
...
In <CGAL/Mesh_3/config.h>, the macro are defined to 1, and no longer
defined to empty values.
2014-02-04 14:31:28 +01:00
874e96a553
Fix a bug of the bissection oracle (Labeled_mesh_domain_3)
...
In CGAL-4.2 and previous, when a facet f was between finite cells c1,
and c2, with different subdomain indices, the surface patch index of f
was the pair { c1->subdomain_index(), c2->subdomain_index() }, say the
pair (1, 2). Since CGAL-4.3, with
CGAL_MESH_3_NO_LONGER_CALLS_DO_INTERSECT_3, the Do_intersect functor of
the domain is no longer called, and only Construct_intersection. If the
bissection eventually found out that the bissection ended up between the
volumes labeled 1 and 3, then the returned surface patch index was
{1,3}, instead of {1,2}. That commit fixes that "bug", and restores
the behavior of CGAL-4.2.
2014-02-04 12:33:59 +01:00
2a86c88732
Add an assertion
2014-02-03 18:18:05 +01:00
777b7e8800
Fix whitespace, in three lines
2014-02-03 17:44:27 +01:00
2189f6e3d3
Fix a warning (unused local typedef)
2014-02-03 17:43:48 +01:00
9fd6f2c539
Fix a compilation error
...
When CGAL_MESH_3_NO_LONGER_CALLS_DO_INTERSECT_3 is not defined (it is
defined by default by <CGAL/Mesh_3/config.h>), there was a compilation
error.
2014-02-03 17:40:41 +01:00
f0b11abe87
Merge branch 'Mesh_3-fix_perturber_slivers_empty_bug-GF-rebased' of ssh://scm.cgal.org/var/git/cgal into Mesh_3-fix_perturber_slivers_empty_bug-GF-rebased
2014-01-31 17:33:43 +01:00
136f0ef1d1
avoid removing cells and facets twice from c3t3
...
these will be removed by move_point_topo_change_conflict_zone_known
anyway
2014-01-31 17:32:17 +01:00
c0423f1da0
remove a function which has become useless
2014-01-31 17:24:33 +01:00
652347ba8d
Better version of verify_surface()
...
It now checks if the surface patch index of a facet has changed. And it
only call the checker once per facet, instead of two.
2014-01-31 16:47:13 +01:00
680e0bfe49
New options and result types for Update_c3t3::operator()
...
- Update_c3t3::operator()(Cell_handle) returns a
boost::optional<Subdomain_index> instead of a Boolean.
- Update_c3t3::operator()(Facet) returns a
boost::optional<Surface_patch_index> instead of a Boolean.
- Update_c3t3::operator()(Facet) gets a new option that allows to update
the facet surface center, without updating the c3t3 itself.
2014-01-31 16:39:08 +01:00
c833ffc2e1
Additional assertion in restore_from_cells_backup
...
When restore_from_cells_backup() is called, one verifies that all the
backuped values are used.
2014-01-31 14:43:18 +01:00
7b9a9ce50c
Merge remote-tracking branch 'origin/Mesh_3-fix_perturber_slivers_empty_bug-GF-rebased' into Mesh_3-fix_perturber_slivers_empty_bug-GF-rebased
...
Conflicts:
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
2014-01-31 14:29:38 +01:00
53b5ea0a27
complete Update_c3t3 with remove_from_complex when appropriate
2014-01-31 14:27:57 +01:00
d497281da1
Rename a variable 'vertex' to 'old_vertex' for consistency
2014-01-31 14:27:52 +01:00
93d89ed8c4
complete update of c3t3
...
using Update_c3t3 or restore_from_cells_backup, allow updaters
to remove cells and facets from the c3t3
2014-01-31 11:41:27 +01:00
c2d55d967e
fix update_mesh_no_topo_change
...
valid_move(c3t3_cells(conflict_cells)) was computed using the outdated
c3t3-ness of cells
Now c3t3 update is done iff the surface has not been broken, and
new sliver_criterion values are computed on updated cells
2014-01-31 11:31:01 +01:00
2bbf85a79f
remove useless function
2014-01-31 10:37:49 +01:00
0b1b21bbc2
reverse comparison
2014-01-31 10:32:04 +01:00
9d64447700
fix Cell_data_backup
...
vertex indices in Cell_from_ids should not be sorted,
otherwise, what is stored in surface_patch_index[i]
does not correspond to the right i.
Copy indices to have them :
- in the original order
- and sorted (for set::find)
2014-01-30 18:36:49 +01:00
e576b213b0
move testing code to CGAL_assertion_code
2014-01-30 18:31:29 +01:00
3e395078c3
backup of cells should not be done entirely for newly created cells
2014-01-30 18:30:09 +01:00
2cf4d6fa62
complete Update_c3t3 with remove_from_complex when appropriate
2014-01-30 18:25:21 +01:00
271ae30833
Fix a warning about an unused type
2014-01-30 17:14:19 +01:00
9ac3121293
attempts to fix the bug
...
- move fill_cells_backup to before computing anything
- cells backup of sliver_value only needs cache to be valid
- comment improvement
2014-01-28 09:56:35 +01:00
976b73e1e5
make assertion stronger, and code simpler
2014-01-27 14:17:14 +01:00
385090cc72
remove break statement
...
it should have been removed at the same time as the double loop.
Improve the use of std::set::find,
and add assertion code.
2014-01-24 15:25:24 +01:00
5096f05990
remove commented assertion
2014-01-23 10:59:43 +01:00
a48a0d36b7
remove useless end of lines whitespaces
2014-01-17 17:19:51 +01:00
24a5d601aa
order IDs in Cell_from_ids to improve recovery (avoid quadratic searching)
2014-01-17 16:39:03 +01:00
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
fa21907b3d
fix the use of cpp11, and warnings.
...
note : use a array<std::size_t,4> instead of a map<std::size_t, std::size_t>
2014-01-16 11:35:05 +01:00
bae5f52c03
remove template parameter that allows not to store c3t3 info. It is actually always needed to do so
2014-01-16 11:35:05 +01:00
aa61073ef5
make the assertion more precise
2014-01-16 11:35:04 +01:00
122db0e026
don't backup infinite cells
2014-01-16 11:35:04 +01:00
8f778be277
comment the assertion that checks if sliver_cache has the same value as the computed sliverity value, because it goes against the cells meta-data backup that we are doing to speed-up and add consistency to revert_move (used when perturber failed to improve the quality of the mesh locally (sliverity may have changed of 10^-15 or so, unfortunately))
2014-01-16 11:35:04 +01:00
14ac2ccc09
add comment
2014-01-16 11:35:03 +01:00
0798f093d4
hardcode the use of std::size_t as id_type for PVertex
2014-01-16 11:35:03 +01:00
11a8050381
add a template parameter to decide whether we store c3t3 info or not in the cells meta-data backup
2014-01-16 11:35:02 +01:00
0609558919
avoid recomputing the c3t3 after each revert_move in sliver perturber.
...
The meta-data such as sliver_cache and c3t3 info are stored in an
auxiliary data, and restored after revert_move
2014-01-16 11:35:02 +01:00
7b55c30ba5
fix the use of Triangulation_cell_base_with_circumcenter
...
Triangulation_cell_base_with_circumcenter should not be responsible for
computing the circumcenter value. It is only responsible for its caching.
The Cell_base used as second template parameter should make the construction,
in the circumcenter() function.
Also fix the order of derivation in Mesh_cell_base_3
2014-01-10 14:31:02 +01:00
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
5d1eacf16f
rename get_erase_counter => erase_counter
...
And add it to the concept ObjectWithEraseCounter
2013-12-12 07:23:07 +01:00
7ad8520d8f
Merge branch 'Mesh_3-add_sliver_perturber_criteria-GF-old' into Mesh_3-add_sliver_perturber_criteria-GF
2013-12-10 15:58:46 +01:00
3d3bad7734
attempt to fix the bug about CGAL_assertion(!slivers.empty()) in Sliver_perturber.h
...
there might be inconsistencies (of a few bits) between sliver cached values (64 bits) and values computed on the fly (potentially 80 bit on some 32 bits platforms)
2013-12-10 15:49:52 +01:00
2a345ad60a
Fix an assertion when the x86 coprocessor is used
...
See the comment in the file
2013-12-10 15:20:34 +01:00
675f5b8b14
Fix a warning (unused variable)
2013-12-10 15:20:34 +01:00
7061eee190
fix a warning about missing virtual destructor
2013-12-10 14:54:28 +01:00
747ef0eade
fix access to number_of_cells() and number_of_facets() in C3t3 (these functions are documented)
2013-12-06 10:54:48 +01:00
545a7cea4a
The copy-constructor was not copying V and N
2013-11-22 18:21:28 +01:00
ec8e949d21
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-11-21 10:50:55 +01:00
a78c94b81b
fix compilation of Mesh_3 demo using new features
2013-11-18 16:11:32 +01:00
74e1bad5a4
fix a warning
2013-10-31 11:08:30 +01:00
337d8e86cb
Fix a warning
2013-10-31 11:00:27 +01:00
62de6210ad
add missing template parameter
...
(cherry picked from commit 303787d8c860c76d57120ab5d2f947bcc7be6110)
2013-10-25 15:42:06 +02:00
6561b0d811
Fix warnings
...
- Twice unused typedefs (because their uses were commented)
- Once member variables initialized in wrong order
2013-10-24 17:22:42 +02:00
9f90f2a7de
remove useless const in return types
2013-10-24 17:11:42 +02:00
c557164a44
Merge branch 'Mesh_3-add_sliver_perturber_criteria-GF-old' into Mesh_3-add_sliver_perturber_criteria-GF
2013-10-24 16:28:10 +02:00
0a7ea58e1f
rename K to Gt because it does not need to be a kernel
2013-10-24 14:22:36 +02:00
6f47edcbef
fix use of K (defined in Sliver_criterion)
2013-10-24 11:53:54 +02:00
5f495e579e
fix gcc compilation issues
2013-10-24 11:14:04 +02:00
145f01a8f6
reset sliver_cache at the end of perturbation to have them free to perturb wrt another criterion now
2013-10-22 12:50:39 +02:00
a5f7c5ab7f
add boolean template parameter to Sliver_criterion, that decides if
...
the sliver_cache should be updated by operator()(cell_handle).
It can be useful when we write a complex criterion that implies two simpler
criteria for example, and we want the cache to be updated for only one of them
(to avoid inconsistencies)
+ add a sliver_cache reset because valid_move does re-compute the cache
2013-10-21 15:24:24 +02:00
064225638b
Revert "fix compilation of my previous commit in debug mode"
...
This reverts commit 36f92c50a3
2013-10-18 14:33:55 +02:00
5b50dfad86
make use of the sliver_cache in sliver_criteria
...
warning : this assumes that sliver_cache stores the value corresponding to this criterion!
2013-10-18 13:01:57 +02:00
36f92c50a3
fix compilation of my previous commit in debug mode
2013-10-18 13:00:55 +02:00
ca249eb5f9
add an operator()(Cell_handle) to Sliver_criterion
...
this implies changing the template parameters of Sliver_criterion,
which now needs to know the Triangulation type
2013-10-18 12:38:21 +02:00
ec2b35e398
make sure the same default values as in master are used
...
- default_value (=12) for perturber,
- max_value (=90) for exuder
2013-10-17 15:48:39 +02:00
80f3618be8
complete previous commit
2013-10-17 12:18:04 +02:00
ae851c9747
remove sliver_bound_ member variable from the perturber and exuder
...
This variable is now stored exclusively in the sliver_criterion choosen for optimization.
And - remove some default parameters to avoid inconsistencies
2013-10-17 11:19:37 +02:00
fcbbe713d5
No longer deprecate Mesh_cell_base_3
...
Compact_mesh_cell_base_3 has a different API than Mesh_cell_base_3. Unless
one uses the default template parameters, the new API is less
convenient. We cannot deprecate Mesh_cell_base_3 so easily.
2013-10-16 16:34:41 +02:00
864fbaae36
Merge remote-tracking branch 'remotes/origin/Mesh_3-fix_perturber-GF' into Mesh_3-add_sliver_perturber_criteria-GF
...
Conflicts:
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
2013-10-15 11:56:25 +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
e03b9aa762
get_cc_iterator => cc_iterator
2013-10-14 17:50:37 +02:00
1855c174d6
Reverting "a second intrusive list of cells should not be used this would induce some bugs in global optimizers (because modified_cells should be an intrusive list, and we should not modify previous_intrusive and next_intrusive for cells that are not inside this list"
...
Revert "a second intrusive list of cells should not be used"
This reverts commit 8674523d10
2013-10-14 17:16:52 +02:00
924aa6a01e
Fix whitespace in recent commits
2013-10-14 17:12:54 +02:00
240385d011
Add expensive assertions to check the circumcenter cache
2013-10-14 17:12:54 +02:00
13ed8627c2
fix check_surface_mesh topology criterion
...
the vertex that is moving should not be taken into account when we compare the list of vertices of the move conflict zone before/after the move
2013-10-14 17:08:00 +02:00
8674523d10
a second intrusive list of cells should not be used
...
this would induce some bugs in global optimizers (because modified_cells should be an intrusive list, and we should not modify previous_intrusive and next_intrusive for cells that are not inside this list
2013-10-14 17:05:05 +02:00
14d78bea51
remove set_sliver_value inside debugging code to have the same behavior with and without the macro being defined
2013-10-14 15:55:41 +02:00
8744e35474
add more expensive debugging code
2013-10-11 16:29:43 +02:00
4a25da8353
add expensive debugging code
2013-10-11 16:19:34 +02:00
85beea510e
use Sliver_criterion_value functor inside Is_sliver
2013-10-11 15:08:40 +02:00
7ef932d79b
add assertion to check cache validity
2013-10-11 15:04:25 +02:00
46b39b0377
Merge branch 'Mesh_3-add_sliver_perturber_criteria-GF-old' into Mesh_3-add_sliver_perturber_criteria-GF
...
Conflicts:
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
2013-10-10 11:59:09 +02:00
3f88b4d746
Merge remote-tracking branch 'origin/Mesh_3-fix_perturber-GF'
...
- In Mesh_3, fix the sliver perturber
- the invalidatation of caches,
- the topological check (in check_surface_mesh) was not enough.
Tested in CGAL-4.3-Ic-194
2013-10-09 14:51:32 +02:00
2c78278fdc
Fix a compilation bug with older version of g++, and Boost Lambda
...
The error was triggered by the following code in CGAL/Mesh_3/C3T3_helpers.h:
template <typename CellForwardIterator>
void reset_circumcenter_cache(CellForwardIterator cells_begin,
CellForwardIterator cells_end) const
{
namespace bl = boost::lambda;
std::for_each(cells_begin, cells_end,
bl::bind(&Cell::invalidate_circumcenter, *bl::_1) );
}
See for example test results here:
CGAL-4.3-Ic-193/Polyhedron_Demo/TestReport_lrineau_i686_Linux-2.6_g++-4.1.2_CentOS-5.1.gz
2013-10-08 16:55:58 +02:00
85d880efc1
Constify two methods that can be const
2013-10-08 16:54:34 +02:00
72deb04640
fix compilation on windows
...
(cherry picked from commit 8ec9e7e2cfd51edf026807059343b4220093611e)
2013-10-08 16:51:26 +02:00
8edeb9095f
Add more comment debug outputs (for future debugging)
2013-10-08 16:11:19 +02:00
7248da1509
Fix the slivers perturber
...
The testsuite showed that our previous patch was not correct: the sliver
cache is modified by a call to C3T3_helper::min_sliver_in_c3t3_value() when
its parameter use_cache=false. For that reason, the resetting of sliver
caches was not done at the right place in update_mesh_no_topo_change().
2013-10-08 14:23:05 +02:00
55153e58b1
Fix a warning about unused local typedef
2013-10-04 18:01:17 +02:00
245250dfad
do not test inside_protecting_balls for ODT and Lloyd because it slows down the algorithm and never happens for Lloyd and ODT (experimentally tested. Maybe it can happen some day...)
2013-10-02 12:59:03 +02:00
ebd058e192
Bug fix: throw "std:runtime_exception"
2013-10-02 10:47:42 +02:00
3e0a906661
Detect if config file is missing.
2013-09-30 18:29:32 +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
f06d2057d6
Uniformize my uses of std::setprecision
2013-09-27 17:58:00 +02:00
67b20e8a19
Fix the sliver perturber
...
- the invalidatation of caches,
- the topological check (in check_surface_mesh) was not enough.
2013-09-27 17:52:57 +02:00
dd25eb2cfd
add simple check to avoid some comparisons
2013-09-26 16:45:12 +02:00
00bad608c5
add helper function
2013-09-26 16:18:48 +02:00
a05c50e83a
fix backward compatibility of Mesh_3 with intersection API v1
2013-09-25 18:13:11 +02:00
2944261214
Merge branch 'Mesh_3-parallel-cjamin' of ssh://scm.cgal.org/var/git/cgal into Mesh_3-parallel-cjamin
2013-09-25 10:50:46 +01: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
db0491a819
Modified parameter's default value (num_pseudo_infinite_vertices_per_core)
2013-09-25 11:25:11 +02:00
8a59b57dc2
Revert "set vertex weight in exuder by using old_v->set_point(p) instead of insert(p)"
...
This reverts commit f56360f94b
2013-09-24 13:58:40 +02:00
e59c57f08e
make sure that global optimizers (lloyd and odt) don't move vertices inside protecting balls
2013-09-23 16:53:44 +02:00
85eecc920f
make sure that the perturber does not insert any vertex inside a protecting ball
2013-09-23 16:35:09 +02: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
f56360f94b
set vertex weight in exuder by using old_v->set_point(p) instead of insert(p)
2013-09-20 17:02:36 +02:00
c14ea9db07
rename variable because criterion is not necessarily an angle (anymore)
2013-09-20 16:16:57 +02:00
6bc75327f5
use new sliver criterion functions before_move and valid_move to decide whether a move should be made or not
2013-09-20 16:04:26 +02:00
0270e3f03d
Fixes for GCC
2013-09-19 19:48:51 +02:00
45f2b7634f
Merge branch 'Mesh_3-fix_assertion_in_the_protection_code-lrineau'
...
Fix the test of an assertion in <CGAL/Mesh_3/Protect_edges_sizing_field.h>…
Tested in CGAL-4.3-Ic-174.
Approuved for CGAL-4.3 by the Release Manager.
2013-09-18 15:07:56 +02:00
930a7862d4
Fix the patch when CGAL_NO_ASSERTIONS is defined.
2013-09-17 11:10:42 +02:00
7b6fb384d3
Remove extra semi-colons
2013-09-17 11:03:17 +02:00
34b13affef
Try to "fix" an assertion that compares a computed value to another
...
On the paper, dleft_frac must be greater that 1.0. But with rounding
errors, it can be slightly lower. Let's try to compare it with
1.0-2*ulp(1.0).
I do not like that sort of hack but I do not know what to do best.
2013-09-17 10:58:38 +02:00
Clement Jamin
Sébastien Loriot
Aymeric PELLE
Laurent Rineau
Jane Tournois
Andreas Fabri