songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
91,996 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

436 Commits

Author SHA1 Message Date
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 96f6bdcebd
Remove sneaky backquote 2019-09-30 09:11:11 +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 0bc24a42b7 Update dependencies of Classification 2019-07-25 12:06:57 +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
Simon Giraudot 2a96d5b42d Remove lambda/auto from cxx03 code 2019-07-01 14:54:31 +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
Laurent Rineau eea3cfe18f Merge pull request #3956 from sgiraudot/Classification-Fix_deprecated_random_shuffle-GF 
Classification: use cpp98::random_shuffle to avoid errors in C++17
 2019-06-17 14:16:05 +02:00
Laurent Rineau a7c4793b5b Merge pull request #3961 from sgiraudot/Classification-Fix_clusters-GF 
[Classification] Make cluster lightweight to copy + fix bbox computation
 2019-06-17 14:15:57 +02:00
Laurent Rineau 5294e53f42 Merge pull request #3956 from sgiraudot/Classification-Fix_deprecated_random_shuffle-GF 
Classification: use cpp98::random_shuffle to avoid errors in C++17
 2019-06-17 14:15:23 +02:00
Laurent Rineau 8089f7c33c Merge pull request #3961 from sgiraudot/Classification-Fix_clusters-GF 
[Classification] Make cluster lightweight to copy + fix bbox computation
 2019-06-17 14:15:20 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Simon Giraudot 16a2644e31 Make cluster lightweight to copy + fix bbox computation 2019-05-27 15:41:03 +02:00
Simon Giraudot 48dda04768 Use cpp98::random_shuffle to avoid errors in C++17 2019-05-24 15:13:15 +02:00
Dmitry Anisimov 3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston 2019-05-23 10:38:45 +02:00
Laurent Rineau b8fe6b10ee Merge pull request #3804 from afabri/CGAL_tests_must_not_include_basic-GF 
Do not include <CGAL/basic.h>
 2019-05-21 16:37:01 +02:00
Laurent Rineau 934544dbde Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-05-15 10:13:14 +02:00
Simon Giraudot 580e71ec7f Add missing include 2019-05-15 10:03:32 +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
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau 
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
 2019-05-14 16:18:24 +02:00
Laurent Rineau 2f8eeb0db3 Fix the headers dependency-hell around gmpxx in Number_types 2019-05-09 15:05:23 +02:00
Laurent Rineau 870ff45168 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF 
Adapt to Boost 1.70
 2019-05-07 15:48:03 +02:00
Laurent Rineau aebb058b58 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF 
Adapt to Boost 1.70
 2019-05-07 15:45:00 +02:00
Laurent Rineau e7d60760b9 Minimized the diff 
Minimized the diff between:
  - `examples/Classification/CMakeLists.txt`, and
  - `test/Classification/CMakeLists.txt`.
 2019-04-30 11:22:52 +02:00
Laurent Rineau 02dd93fc27 Boost Iostreams: link with ZLIB, if not Windows 
If Boost static libraries are used, then ZLIB must be linked with
manually. With Boost shared libraries, the shared library
`boost_iostreams` itself is linked with ZLIB.
 2019-04-30 11:21:47 +02:00
Dmitry Anisimov 0ebebab1b8 shape detection dependent packages are fixed 2019-04-25 13:27:41 +02:00
Dmitry Anisimov 13d0156482 fixed docs, references, biblio, and license 2019-04-22 13:06:20 +02:00
Sébastien Loriot c8a3fdaff6 Merge pull request #3625 from sgiraudot/Stream_support-Enhance_color-GF 
[Small Feature] Reworked CGAL::Color
 2019-04-12 15:54:30 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links 
Correction of redirected links and links that moved to another place.
 2019-04-11 21:37:05 +02:00
Simon Giraudot d314711eaf Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF 2019-04-09 15:00:56 +02:00
Andreas Fabri 9e3685563e Add #include 2019-04-03 11:51:30 +02:00
Simon Giraudot bd2a66ffcd Remove deprecated parts of Classification 2019-04-03 11:51:29 +02:00
Simon Giraudot 7518d5642a Remove CGAL::Classification::RGB_Color and HSV_Color and just use CGAL::Color everywhere 2019-04-03 11:51:29 +02:00
Sébastien Loriot 1c119aec44 replace cpp11::unordered_FOO by std::unordered_FOO 2019-03-29 13:28:33 +01:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop 
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
 2019-03-29 13:22:15 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Andreas Fabri 7c2674abc8 More links fixed 2019-03-20 08:38:40 +01:00
Laurent Rineau f5836b2206 Merge branch 'releases/CGAL-4.13-branch' 2019-03-07 14:31:16 +01:00
Laurent Rineau 99fe1bc548 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-03-07 14:26:47 +01:00
Simon Giraudot b0f16ee41d Handle border case where xmax and ymax exact values should be used 2019-03-04 10:17:52 +01:00
Simon Giraudot c41b73fd2a Fix bbox precision and add assertion test 2019-03-04 09:26:34 +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 962afbfade Merge pull request #3343 from sgiraudot/Point_set_3-v2-GF 
[Small Feature] Point Set 3 v2
 2019-02-13 15:38:53 +01:00
Laurent Rineau 1a45e1c753 Merge pull request #3535 from sgiraudot/Classification-Neural_network_and_parallelized_random_forest-GF 
[Small Feature] Classification: Neural Network and parallelized Random Forest
 2019-02-07 13:31:20 +01:00
Laurent Rineau 2f002971e4 Merge pull request #3653 from sgiraudot/Classification-Fix_OpenCV_Qt5_bug-GF 
Classification: Remove useless full find_package for OpenCV
 2019-02-07 13:30:49 +01:00
Simon Giraudot c43ebbad8d Propagate API change to classification test 2019-02-07 11:36:05 +01:00
Simon Giraudot f3dc5f1de7 Remove useless full find_package for OpenCV 2019-02-01 09:13:36 +01:00
Simon Giraudot fb63d960e8 Update doc based on reviews 2019-01-25 09:32:32 +01:00
Simon Giraudot c81fbe4688 Move all classifiers based on other libraries to dedicated namespaces 2019-01-07 11:50:02 +01:00
Simon Giraudot 3cc1b995be Merge remote-tracking branch 'mine/Classification-Neural_network_and_parallelized_random_forest-GF' into Classification-Neural_network_and_parallelized_random_forest-GF 2018-12-21 10:31:00 +01:00
Simon Giraudot 777f63d038 Fix warnings 2018-12-20 14:22:51 +01:00
Laurent Rineau a553357562 Merge pull request #3490 from afabri/CGAL-VC2017_deprecated_warnings-GF 
CGAL  Suppress VC2017 deprecation warnings concerning boost
 2018-12-19 16:12:20 +01:00
Simon Giraudot 394746a75d Fix typos from review 2018-12-18 16:18:08 +01:00
Simon Giraudot b79fef9cc8 Update number of feature generated in assertion (3 new features * 5 scales) 2018-12-18 10:47:49 +01:00
Simon Giraudot 74084d1246 Add missing includes 2018-12-13 15:48:39 +01:00
Simon Giraudot 35511bae8e Document changes in internal ETHZ random forest library 2018-12-12 09:41:05 +01:00
Simon Giraudot 4e1212b07d Unify default radius parameters values 2018-12-12 09:32:23 +01:00
Simon Giraudot eeed92c94d Fix usage of concept Range (no resize() method, size should be taken care of by the user 2018-12-12 09:16:57 +01:00
Simon Giraudot ae169b9f9a Update user manual 2018-12-12 08:59:58 +01:00
Simon Giraudot 34aa9a5290 Document tensorflow classifier + example 2018-12-11 16:32:04 +01:00
Simon Giraudot 6901935aec Add new features based on local height 2018-12-11 15:02:27 +01:00
Simon Giraudot 7ac0eccbb9 Add function to copy random forest classifier 2018-12-11 12:52:37 +01:00
Simon Giraudot c0897c29bf Document new features of Random Forest 2018-12-11 12:39:05 +01:00
Simon Giraudot 7d43e87716 Add warning about scope definition of feature generators 2018-12-11 12:11:00 +01:00
Simon Giraudot f2f919c6bd Add option to change name of label 2018-12-11 11:44:11 +01:00
Simon Giraudot 7f17f352d9 Fix bug + improve radius values 2018-12-07 10:42:08 +01:00
Simon Giraudot e86777c8dc Reduce max memory used 2018-12-06 14:59:57 +01:00
Simon Giraudot 2145a29297 Optimizations for random forest training algorithm 2018-12-06 14:59:57 +01:00
Simon Giraudot fd1c923f6f Add method to get feature usage 2018-12-06 14:59:57 +01:00
Simon Giraudot 0108fa4436 Parallelize random forest training algorithm 2018-12-06 14:59:57 +01:00
Simon Giraudot ebac827658 Improve bagging algorithm (30% gain on training timing) 2018-12-06 14:59:57 +01:00
Simon Giraudot 58a6c4cc2f Specialize TensorFlow classifier for GPU processing 2018-12-06 14:59:57 +01:00
Simon Giraudot 335375dbba Fix verbosity 2018-12-06 14:59:57 +01:00
Simon Giraudot 826fb15b37 Add possibility to do 3D image instead of 2D 2018-12-06 14:59:57 +01:00
Simon Giraudot ec520f57d5 More improvements using better optimizer 2018-12-06 14:59:57 +01:00
Simon Giraudot 21b0b0ee81 Much better version of NN with IO functions 2018-12-06 14:59:57 +01:00
Simon Giraudot f520f9eb11 First version of NN with TensorFlow 2018-12-06 14:59:57 +01:00
Simon Giraudot 642aea115a Add variant of classify() to get detailed output 2018-12-06 14:59:56 +01:00
Andreas Fabri d2c5e1c210 Suppress warning concerning td::fpos::seekpos() 2018-11-28 13:29:19 +01:00