53d4c9b580
Simplify 'Hash_handles_with_or_without_timestamps' (use 'Get_time_stamper')
2019-10-28 11:29:08 +01:00
254d60f642
First pass on removing license notice in header for GPL files
2019-10-19 15:23:19 +02:00
7356421d80
introduce Commercial license SPDX tag
2019-10-19 12:15:19 +02:00
9bd9c68b83
update LGPL[23]+ and GPL[23]+ SPDX tags
...
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
4581f1b7a8
Morte replacements
2019-06-05 08:39:55 +02:00
c28e05be0c
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-02-23 12:50:06 +01:00
5efce459da
Mesh_3
2018-01-18 08:49:52 +00:00
8a9750709b
Moved the timestamp hash function to STL_extension (and rewrote it)
2017-12-01 08:44:12 +01:00
ba3a59ed5a
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2017-11-30 15:54:00 +01:00
9b8c5cd824
Another batch of v->point() --> tr.point(v)
2017-11-29 17:48:55 +01:00
582742b105
Moved timestamp_hash_fct from internal::mesh_3 to mesh_3::internal
2017-11-22 09:58:55 +01:00
1affc98dd1
Added class Timestamp_hash_function
...
Provides hashes for Vertex_handle-like classes. The hash will be based on
the timestamp member if the vertex has one, and on its memory address otherwise.
2017-11-21 17:22:39 +01:00
ee57fc2d6c
add SPDX identifier for files under the GPL-3+ license
2017-11-12 10:17:51 +01:00
4dc0053b1a
Fixed point type
2017-11-10 11:33:20 +01:00
78b32eb91b
Fixed trailing whitespace (no real changes)
2017-11-06 13:19:14 +01:00
e2b33c4948
Progress on periodic optimizers
...
- Replaced a lot of v->point() with tr.point(v) & similar
- Fixed taking references to temporary:
we can't do "F(construct_point_3_object()(tr.point(c, i)))" for periodic
triangulations because tr.point(c,i) is _not_ a reference
- Added some sanity checks to debug Lloyd optimization
- Fixed some indentation
2017-10-29 21:31:59 +01:00
faf023b988
Merge pull request #2541 from lrineau/Mesh_3-fix_NaN-lrineau
...
Fix a perturber bug
2017-10-23 17:14:18 +02:00
6be9fcab9d
Forbid the use of CGAL_MESH_3_USE_RELAXED_HEAP
...
That code using a Boost relaxed heap is buggy. Let's warn the developer
that he/she must not use it.
2017-10-19 15:14:01 +02:00
cc8d0da913
Fixed (almost all) default constructed traits in Mesh_3
...
Also fixed constructing points/weighted_points not through the traits and
uses of point().point()
2017-06-28 10:14:35 +02:00
780e01dc90
WIP: test_meshing_polyhedron_with_features compiles and crashes in odt
2017-06-28 10:14:35 +02:00
787d46ffb8
Disable Point_3(const Weighted_point_3&)
2017-06-28 10:14:35 +02: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
59cedfc7dd
Fix Mesh_3
2016-11-03 13:08:31 +01:00
c4faaa99fd
remove static variables
2016-09-26 16:23:23 +02:00
77e6772aa7
Use Real_timer in Mesh_3 since the algorithms might be parallel
...
And update the doc accordingly
2015-10-08 15:26:50 +02:00
74e71f41e2
Remove uses of Boost.Lambda
...
Replace Boost.Lambda with simple loops. The library is not maintained
and no one is going to ever invest in it again. It adds to compile and
preprocessing times without providing safer or shorter code and we can
sacrifice a little bit of readability.
2015-04-13 17:24:08 +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
6f7587c6dd
Fix small differences between master and Mesh_3-parallel
2014-07-16 14:13:40 +02:00
19158bac27
Remove warnings about unused parameters
2014-07-10 14:41:42 +02:00
e5c89d7139
Use atomics for the perturbation timers
...
To fix later: the timer are wrong on the parallel version because each threads
counts and adds the CPU time to the total time
2014-07-08 16:27:25 +02:00
da4cf8fc1d
Fix gcc warnings (reorder + unused variables & typedef...)
2014-07-03 15:54:39 +02:00
e3abf7fc40
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-07-01 10:38:14 +02:00
1a8bc68ade
Fixed compilation with GCC + removed useless template params
2014-06-12 17:27:14 +02:00
e176240e31
Replaced some C++11 lambda functions by functors
2014-06-02 12:52:53 +02:00
cfae6c3bca
Remove assertion which is not valid in parallel
2014-05-27 13:14:42 +02:00
d130b32702
Clean-up
2014-05-23 15:48:49 +02:00
5576570846
Clean-up temporary/debug code
2014-05-23 14:42:51 +02:00
27dccd8710
Missing CGAL_ prefix
2014-05-20 19:14:55 +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
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
aa61073ef5
make the assertion more precise
2014-01-16 11:35:04 +01:00
0798f093d4
hardcode the use of std::size_t as id_type for PVertex
2014-01-16 11:35:03 +01:00
5d1eacf16f
rename get_erase_counter => erase_counter
...
And add it to the concept ObjectWithEraseCounter
2013-12-12 07:23:07 +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
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
Mael Rouxel-Labbé
Sébastien Loriot
Andreas Fabri
Laurent Rineau
Clement Jamin
Philipp Möller
Jane Tournois