Commit Graph

121 Commits

Author SHA1 Message Date
Laurent Rineau e3934f181f Merge branch 'master' into Mesh_2-more_CGAL_MESH_2_DEBUG_REFINEMENT_POINTS-GF
# Conflicts:
#	Mesh_2/include/CGAL/Delaunay_mesh_vertex_base_2.h
2021-05-12 15:20:27 +02:00
Laurent Rineau 34c2915637 Add a new debugging macro CGAL_MESH_2_DEBUG_REFINEMENT_POINTS 2021-05-12 14:47:25 +02:00
Michael Hemmer 09974cf643
Update Refine_edges_with_clusters.h
Use CGAL_NTS macro instead of CGAL::to_double
2020-10-21 15:27:28 +02:00
Michael Hemmer 46b7c73e37
Allow Epec in Refine_edges_with_clusters
Allow instantiation of Refine_edges_with_clusters with EPEC.

This should be a null op with Epic.
2020-10-20 16:58:36 +02:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01: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
Andreas Fabri 48fedbae06 Typos: splitted -> split 2019-12-11 16:57:34 +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
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Sébastien Loriot b0b80148ea remove deprecated file 2018-08-21 14:03:11 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Andreas Fabri fb51a69c7c Mesh_2 2018-01-17 16:50:21 +00:00
Laurent Rineau 1c2e9df8cf Merge branch 'releases/CGAL-4.11-branch' 2017-12-19 16:29:10 +01:00
Laurent Rineau 5181cd7474 Merge branch 'releases/CGAL-4.10-branch' into releases/CGAL-4.11-branch
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h
2017-12-19 16:19:22 +01:00
Jane Tournois c55d75ede8 sq_circumradius cannot be computed on an infinite facet
there was no need to check if a face is in domain, but we still need to check
whether it is infinite
2017-12-15 10:24:11 +01:00
Jane Tournois e888bd46c1 the convergence criterion does not need to check "is_in_domain" for incident faces
anyway we do not compute the criterion for constrained vertices, nor for non-moving vertices
2017-11-13 15:31:36 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Laurent Rineau 488c3e2879 Merge pull request #2462 from sloriot/CGAL-fix_warnings_g++7
Fix some warnings
2017-10-13 17:04:02 +02:00
Laurent Rineau 00d444e84c Merge pull request #2462 from sloriot/CGAL-fix_warnings_g++7
Fix some warnings
2017-10-13 16:54:52 +02:00
Laurent Rineau c9cc90e630 Merge pull request #2467 from lrineau/Mesh_2-fix_clusters-GF
Mesh 2: fix clusters (issue #2456)
2017-10-11 19:14:33 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Laurent Rineau 81662e0c00 More Mesh_2 debug, for clusters 2017-09-26 15:13:53 +02:00
Laurent Rineau a2dd20af02 Bug fix
Fix #2456

When two clusters share a subsegment, the subsegment is split at its
middle, instead of using the length imposed by the clusters. If the
clusters were partially refined before that subsegment is split, one
must reset the clusters, because the minimal length may have changed.
2017-09-26 15:13:53 +02:00
Sébastien Loriot c3e7ade8b4 fix warnings 2017-09-25 09:09:54 +02: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
Sébastien Loriot 19ab4c1907 fix non utf-8 character 2017-01-19 15:20:24 +01:00
Andreas Fabri f9ada57886 Mesh_2: Initialize to avoid warning 2016-11-14 09:14:30 +01:00
Laurent Rineau 3f052834bd Split Mesh_2
There is a new `Mesher_level` package, that gathers the foundation
files (mesher levels and auxiliary files) for `Mesh_2`,
`Surface_mesher`, and `Mesh_3`.
2016-09-30 15:23:16 +02:00
Laurent Rineau 51f5697d3d Add missing #include 2016-09-30 15:23:14 +02:00
Laurent Rineau a59084cc79 Fix missing includes 2016-09-30 15:22:26 +02:00
Sébastien Loriot 443b8cc2d7 precompute area functor 2016-02-01 10:23:29 +01:00
Sébastien Loriot 72c8aa7b05 make 2D-lloyd working with the projection traits 2016-01-29 15:16:51 +01:00
Jane Tournois 828eed2b24 calling a constructor from a constructor is cpp11 2015-05-19 10:01:00 +02:00
Jane Tournois 8511ff88b8 add copyright 2015-05-19 09:07:54 +02:00
Jane Tournois 13aa560db6 fix warning about variable "tr" not used 2015-05-19 09:07:54 +02:00
Andreas Fabri 2cda7ff7f6 min() -> (min)() 2015-05-19 09:04:28 +02:00
Andreas Fabri 74c817fe7f Add an include 2015-05-19 09:04:27 +02:00
Jane Tournois 9322f881c5 fix unused variable, and implement barycentric coordinates on an edge 2015-05-19 09:04:27 +02:00
Jane Tournois cc801f779f fix unused parameter warnings 2015-05-19 09:04:26 +02:00
Jane Tournois f8c3ef0a30 fix compilation for (max) 2015-05-19 09:04:26 +02:00
Jane Tournois c7138ff48d add barycentric coordinates to compute sizing at p inside a face
+ add code to interpolate on finite vertices of an infinite face

they are not used by default because it's expensive, unless the macro
CGAL_MESH_2_SIZING_FIELD_USE_BARYCENTRIC_COORDINATES is defined.
Can be useful to be more precise about the sizing
2015-05-19 08:54:35 +02:00
Jane Tournois 4cf8655c00 move all the cdt.dual(v) code from Triangulation_2 to Mesh_2
we do not change the API of Triangulation_2 for now
maybe later, and this version should be easy to keep backward compatible
2015-05-19 08:54:33 +02:00
Jane Tournois 2b7d774c36 fix the convergence criterion 2014-11-28 12:59:31 +01:00
Jane Tournois bd08614cc1 fix compilation 2014-11-24 17:01:14 +01:00
Jane Tournois 7e037664e6 fix compilation when verbose mode is off 2014-11-24 17:00:29 +01:00