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

374 Commits

Author SHA1 Message Date
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
Simon Giraudot 2a96d5b42d Remove lambda/auto from cxx03 code 2019-07-01 14:54:31 +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 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
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 2f8eeb0db3 Fix the headers dependency-hell around gmpxx in Number_types 2019-05-09 15:05:23 +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 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
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
Simon Giraudot 394746a75d Fix typos from review 2018-12-18 16:18:08 +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 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
Simon Giraudot 0c2d09ae72 Mention change of serialization in the list of changes to the original code 2018-10-19 10:24:45 +02:00
Simon Giraudot 1b6e851774 Workaround serialization bug with null pointers 2018-10-04 12:03:26 +02:00
Sébastien Loriot 12651796a0 use a generic file with the argt class name being a macro 
since several free functions needs to be defined, it seems
to be the simplest and cleanest solution
 2018-08-28 10:35:46 +02:00
Simon Giraudot 267b1f475e Fix types in local eigen analysis 2018-07-05 09:08:29 +02:00
Simon Giraudot 566e84f154 Fix conversion warnings 2018-07-05 09:08:28 +02:00
Simon Giraudot b28a548b8e Fix conversion warnings 2018-07-05 09:08:28 +02:00
Simon Giraudot 9b06cc3fac Fix convertion warnings and update iterator type 2018-07-05 09:08:28 +02:00
Simon Giraudot 2ca491f81e Add a see-also for neighbor query class to their neighborhood structure 2018-07-05 09:08:27 +02:00
Simon Giraudot 3703436955 Replace std::size_t by unsigned int 2018-07-05 09:08:27 +02:00
Simon Giraudot 29433bc164 Fix PointRange -> ClusterRange 2018-07-05 09:08:27 +02:00
Simon Giraudot d354fcba74 Add missing includes for header check 2018-07-05 09:08:27 +02:00
Simon Giraudot ecde89063b Add missing SPDX identifiers 2018-07-05 09:08:27 +02:00
Simon Giraudot 81ca078932 Replace energies by probabilities 2018-07-05 09:08:27 +02:00
Simon Giraudot 7b323a5e4c Fix badly defined constructor when CGAL is not linked with TBB 2018-07-05 09:08:26 +02:00
Simon Giraudot 9a5a4770a5 Handle deprecated code (deprecated warnings + test) 2018-07-05 09:08:26 +02:00
Simon Giraudot 71f9425256 Remove outdated functions 2018-07-05 09:08:26 +02:00
Simon Giraudot 07ed11346d Some additions to the manual 2018-07-05 09:08:26 +02:00
Simon Giraudot bfb89cca73 Update API of Classification + reference manual 2018-07-05 09:07:33 +02:00
Simon Giraudot 38b0aedebe Reduce memory consumption of neighborhood using boost::uint32_t 2018-07-05 09:07:32 +02:00
Simon Giraudot e4b373e7e5 Reduce memory consumption using compressed float and saving fewer things 2018-07-05 09:07:32 +02:00
Simon Giraudot 9c29c75ce8 Only call operator[] once 2018-07-05 09:07:32 +02:00
Simon Giraudot 82af495159 Make API of Evaluation more flexible 2018-07-05 09:07:32 +02:00
Simon Giraudot d5d501da51 Better API for eigen analysis + cluster variant 2018-07-05 09:07:32 +02:00
Simon Giraudot b6502a05c2 Add cluster classes to Classification 2018-07-05 09:07:32 +02:00
Simon Giraudot 3f37fa504f WIP: better API of feature generators + eigen analysis 2018-07-05 09:07:32 +02:00
Simon Giraudot 49aea9ec26 Update mesh classification 2018-07-05 09:07:32 +02:00
Simon Giraudot 676a1989df Simplifying features + better parallelization API 2018-07-05 09:07:31 +02:00
Simon Giraudot f9ccc86238 Recover Mesh Classification from outdated dirty branch 2018-07-05 09:07:31 +02:00
Laurent Rineau b86fff3f90 Merge pull request #3128 from sgiraudot/Solver_interface-Warn_against_diagonalize_traits-GF 
Solver Interface: deprecate CGAL::Diagonalize_traits
 2018-06-27 10:21:37 +02:00
Laurent Rineau fad43cfed8 Merge pull request #3177 from sgiraudot/Classification-Bugfix_grid_has_points-GF 
Classification: Fix bug + clean up has_points() method in Planimetric_grid
 2018-06-20 17:20:58 +02:00
Simon Giraudot 41d554fe58 Deprecating Diagonalize_traits: document dependency to Eigen 2018-06-19 10:57:55 +02:00
Simon Giraudot 34e05470a4 Fix bug + clean up has_points() method in Planimetric_grid 2018-06-18 10:49:59 +02:00
Sebastien Loriot 1b84d7402d
Merge pull request #2978 from MaelRL/PMap-Fix_Default_pmap-GF 
Property map: fix get() not returning the default value
 2018-05-15 22:09:59 +02:00
Andreas Fabri c54a6a4980 Put CGAL::random_shuffle() in the subnamespace cpp98 2018-04-11 09:32:23 +01:00
Andreas Fabri 063a91a771 Use CGAL::random_shuffle 2018-04-04 14:00:23 +01:00
Mael Rouxel-Labbé 288417a9ed Renamed Default_property_map to Constant_property_map 2018-04-03 14:11:49 +02:00
Simon Giraudot dfc1564865 Some clean up 2018-03-21 09:34:05 +01:00
Simon Giraudot 155e9c8720 Undocument internal and experimental features 2018-03-19 11:37:27 +01:00
Simon Giraudot 259a625142 Compute gradient of feature 2018-03-19 11:37:25 +01:00
Simon Giraudot f634f3176c Compute local eigen analysis on clusters 2018-03-19 11:37:25 +01:00
Laurent Rineau 6553d7a9b3 Fix check_headers in master 2018-02-20 10:59:04 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF 
Deal with VC++ warnings of level /W4
 2018-02-19 14:27:06 +01:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Maxime Gimeno f183a26b7c add missing include in Classification 2018-02-05 10:34:49 +01:00
Maxime Gimeno 4d440a6b85 add missing include <map> 2018-02-05 07:50:15 +01:00
Maxime Gimeno a6b455b618 Fixes 2018-02-02 13:52:33 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Andreas Fabri dc2f37a4ae disable/enable warnings 2018-01-24 08:59:20 +00:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Andreas Fabri effca64dd4 Cast to avoid warning 2018-01-17 07:31:34 +00:00
Andreas Fabri 0922ccaefb fix more Windows warnings 2018-01-16 08:54:44 +00:00
Simon Giraudot 3db48cd98e Fix windows warning 2018-01-16 08:54:12 +01:00
Simon Giraudot 323281358b Disable Windows warnings from auxiliary library 2018-01-12 14:15:05 +01:00
Simon Giraudot fc3cf7a27f Document MIT license and IO Stream's GZIP dependency 2018-01-12 14:15:03 +01:00
Simon Giraudot 8f076ae77f Move liblearning to CGAL::internal and document changes from original library 2018-01-12 14:15:03 +01:00
Simon Giraudot 718366a0b9 Add license headers to included ETHZ liblearning library 2018-01-12 14:15:02 +01:00
Simon Giraudot f105032647 Remove boost serialization flag from code 2018-01-12 14:15:02 +01:00
Simon Giraudot ce4c967f12 Separate random forest examples 2018-01-12 14:15:02 +01:00
Simon Giraudot e96dac10b4 Fix conversion warning 2018-01-12 14:15:01 +01:00
Simon Giraudot b9f52f7e2b Update reference manual of Classification 2018-01-12 14:15:01 +01:00
Simon Giraudot 4bf23d62f1 Increase limit of dense images 2018-01-12 14:15:00 +01:00
Simon Giraudot b019c5a4f0 Bugfix: prevent division by 0 2018-01-12 14:15:00 +01:00
Simon Giraudot c63df7a304 Fallback mode using map if vector is too large (useful for sparse scenes) 2018-01-12 14:14:59 +01:00
Simon Giraudot 1b455ff6ec Fix useless copies of Image (very costly with large scenes) 2018-01-12 14:14:59 +01:00