Commit Graph

66 Commits

Author SHA1 Message Date
Maxime Gimeno 3e03d50b8a replace usages of CGAL::cpp11::atomic and thread by std:: calls 2021-05-07 11:10:30 +02:00
Maxime Gimeno e9b7595fff Deprecate CGAL headers for threads, atomic and result_of, and move their content to config.h as fallback 2021-05-07 11:09:24 +02:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 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
Laurent Rineau 8648a72655 Add new Boost Parameter `nonlinear_growth_of_balls` 2019-05-03 15:49:49 +02:00
Laurent Rineau a1e3e05558 Add maximal_number_of_vertices and stop_ptr to the protection code 2019-05-03 11:46:13 +02:00
Sébastien Loriot 62a8391fde Merge pull request #3242 from lrineau/Mesh_3-fix__add_stop_with_TBB-GF
Mesh 3 fix: add the possibility to stop the algorithm, when Parallel_tag is used
2018-07-25 18:59:46 +02:00
Laurent Rineau ae1e1439cf Fix the issue with the preprocessor 2018-07-23 11:15:26 +02:00
Laurent Rineau ea6da4cb07 Fix for CGAL_NO_ATOMIC (with old Boost and C++<=03) 2018-07-20 16:33:02 +02:00
Laurent Rineau ba21ecb66a Add the possibility to stop Mesh_3 with TBB 2018-07-18 18:26:08 +02:00
Mael Rouxel-Labbé 7ea3a8044e Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-05 14:39:18 +02:00
Laurent Rineau 2766e1ff5d Merge 'master' and fix conflicts 2018-05-28 16:40:09 +02:00
Andreas Fabri 6e828da0e9 Move stuff to CGAL/boost/parameter 2018-05-23 11:48:59 +02:00
Laurent Rineau 0400eb6c4b Cleanup included header for Boost Parameters 2018-05-15 14:56:21 +02:00
Mael Rouxel-Labbé 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
Andreas Fabri 4ef0bdbcb6 Suppress this warning not globally in disable_warnings.h 2018-01-24 14:21:16 +00:00
Andreas Fabri 5efce459da Mesh_3 2018-01-18 08:49:52 +00:00
Mael Rouxel-Labbé f222d0fd13 Tiny indentation fix 2017-12-15 16:25:53 +01:00
Mael Rouxel-Labbé 4a172154f3 Changed Mesh_options' number_of_initial points to have '-1' as default
'0' is now considered a valid number of input points. This is useful
for P3M3 because it might be impossible to construct initial points.

This also aligns with the default value in the C3T3_initializer class.
2017-12-15 16:25:29 +01:00
Mael Rouxel-Labbé 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
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Mael Rouxel-Labbé 9e6f6afdc4 Fixed doc & comment in refine_mesh_3_impl 2017-11-10 11:32:50 +01:00
Mael Rouxel-Labbé 1f0de91fe2 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-11-02 15:19:38 +01:00
Mael Rouxel-Labbé c038e25f98 Fixed trailing whitespace in refine_mesh_3.h (no real changes) 2017-10-31 15:06:39 +01:00
Mael Rouxel-Labbé 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
Laurent Rineau de938ea79f Cherry-pick, then adapt, two old commits:
|commit 6a76062ba692f284cdca8b4504fbf5000c942c39
  |Author: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
  |Date:   Wed Aug 29 10:15:10 2012 +0000
  |
  |    Add a way to specify a maximal number of vertices. That aborts the meshing.
  |
  |Notes:
  |    r71799 branches/features/Mesh_3-experimental-GF

  | commit 9d501d0bef44cf0e3419299947c1b7ccfd0e87d8
  | Author: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
  | Date:   Wed Aug 29 16:14:13 2012 +0000
  |
  |     A pointer to a CGAL::Mesh_error_code (an enum) can be passed to Mesh_3
  |
  | Notes:
  |     r71818 branches/features/Mesh_3-experimental-GF
2017-10-23 18:53:42 +02:00
Laurent Rineau 0ddad74fe0 Change the API of the manifold criterion 2017-09-27 16:21:43 +02:00
Jane Tournois f4c8415dca add Manifold_options as a new boost parameter name for Mesh_3
there are 3 possible values for this parameter :
manifold(),
manifold_with_boundary(),
non_manifold() //the default

it will eventually replace the part of Mesh_facet_topology
that is dedicated to MANIFOLD
2017-09-19 16:04:29 +02:00
Mael Rouxel-Labbé 5716601d01 Fixed various Bare_point / Weighted_point usage across Mesh_3
Hopefully, this is the last batch
2017-06-28 10:14:35 +02:00
Laurent Rineau 760076510c Merge pull request #1845 from lrineau/Mesh_3-fix_detect_features-GF
Various modifications of Mesh_3
2017-02-06 15:19:31 +01:00
Laurent Rineau 9b05a3a5a9 Replace CGAL_MESH_3_NO_PROTECTION_NON_LINEAR by a Boolean
The Boolean `nonlinear_growth_of_balls` can be set by the
non-documented API:
  - the function `Protect_edges_sizing_field::set_nonlinear_growth_of_balls()`,
  - the Boolean `Mesh_3_options.nonlinear_growth_of_balls`.

Of course the demo sets that Boolean when possible.
2017-01-25 16:18:10 +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
Laurent Rineau 3299b4b906 Do not dump after optimisers that are not used 2016-04-01 16:17:08 +02:00
Laurent Rineau 8324d8eceb bug-fix: invalidate the "manifold info" after refine().
The global optimizers destroy the manifold info. It must be invalidated.
2016-01-05 17:40:40 +01:00
Laurent Rineau 7b53a337af Merge pull-request #483 from 'janetournois/Mesh_3-gray_level_image_oracle-lrineau'
Conflicts:
	.gitignore
	Mesh_3/include/CGAL/IO/File_medit.h
2016-01-05 14:58:18 +01:00
Laurent Rineau d8c2f1a851 Remove Mesh_3 warnings in Boost.Parameters 2015-12-18 14:44:56 +01:00
Jane Tournois f7efee8977 fix the use of the default number of initial points
it depends on the type of domain
2015-11-24 12:23:45 +01:00
Jane Tournois 44f940164a add to mesh_3_options the ability to set the number of initial points from make_mesh_3
this is an undocumented internal feature
mainly for testing purposes
2015-11-23 16:48:15 +01:00
Clement Jamin 01b81c5bcb Fix GCC compilation 2014-07-08 16:17:51 +02: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 a0948a9dac Remove the "domain" parameter of the exuder
It had been added for the parallel version, but it's not needed anymore
2014-07-01 11:34:40 +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
Laurent Rineau cf5d6e041e Use pragmas to fix warnings 2014-04-10 20:06:04 +02:00
Clement Jamin 206b20bc15 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2013-07-02 17:37:50 +02:00
Jane Tournois d67db385fa Merge branch 'Mesh_3-improvements-GF-old' into Mesh_3-improvements-GF
Conflicts:
	Mesh_3/include/CGAL/refine_mesh_3.h
2013-03-21 11:22:15 +01:00
Laurent Rineau 220ddbf6b2 New macro CGAL_GCC_VERSION to help preprocessor conditionals on gcc version
And use it in <CGAL/refine_mesh_3.h>
2013-02-27 19:58:02 +01:00
Clement Jamin 1cd6747196 The exuder is now parallel.
NB: Added a "MeshDomain" template parameter to the Slivers_exuder class.
2013-01-30 17:26:30 +01:00
Laurent Rineau c58bd4f8fb Merge from next up to revision 70936 2012-08-02 12:18:09 +00:00