Commit Graph

171 Commits

Author SHA1 Message Date
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 d10359d09e Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-19 16:27:55 +01:00
Sebastien Loriot e53018d11e
Merge pull request #4565 from MaelRL/Tr-construct_point_return-GF
Triangulation_23: Grab return of construct_point() by reference when possible
2020-03-19 16:25:31 +01:00
Sébastien Loriot cf99ea072d Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-16 16:19:38 +01:00
Mael Rouxel-Labbé 0729d1b0d1 Update documentations of SDG/AG2: Filtered_exact has been removed...
... 16 years ago !
2020-03-10 15:17:50 +01:00
Mael Rouxel-Labbé 2ee69c240b Add Construct_point_2 to APL2 traits models
The traits is supposed to be a model of a concept which refines
TriangulationTraits2, which demands a model of ConstructPoint_2,
so it should have been there.
2020-03-10 12:03:47 +01:00
Laurent Rineau 2927175a65 Merge pull request #4480 from MaelRL/AP2-Remove_bad_precondition-GF
AP2: Remove bad precondition
2020-01-29 16:34:53 +01:00
Mael Rouxel-Labbé 5dd84903b1 Remove bad precondition
Might have t(p0) > tp(1), that's the sole purpose of swapping values below...
2020-01-20 17:38:24 +01:00
Laurent Rineau 99c93d02c2 Merge pull request #4426 from MaelRL/APL2-Fix_parabola_discretization-GF
Fix discretization of parabola and hyperbola segments
2020-01-15 17:31:58 +01:00
Mael Rouxel-Labbé 12e9b47501 Fix discretization of parabola and hyperbola segments:
- Fix duplicate showing up in the points
- Fix starting at positive values of k with s0&s1 negative
- Fix scaling
- Clean code
2019-12-18 16:33:25 +01:00
Laurent Rineau 144f3a1402 Merge pull request #4314 from MaelRL/APLG-Make_step_a_parameter-GF
Apollonius Graph 2: make parabola sampling a parameter of the sampling function
2019-10-29 15:23:33 +01:00
Mael Rouxel-Labbé c80abc7711 Make parabola sampling a parameter of the sampling function
The current API is not so useful because it is is not adapted to other
scales
2019-10-25 10:20:30 +02: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 8535a3c03c Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
#	Convex_hull_3/include/CGAL/convex_hull_3.h
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/face_graph_utils.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
#	Stream_support/include/CGAL/IO/Color.h
2019-06-20 14:20:37 +02:00
Laurent Rineau b0f1f90a4d Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-06-20 14:08:25 +02:00
Mael Rouxel-Labbé a6c528cd8f Derecursify Apollonius_graph_2::expand_conflict_region() 2019-06-18 13:18:25 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Andreas Fabri ad4c8b3ae4 Add typename 2019-05-03 15:15:43 +02:00
Andreas Fabri 1807c0ac68 Change tag 2019-05-03 12:22:33 +02:00
Andreas Fabri ca301e95a9 The divide is only needed for drawing purposes so we call to_double
in case the number type is a ring type
2019-05-03 12:13:50 +02:00
Laurent Rineau 7ffbf131bb Fix compilation errors 2019-05-03 10:05:48 +02:00
Andreas Fabri f4faff2137 Fix Apollonius_site 2019-01-10 17:14:12 +01:00
Andreas Fabri fb51a69c7c Mesh_2 2018-01-17 16:50:21 +00: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é 0334001bb4 AG's vertex base must define a Point type to be a model of the Vertex base concept 2017-06-28 10:15:30 +02:00
Andreas Fabri dfb37af958 test dependencies in Mesh_2 2017-04-06 13:16:35 +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
Laurent Rineau e51c4418c9 Merge pull request #1646 from afabri/Apollonius_graph-static-GF
Apollonius_graph: make variables atomic
2016-11-18 10:56:28 +01:00
Andreas Fabri ba889e3c96 Take Laurent's comments into account 2016-11-02 14:39:07 +01:00
Andreas Fabri 6dbc1986e9 make the profiling counters atomic 2016-11-01 17:39:23 +01:00
Laurent Rineau c826500c7d Merge pull request #1551 from mglisse/Number_types-gmpxx_coercion-glisse
Misc GMPXX fixes
2016-10-20 09:47:39 +02:00
Marc Glisse 606840f1e1 Specify the number type, for expression templates. 2016-10-13 08:34:11 +02:00
Sébastien Loriot 1edfe6fc27 move unused files to archive 2016-10-06 09:53:37 +02:00
Andreas Fabri 4bf70f22bd No need for thread local storage as readonly 2016-09-01 14:37:50 +02:00
Andreas Fabri beb1417477 remove unused header files; remove commented includes; changed include paths 2016-02-15 14:20:12 +01:00
Andreas Fabri c32b00acce partial cleanup of issue #595 2016-01-08 17:55:08 +01:00
Simon Giraudot 6d4d362701 Warning fix: uninitialized variable 2015-12-28 10:43:50 +01:00
Sébastien Loriot 3da2436551 avoid an unused variable warning 2015-07-22 09:11:22 +02:00
Andreas Fabri 085cc38c0b if(this) is always true 2015-07-16 16:01:51 +02:00
Andreas Fabri 03228c258f Remove a variable name in one overloaded function, as the variable is not used 2013-09-17 09:29:58 +02:00
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Menelaos Karavelas 5f9af0a0ef Merge branch 'Apollonius_graph_2-general_is_hidden-mkaravel'
* modified implementation so that the algorithm can work with pseudo-circle objects (to facilitate for example the usage by George Tzoumas for ellipses);
* replaced implementation of vertex conflict predicate by a faster version
2013-05-15 12:39:49 +02:00
Menelaos Karavelas 11a5f0514e made some portions of the code private (in the Incircle8 predicate) 2013-05-10 16:37:48 +02:00
Menelaos Karavelas df38828b43 using the faster incircle (vertex conflict) predicate 2013-05-10 15:36:40 +02:00
Laurent Rineau 403031ce7f Fix warnings 2013-02-27 18:21:24 +01:00