Maxime Gimeno
c49152359c
update max version of cmake and announce the new minimal in CHANGE.md
2021-04-15 15:08:54 +02:00
Maxime Gimeno
17602e589e
Merge remote-tracking branch 'cgal/master' into CGAL-clang_tidy__nullptr_on_Mesh_2-GF
2021-04-07 09:17:51 +02:00
Maxime Gimeno
cc99fd94ad
Demo Pass
2021-02-19 16:02:12 +01:00
Dmitry Anisimov
81d9556707
Merge remote-tracking branch 'upstream/master' into Kernels-decltypes-danston
2021-02-10 10:06:45 +01:00
Dmitry Anisimov
263ad6bc99
fixed ch3, inter3, otr2, psp, pmp, smsp, mesh3 + cleanup
2020-08-20 18:25:01 +02:00
Maxime Gimeno
9c15f2c9dc
Use FeatureSummary in the demo, and remove CGAL_FOUND
2020-08-04 12:46:17 +02:00
Maxime Gimeno
08ce5f17a8
Fix more warnings
2020-06-15 10:37:58 +02:00
Sébastien Loriot
2e180ac589
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 19:29:44 +01:00
Sébastien Loriot
a0345b135c
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 19:29:05 +01: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
Sébastien Loriot
0a46621dc6
Merge branch 'cgal/releases/CGAL-4.14-branch'
...
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot
590612a563
run the script to remove tabs and trailing whitespaces
2020-03-26 13:25:16 +01:00
Simon Giraudot
37a6a4360f
Fix warnings
2020-03-19 15:50:22 +01:00
Mael Rouxel-Labbé
3c7eb2c6b9
Use CGAL_PI instead of hardcoding it
2020-01-07 15:31:07 +01:00
Laurent Rineau
15d9e1f0ff
Restore the alphabetical order of `dependencies` files
2019-10-31 14:41:37 +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
4fbf00fb8a
CMake>=3.13: opt for for new policies up to 3.15
2019-06-19 14:34:59 +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
Sébastien Loriot
ce126b87c6
remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead
2019-03-29 13:28:32 +01:00
Laurent Rineau
8693f95dac
Merge pull request #3619 from albert-github/feature/bug_headers
...
Update of headers
2019-02-22 16:39:09 +01:00
Andreas Fabri
f3c5d11884
Don't suppress warnings
2019-02-18 08:40:08 +01:00
Sébastien Loriot
59bc453b42
first batch of replacement for level 1 in classified ref man
...
command used:
grep -l "##" */doc/*/PackageDescription.txt | xargs sed -i -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +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
Laurent Rineau
afc3de2894
Merge branch 'master' into Stream_support-Color-GF
2019-01-23 09:37:08 +01:00
Laurent Rineau
6ffd76a87e
Merge pull request #2792 from afabri/Intersections_3-Add_missing_do_intersect-GF
...
Intersections_3: Add missing do_intersect() overloads
2019-01-18 16:37:54 +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
Laurent Rineau
e4461a9057
Merge pull request #3543 from sloriot/Doc-multiple_fixes
...
Remove duplicate definition
2018-12-19 16:01:10 +01:00
Sébastien Loriot
c8dcfbf64d
remove duplicate definition
2018-12-13 08:51:44 +01:00
Maxime Gimeno
d6cfa1a868
Fix CMake warnings about CMP for Visual 2017
2018-11-21 16:17:39 +01:00
Guillaume Damiand
7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand
2018-11-05 07:32:58 +01:00
Maxime Gimeno
aee51d4b42
Add Dependency to Distance_3
2018-11-02 11:36:43 +01:00
Sébastien Loriot
8018acbf18
unsigned -> unsigned int
2018-10-30 14:02:16 +01:00
Laurent Rineau
821f9c015e
Merge pull request #3311 from sloriot/Doc-Pkg_link_name
...
Update the name of package names reference links
2018-10-29 10:27:53 +01:00
Guillaume Damiand
ef771d0f97
Re-add include({CGAL_USE_FILE}) is demo with core or image io, and set(CMAKE_INCLUDE_CURRENT_DIR ON) in others.
2018-10-19 09:51:14 +02:00
Guillaume Damiand
92ba7fa6c9
Update minimum cmake required version in all CMakeLists.txt
2018-10-18 14:49:23 +02:00
Guillaume Damiand
0bd9088b5a
Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required.
2018-10-17 14:17:08 +02:00
Laurent Rineau
8718bcef60
Merge pull request #3338 from maxGimeno/OTR_2_demo-Fix_header_guard-GF
...
Optimal_transportation_reconstruction_2: Remove random.h
2018-10-08 15:13:35 +02:00
Sébastien Loriot
ea240cfac5
use \PkgXXX instead of \PkgXXXSummary
2018-10-08 10:28:44 +02:00
Sébastien Loriot
a2e8a1c68f
add the suffix Ref to doxygen link to reference
2018-10-08 10:26:56 +02:00
Maxime Gimeno
d5dbdcba25
Replace random.h by CGAL::Random
2018-09-18 10:20:57 +02:00
Maxime Gimeno
63cb481dd2
Change header guard to something not forbidden.
2018-09-17 12:28:10 +02:00
Sébastien Loriot
376bc42716
update URL and use https
2018-09-04 13:29:51 +02:00
Mael Rouxel-Labbé
26c857a431
Moved unary/binary_function to CGAL::cpp98
2018-06-13 15:58:19 +02:00
Laurent Rineau
0a74393dcf
Commit all new dependencies files
2018-03-06 18:44:48 +01:00
Laurent Rineau
697ed680ee
Merge pull request #2803 from sgiraudot/OTR-Fix_error_test_vertex_edge-GF
...
OT Reconstruction: Fix test_vertex_edge bug by not copying the TDS
2018-02-14 15:34:46 +01:00
Simon Giraudot
7536af7106
Fix test_vertex_edge bug by not copying the TDS
2018-02-07 14:43:09 +01:00
Maxime Gimeno
688b5dd06e
Move dependencies creation to package_info and add dependencies to git
2018-02-02 12:08:05 +01:00
Maxime Gimeno
8bde832931
Fix METIS headers in BGL
2018-02-02 12:08:05 +01:00
Maxime Gimeno
a676d5a60e
Try to fix errors in classification checks
2018-02-02 12:08:05 +01:00
Maxime Gimeno
acd0a72edf
Modify travis script to test dependencies
2018-02-02 12:08:05 +01:00
Maxime Gimeno
ae36b452bc
Add dependencies of all packages
2018-02-02 12:08:05 +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
a2f58027ee
Use new PSP API in OTR demo
2018-01-12 09:59:43 +01:00
Simon Giraudot
367c6cfc69
Fix warnings
2018-01-12 09:59:43 +01:00
Sébastien Loriot
5226311108
use OpenGL function through the viewer
2018-01-12 09:59:43 +01:00
Simon Giraudot
897021677e
Use CGAL::approximate_sqrt() to handle exact kernel
2018-01-12 09:59:43 +01:00
Simon Giraudot
0fa9e17213
Remove deprecated std::unary_function
2018-01-12 09:59:42 +01:00
Simon Giraudot
403420a6d8
Remove OTR_NO_TOLERANCE macro
2018-01-12 09:59:42 +01:00
Simon Giraudot
bb13a0e7ef
Add new figure for Wasserstein tolerance example (+ minor fixes in user manual)
2018-01-12 09:59:42 +01:00
Simon Giraudot
ae3dfd8c1f
Fix comments in example (from review)
2018-01-12 09:59:42 +01:00
Simon Giraudot
ab08e1e499
Document run_under_wasserstein_tolerance() in user manual
2018-01-12 09:59:42 +01:00
Simon Giraudot
f3bf054a23
Add new example with Wasserstein tolerance
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
f54a26f987
More decimalson the dialog window
2018-01-12 09:59:41 +01:00
Simon Giraudot
9c852ec864
Fix uninitialized variable
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
69447be1f7
Update demo to handle tolerance based API
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
Simon Giraudot
685f8e4701
Update demo with Wasserstein tolerance API
2018-01-12 09:59:40 +01:00
Laurent Rineau
3c6640bf59
Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
...
Renewal of CMake scripts: header-only, ctest, CMake>=3.1
# Conflicts:
# Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Maxime Gimeno
30171e03ee
fix opr2 demo
2017-11-29 11:34:26 +01:00
Maxime Gimeno
66df33abea
Use Qt opengl in remaining demos
2017-11-29 11:34:26 +01:00
Laurent Rineau
6ec4c12031
Do not use OpenGL directly, but only using Qt5 OpenGL classes
2017-11-28 17:58:12 +01:00
Laurent Rineau
25dffa1710
Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED
2017-11-17 12:54:13 +01:00
Laurent Rineau
bbee705221
Add compilation tests for demos
2017-11-16 18:38:15 +01:00
Laurent Rineau
a9365554c9
Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
...
Add SPDX License Identifier
2017-11-15 16:48:27 +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
62c70d41ca
Renew the handle of policies, for CMake-3.10
...
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.
`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Maxime Gimeno
5ae96fc2aa
Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found.
2017-05-23 16:12:56 +02: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
a89ccb10e7
remove non UTF-8 characters
2017-01-19 15:20:26 +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