Commit Graph

82 Commits

Author SHA1 Message Date
Sébastien Loriot 3e77bff198 Merge remote-tracking branch 'cgal/6.0.x-branch' into 'cgal/6.1.x-branch' 2025-10-13 09:41:18 +02:00
Sven Oesau 2f6e3defa7 using timestamps to make iteration through vertices, edges and faces deterministic 2025-10-01 13:42:30 +02:00
Mael Rouxel-Labbé 613e629524 ie > i.e. 2025-03-28 21:04:43 +01:00
Sébastien Loriot b66afab814 Merge remote-tracking branch 'sloriot/CGAL-using_c++17_stl' into HEAD 2023-07-05 11:29:35 +02:00
Sébastien Loriot 9a0bdb5d96 boost::variant ---> std::variant 2023-06-15 10:57:10 +02:00
Sébastien Loriot 604dcdc435 boost::optional => std::optional 2023-06-15 10:57:09 +02:00
Sébastien Loriot c1294a0eaa boost::integral_constant ---> std::integral_constant 2023-04-29 09:42:15 +02:00
Sébastien Loriot 5726a0a255 boost::is_floating_point -> std::is_floating_point
boost::is_float
2023-04-23 22:37:07 +02:00
Laurent Rineau 5f8930db8c Merge branch '5.5.x-branch'
# Conflicts:
#	Convex_hull_2/test/Convex_hull_2/ch_test_CH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SC.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SS.cpp
#	Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
#	Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
2023-01-27 21:16:14 +01:00
Andreas Fabri 793801cd8b Fix conversion warning 2023-01-03 07:36:46 +00:00
Andreas Fabri 939a6a2b80 Make the demo work again 2023-01-02 13:17:17 +00:00
Andreas Fabri 01fd45b0a9 fixes 2022-12-22 15:12:02 +00:00
Andreas Fabri d6ec19226d Optimal Transport Reconstruction: Fix memory leak 2022-12-22 14:22:40 +00:00
albert-github eed54a0ae5 spelling corrections
Some spelling corrections (Directories starting with `O`-`S` , first part),
some backward work
some forward work
2022-11-15 18:45:39 +01:00
Sébastien Loriot 9847fd7e6e fix \cond \endcond mismatches 2022-01-04 08:42:04 +01:00
Dmitry Anisimov 263ad6bc99 fixed ch3, inter3, otr2, psp, pmp, smsp, mesh3 + cleanup 2020-08-20 18:25:01 +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
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Marc Glisse a676b75ca0 Misc fixes for expression templates 2019-05-17 19:48:41 +02:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Laurent Rineau fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF
Fix warnings (Add/remove copy constructors, and other warnings)

Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
2019-02-13 15:25:07 +00:00
Laurent Rineau 5cc356a888 Merge pull request #3639 from sgiraudot/OTR-Fix_copy_star-GF
OTR: Fix validity of triangulation
2019-02-13 15:38:50 +01:00
Simon Giraudot a231468530 Remove useless parameter 2019-02-08 09:53:20 +01:00
Simon Giraudot ac752c05a7 Fix verbosity 2019-01-29 13:31:54 +01:00
Simon Giraudot 74b7e92ef5 Add a validity check when flipping and collapsing 2019-01-29 13:19:50 +01:00
Simon Giraudot 8abbebaadf Make copy_star() create a valid Triangulation_2 2019-01-29 13:19:50 +01:00
Andreas Fabri d03a49b5ae Fix OTR 2019-01-18 16:05:52 +01:00
Andreas Fabri 4bb714fd7b Fix OTR and T2 2019-01-18 10:34:47 +01:00
Sébastien Loriot 8018acbf18 unsigned -> unsigned int 2018-10-30 14:02:16 +01:00
Sébastien Loriot 376bc42716 update URL and use https 2018-09-04 13:29:51 +02:00
Simon Giraudot 7536af7106 Fix test_vertex_edge bug by not copying the TDS 2018-02-07 14:43:09 +01:00
Laurent Rineau f310fc588d
Merge pull request #2690 from sgiraudot/Classification-ETHZ_random_forest-GF
Classification: ETHZ Random Forest
2018-02-01 17:35:30 +01:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Simon Giraudot 897021677e Use CGAL::approximate_sqrt() to handle exact kernel 2018-01-12 09:59:43 +01:00
Simon Giraudot 403420a6d8 Remove OTR_NO_TOLERANCE macro 2018-01-12 09:59:42 +01:00
Simon Giraudot 1b05ce304b Add a note on Wasserstein distance to make it clear it is not Hausdorff 2018-01-12 09:59:42 +01:00
Simon Giraudot 7b8186a05b Load XY files with weights, compute average spacing and better displays 2018-01-12 09:59:41 +01:00
Simon Giraudot 7843436277 Generalization: use total weight instead of number of samples (useful if weights != 1) 2018-01-12 09:59:41 +01:00
Simon Giraudot a32d3534ac Keep track of the number of samples for edges and costs 2018-01-12 09:59:41 +01:00
Simon Giraudot 69f3917e66 Make tolerance homogeneous to a distance 2018-01-12 09:59:41 +01:00
Simon Giraudot e38b12c83f Add method to run the algorithm under a Wasserstein tolerance 2018-01-12 09:59:40 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Simon Giraudot ab33988eb5 Remove unused parameter 2017-05-16 14:13:43 +02:00
Simon Giraudot b1268f0a95 Silence unused argument 2017-05-16 14:13:43 +02:00
Simon Giraudot 4166de5024 Fix warning unused variable 2017-05-16 14:13:43 +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
Andreas Fabri d872b4131e make a static variable of a member function class local 2016-11-07 15:20:37 +01:00