Sebastien Loriot
c602038db9
Merge pull request #4559 from sgiraudot/Spatial_searching-Parallelize_kd_tree_build-GF
...
[Small Feature] Parallelize KD Tree build
2020-05-05 14:35:02 +02:00
Sebastien Loriot
fea3a179bf
Merge pull request #4505 from sgiraudot/Tutorials-GIS-GF
...
[Small Feature] GIS Tutorial
2020-04-29 15:15:55 +02:00
Simon Giraudot
7702f57620
Merge remote-tracking branch 'mine/Spatial_searching-Parallelize_kd_tree_build-GF' into Spatial_searching-Parallelize_kd_tree_build-GF
2020-04-27 10:24:28 +02:00
Maxime Gimeno
e9d41d7b7d
Fixes for min/max
2020-04-21 11:38:37 +02:00
Simon Giraudot
c03e69d5ae
Fix get<>() error on windows
2020-04-20 08:56:08 +02:00
Simon Giraudot
95b9f05a28
Merge remote-tracking branch 'mine/Spatial_searching-Parallelize_kd_tree_build-GF' into Spatial_searching-Parallelize_kd_tree_build-GF
2020-04-16 17:03:44 +02:00
Simon Giraudot
a08a1e950d
Merge remote-tracking branch 'mine/Tutorials-GIS-GF' into Tutorials-GIS-GF
2020-04-16 16:56:13 +02:00
Simon Giraudot
7cfe6df8e3
Allow classification package to be used without Boost IO Stream and Serialization
2020-04-07 11:02:16 +02:00
Simon Giraudot
9e2ce819f0
Merge remote-tracking branch 'mine/Tutorials-GIS-GF' into Tutorials-GIS-GF
2020-04-07 10:15:50 +02:00
Sébastien Loriot
d42113bbaf
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 19:35:20 +01:00
Sébastien Loriot
f1e5569404
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 19:35:02 +01:00
Sébastien Loriot
47027d6f5b
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 18:59:19 +01:00
Sébastien Loriot
4421fff65f
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 18:58:50 +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
Mael
855003baa1
Merge branch 'master' into BGL-Alpha_expansion_graphcut-GF
2020-03-24 08:18:23 +01:00
Simon Giraudot
fe90d1ca1f
Include parallel KD tree build in classification
2020-03-05 14:35:24 +01:00
Simon Giraudot
345d22ae5a
Add polyline simplification to GIS tutorial + several fixes
2020-02-04 14:35:39 +01:00
Simon Giraudot
310defc2b3
Add useful label set constructor using initializer list
2020-02-03 16:26:30 +01:00
Simon Giraudot
a118f0f979
Make evaluation comply with range concept
2020-02-03 16:26:03 +01:00
Simon Giraudot
29ac68fb26
Make training comply with range concept
2020-02-03 16:25:29 +01:00
Mael
8f29c7cb63
Merge branch 'master' into CGAL-Parallel_if_available_tag
2020-01-29 16:42:54 +01:00
Laurent Rineau
315a0b54d1
Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno
...
TBB deprecated code replacement
2020-01-29 16:27:53 +01:00
Maxime Gimeno
213852c474
Forgot Classification
2020-01-22 10:33:51 +01:00
Simon Giraudot
764fa731ee
Merge remote-tracking branch 'mine/BGL-Alpha_expansion_graphcut-GF' into BGL-Alpha_expansion_graphcut-GF
2020-01-15 13:45:30 +01:00
Maxime Gimeno
85712ba28c
WIP replacing tbb deprecated includes.
2020-01-14 15:03:20 +01:00
Laurent Rineau
65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin
2019-12-03 19:18:15 +01:00
Mael Rouxel-Labbé
e73b973b62
Use Parallel_if_available_tag to simplify code that used CGAL_LINKED_WITH_TBB
2019-11-20 12:24:54 +01:00
Sébastien Loriot
b9a079b530
remove cpp11/cpp0x
2019-11-04 11:34:53 +01:00
Simon Giraudot
c43c6ac2fa
Merge remote-tracking branch 'clement/Faster_dd_spatial_searching-cjamin' into Faster_dd_spatial_searching-cjamin
2019-10-22 13:21:53 +02:00
Sébastien Loriot
0228f1e4ee
update SPDX tag to use the original customer license
...
The license notice in the headers are not in the original headers
2019-10-20 10:43:11 +02:00
Sébastien Loriot
e74473ed28
remove license notice from Random Forest classif
2019-10-20 01:04:43 +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
Maxime GIMENO
4e4dd7986a
Remove sneaky backquote
2019-09-30 09:10:45 +02:00
Laurent Rineau
1bce3f7909
Merge branch 'releases/CGAL-4.14-branch'
2019-09-27 16:25:29 +02:00
Laurent Rineau
0b66eb0d23
Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
...
# Conflicts:
# .travis/install.sh
2019-09-27 16:24:41 +02:00
Maxime Gimeno
bdab125c8a
Test EPOCH.
2019-09-27 10:38:22 +02:00
Maxime Gimeno
583b0ae3c3
conditional include
2019-09-26 16:41:18 +02:00
Simon Giraudot
56df078838
Fix OpenCV includes (tested with OpenCV 2.4, 3.2 and 4.1)
2019-09-23 10:53:21 +02:00
Sébastien Loriot
25a05e9f4c
Merge branch 'CGAL-named_function_parameters-4.14' into master
...
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot
2f81a21523
Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
...
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Simon Giraudot
b062907334
Propagate API change to classification and segmentation
2019-07-23 09:21:31 +02:00
Sébastien Loriot
cebf0657d8
Use a full CGAL version of named function parameters
...
no longer rely on boost
2019-07-14 22:45:47 +02:00
Sébastien Loriot
983645a51a
match @{ and @}
2019-07-05 21:49:46 +02:00
Simon Giraudot
91dc961b18
Use cache optimisation for KD Tree on indices for classification + shape detection
2019-07-04 13:18:52 +02:00
Laurent Rineau
c0ba28f80a
Merge branch 'releases/CGAL-4.14-branch'
2019-07-03 11:18:20 +02:00
Laurent Rineau
e79bfd5d03
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-07-03 11:10:03 +02:00