Commit Graph

583 Commits

Author SHA1 Message Date
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
Sébastien Loriot 3a1516e940 add missing Reference and uniformize ref man group declaration 2018-11-20 13:47:16 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +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 9e3f264e2c Add an include CGAL_Common.cmake 2018-10-23 13:44:00 +02: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
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
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Andreas Fabri 0b188f6dbf With VC++ you must open a binary stream 2018-10-12 10:37:43 +02:00
Simon Giraudot adc108ca75 Fix warning unused variable 2018-10-12 10:36:15 +02:00
Simon Giraudot d07dd3c17e Update config files with new format 2018-10-12 10:35:40 +02:00
Sébastien Loriot 2f9408f867 rename link name to match package name 2018-10-08 10:28:55 +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
Simon Giraudot 55b269d12a Rename test to avoid conflict with other package 2018-10-04 15:39:49 +02:00
Simon Giraudot 55581cbdec Update test_io with latest Local_eigen_analysis API 2018-10-04 12:08:06 +02:00
Simon Giraudot 98402a7cd9 Add test for IO functions of Classification 2018-10-04 12:04:46 +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 c15704177d Add dependency to Boost BZIP2 on Windows 2018-07-06 11:23:15 +02:00
Simon Giraudot 7467130cfd Fix conversion warning 2018-07-06 10:09:22 +02:00
Simon Giraudot c76f0d4b22 Add dependencies to Hash_map and Kernel_d 2018-07-05 14:14:34 +02:00
Simon Giraudot bd5d8d9170 Add dependency to PCA 2018-07-05 09:08:29 +02:00
Simon Giraudot 267b1f475e Fix types in local eigen analysis 2018-07-05 09:08:29 +02:00
Simon Giraudot c2dc2f7a98 Bugfix in test: do not use temporary reference for threaded parts (+ add verbosity) 2018-07-05 09:08:29 +02:00
Simon Giraudot 566e84f154 Fix conversion warnings 2018-07-05 09:08:28 +02:00
Simon Giraudot c50ccdbcde Fix not found library notice in CMakeLists 2018-07-05 09:08:28 +02:00
Simon Giraudot b28a548b8e Fix conversion warnings 2018-07-05 09:08:28 +02:00
Simon Giraudot 3bb2ef96df Generate config files with older version of boost for retrocompatibility 2018-07-05 09:08:28 +02:00
Simon Giraudot 3539966104 Improve OpenCV find_package(), only get required components 2018-07-05 09:08:28 +02:00
Simon Giraudot 241bbdb16a Update CMakeLists.txt messages to trigger testsuite missing requirement detection 2018-07-05 09:08:28 +02:00
Simon Giraudot 4ceb1b3f39 Replace CGAL_assertion() by assert() in tests 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 754f44167d Update assertion with new number of generated features 2018-07-05 09:08:27 +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 f2aeb9f9d9 Replace author by authors 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 656d0a5e78 Update doc with review 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 f95531995e Add doc dependency to BGL 2018-07-05 09:07:33 +02:00
Simon Giraudot 59b90c2896 First full version of the user manual of Classification 2.0 2018-07-05 09:07:33 +02:00
Simon Giraudot 84f0bcfe04 Update Classification user manual 2018-07-05 09:07:33 +02:00
Simon Giraudot 99447947a8 Update Classification examples 2018-07-05 09:07:33 +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 369d93aca7 Update examples 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 9a25a1248d Update doc, examples and tests of Classification 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 95e6d089fa Include Eigen in CMakeLists.txt where needed 2018-06-19 10:57:55 +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
Laurent Rineau 03e68d8740 Merge pull request #2985 from afabri/CGAL-std_latest-GF
Support C++17 (Replace std::random_shuffle() with CGAL::random_shuffle(), and other adjustments)
2018-04-24 17:32:55 +02:00
Andreas Fabri c54a6a4980 Put CGAL::random_shuffle() in the subnamespace cpp98 2018-04-11 09:32:23 +01:00
Simon Giraudot 02864d60bc Classification:fix introduced release 2018-04-09 11:18:47 +02: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 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +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 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
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Simon Giraudot 30713b02c6 Disable *once again* that boost counting iterator warning 2018-01-31 13:56: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 8d15f77479 Workaround for silencing a cmake warning for older versions 2018-01-17 08:54:06 +00: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 3d17f81308 Fix bug in CMakeLists: WIN23 -> WIN32 2018-01-15 11:00:20 +01:00
Simon Giraudot 323281358b Disable Windows warnings from auxiliary library 2018-01-12 14:15:05 +01:00
Simon Giraudot 86090bf447 Adapt CMakeLists.txt to the Win32 specific Boost/ZLIB dependencies 2018-01-12 14:15:04 +01:00
Simon Giraudot 0c2aa33cc1 Fix CMakeLists management of CXX required features 2018-01-12 14:15:04 +01:00
Simon Giraudot 2d30b545d1 Fix warning: unused variable 2018-01-12 14:15:04 +01:00
Simon Giraudot d9ee692059 Fix CMakeLists (exit() -> return()) 2018-01-12 14:15:04 +01:00
Simon Giraudot 945a6f3172 Make TBB optional in CMakeLists 2018-01-12 14:15:03 +01:00
Simon Giraudot 59780674e7 Fix Boost mixed-up required / optional_components 2018-01-12 14:15:03 +01:00
Laurent Rineau 0273ee4db3 Acknowledge that this package uses two licenses, and fix the script 2018-01-12 14:15:03 +01:00
Simon Giraudot fc3cf7a27f Document MIT license and IO Stream's GZIP dependency 2018-01-12 14:15:03 +01:00
Simon Giraudot 8c725b75a9 Fix CMakeLists: make components of Boost needed for classif optional 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 e08729ca2d Add dependencies to boost libraries in manual 2018-01-12 14:15:02 +01:00
Simon Giraudot b9126941ad Improve CMakeLists of classification 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 d78ff28d53 Update user manual of classification 2018-01-12 14:15:02 +01:00
Simon Giraudot 497066d68d Update example with random forest 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
Simon Giraudot 53f4f21d2d Unify names of random forest classifiers 2018-01-12 14:14:59 +01:00
Simon Giraudot 55600b9b14 Bugfix: prevent node votes to go over 1.0f 2018-01-12 14:14:59 +01:00
Simon Giraudot 34bc6f18e8 Bugfix: prevent classification cost from going negative 2018-01-12 14:14:59 +01:00
Jane Tournois 2a662cf0df fix compilation error C1710 on msvc
see https://msdn.microsoft.com/fr-fr/library/h5sh3k99.aspx
2018-01-12 14:14:58 +01:00
Simon Giraudot c69ac52b93 Add option to not reset trees on ETHZ random forest 2018-01-12 14:14:58 +01:00
Simon Giraudot af4bbf37a0 Move ETHZ code to auxiliary 2018-01-12 14:14:58 +01:00
Simon Giraudot ddf85031bf ETHZ random forest classifier 2018-01-12 14:14:57 +01:00
Simon Giraudot ad20e132d8 Include ETZH source code 2018-01-12 14:14:57 +01:00
Simon Giraudot 075ffb8506 Evaluation: avoid NaN in general measurements when label empty 2018-01-12 14:14:57 +01:00
Simon Giraudot f63a28063b Add simple feature using simply a range and a property map 2018-01-12 14:14:57 +01:00
Simon Giraudot a3ff9f72b1 Add #define to activate quick estimation in training 2018-01-12 14:14:56 +01:00
Simon Giraudot dce942dd7e Bugfix: sort features by name after generation 2018-01-12 14:14:56 +01:00
Laurent Rineau 65f4e42acc Merge pull request #2606 from sloriot/CGAL-create_release_with_cmake
Add script to create release with cmake
2017-12-05 18:24:58 +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
Sébastien Loriot 8e63440ad2 remove dont_submit file 2017-11-16 17:30:34 +01:00
Laurent Rineau 0681ac6dbc Fix the TBB_USE_FILE warnings 2017-11-15 17:00:02 +01:00
Laurent Rineau 9b72ed0b47 Fix a warning 2017-11-13 12:04:10 +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 90698d9398 Fix OpenCV include/cmake 2017-10-05 15:44:48 +02:00
Jane Tournois 5e4f3e72c6 add missing std::ios::binary to input file stream
and fix conversion warnings
2017-10-05 15:30:39 +02:00
Jane Tournois 87c9ffd0fa remove extra typenames 2017-10-05 13:02:03 +02:00
Simon Giraudot 5d67f15d4b Fix warnings std::size_t -> int 2017-10-03 14:16:14 +02:00
Simon Giraudot e3ba95d97d Fix binary input stream for Windows 2017-09-18 15:11:00 +02:00
Simon Giraudot 0e3695b991 Update changes.html + package description 2017-09-12 07:39:19 +02:00
Simon Giraudot 3bf3401c6f Disable boost 64/32b intergers warning on Windows 2017-09-11 11:38:17 +02:00
Simon Giraudot b4d843ef84 Fix various errors and warnings from windows testsuite 2017-09-05 08:20:17 +02:00
Simon Giraudot bad870285a Handle Boost API change 2017-09-01 10:16:58 +02:00
Simon Giraudot 2dc463d4ba Fix more conversion warnings 2017-08-31 15:33:30 +02:00
Simon Giraudot 819eb7f7b1 Fix xml_writer_settings 2017-08-31 15:00:52 +02:00
Simon Giraudot c3aa19458e Make find_package of OpenCV quiet 2017-08-30 14:30:29 +02:00
Simon Giraudot 3d65b7746b Fix templated type of xml_writer_settings 2017-08-30 11:24:27 +02:00
Simon Giraudot b0086bdf16 Fix some more convertion warnings 2017-08-30 11:24:18 +02:00
Simon Giraudot 862a265383 Fix parallel tag if TBB not there 2017-08-30 11:14:27 +02:00
Simon Giraudot 3e91d6f5d4 Fix vector initialization 2017-08-30 11:12:48 +02:00
Simon Giraudot 5f5d27f1a8 Fix all implicit convertion warnings 2017-08-30 10:46:49 +02:00
Simon Giraudot f808a11146 Fix CMakeLists project names 2017-08-29 17:10:14 +02:00
Simon Giraudot 07eefd6f67 Fix Random forest license 2017-08-29 11:22:23 +02:00
Simon Giraudot 0a4a648f24 Add missing file 2017-08-29 10:29:51 +02:00
Simon Giraudot 97aefb29b6 Add license for Classification 2017-08-28 10:18:53 +02:00
Simon Giraudot b8bb7febcb Solve verbosity issues 2017-08-28 09:40:15 +02:00
Simon Giraudot ff9d202cbf Update package info 2017-08-25 15:55:44 +02:00
Simon Giraudot 1052bb6522 Update examples and test 2017-08-25 15:33:26 +02:00
Simon Giraudot 0880106e1f Fix clang warnings 2017-08-25 15:09:51 +02:00
Simon Giraudot aac29a8949 Remove outdated tests 2017-08-25 14:35:21 +02:00
Simon Giraudot 2ebc55e9c3 Use signed integer for label indices (better handling of unlabeled -1 case) 2017-08-09 09:57:15 +02:00
Simon Giraudot 5b9c32321f Restore mistakenly erased line in random_forest.load_configuration 2017-07-21 11:58:35 +02:00
Simon Giraudot 8b2aacb8e2 Minor corrections from review 2017-06-09 14:04:47 +02:00
Simon Giraudot e0997e2f2b Few corrections/additions from review 2017-06-09 08:31:11 +02:00
Andreas Fabri b8fcc44891 avoid pow and sqrt 2017-06-01 13:13:33 +02:00
Simon Giraudot a8b534de2f Bugfix: do not divide by NB if 0 2017-06-01 12:02:16 +02:00
Simon Giraudot b5c585b8e3 Fix echo scatter with indices iterator 2017-06-01 11:56:36 +02:00
Simon Giraudot 484ceeb143 Store has_points instead of always calling recursive method 2017-06-01 11:22:17 +02:00
Simon Giraudot 2d305de319 Replace sort with minmax_element 2017-06-01 10:57:09 +02:00
Simon Giraudot 64c9dd3ab3 Merge branch 'Classification-GF' of github.com:CGAL/GeometryFactory into Classification-GF 2017-06-01 10:50:37 +02:00
Andreas Fabri f8d33e1ceb take vectors out of the loop to have less reallocations 2017-06-01 10:49:05 +02:00
Simon Giraudot 3b2c555ffe Update doc of planimetric grid 2017-06-01 10:41:24 +02:00
Simon Giraudot 2f4c1019a9 Merge branch 'Classification-GF' of github.com:CGAL/GeometryFactory into Classification-GF 2017-06-01 09:09:43 +02:00
Simon Giraudot 75e38886a9 Planimetric grid: use adapted iterators instead of copying all the time 2017-06-01 09:09:00 +02:00
Andreas Fabri 3a2aa0b7f5 reserve() a vector 2017-05-31 12:35:58 +02:00
Simon Giraudot 288f7a9b81 Remove useless display 2017-05-31 11:11:14 +02:00
Simon Giraudot 7fc1926bde Doc: dd precisions on scale, normal estimation, noise, outliers, etc. 2017-05-31 09:12:43 +02:00
Simon Giraudot daf4c83413 Fix CMakeLists: do not compile random forest example if OpenCV not found 2017-05-31 08:43:19 +02:00
Simon Giraudot 41e12aed8b Simplify API of random forest classifier 2017-05-31 08:21:52 +02:00
Simon Giraudot 01f6ee38c7 Fix typo 2017-05-31 08:21:27 +02:00
Simon Giraudot cafde13df5 Add figure to explain HSV feature 2017-05-31 08:20:42 +02:00
Simon Giraudot 85f537f4cf Add example with noise and outliers 2017-05-30 15:15:51 +02:00
Simon Giraudot 8f3dac6854 Minor fixes from review (typos, additional precisions in doc, etc.) 2017-05-30 08:43:46 +02:00
Simon Giraudot 65e40dcedf Fix obsolete doc in Feature base 2017-05-30 08:42:54 +02:00
Simon Giraudot 644b3748f2 Add feature default names and range types 2017-05-30 08:41:05 +02:00
Simon Giraudot 515c814cc1 Review: classification classifier -> (just) classifier 2017-05-09 07:47:07 +02:00
Simon Giraudot 462e9f83de Fix package description 2017-05-04 12:00:17 +02:00
Simon Giraudot 165ad11219 Minor corrections 2017-05-04 09:37:10 +02:00
Simon Giraudot 417ceacec8 Review: misc fixes 2017-05-03 15:37:34 +02:00
Simon Giraudot db4871b5ca Review: in HSV, use an enum Channel instead of std::size_t 2017-05-03 14:20:07 +02:00
Simon Giraudot 7ca4c226fc Review: add getter for grid resolution 2017-05-03 14:11:32 +02:00
Simon Giraudot 66bc240e1e Review: replace mask() by has_points() 2017-05-03 14:04:35 +02:00
Simon Giraudot c7fcb4ac69 Review: add precision in feature generator 2017-05-03 14:04:27 +02:00
Simon Giraudot 9e9f1fdbab Review: fix local eigen analysis doc 2017-05-03 12:39:33 +02:00
Simon Giraudot a97cf7b70a Review: replace range_neighbor_query by sphere_neighbor_query 2017-05-03 12:39:09 +02:00
Simon Giraudot b2c33492ad Review: fix types 2017-05-03 12:29:56 +02:00
Simon Giraudot c87d2fde99 Review: replace "predicate" with "classifier" 2017-05-03 12:16:06 +02:00
Simon Giraudot 5ba4497798 Fix CMakeLists (include dir of OpenCV) 2017-04-26 16:58:43 +02:00
Simon Giraudot cd75319d70 Add support for OpenCV 3.2 (in addition of 2.4) 2017-04-26 16:58:26 +02:00
Simon Giraudot 0ac079023b Update doc with review 2017-04-25 11:48:54 +02:00
Simon Giraudot dc0a9185ab Expand variable names in examples 2017-04-25 11:16:21 +02:00
Simon Giraudot 761595403a Replace PNG by SVG 2017-04-25 11:06:44 +02:00
Jane Tournois e511de6eb8 fix typename issues
and a few conversion warnings
2017-04-18 09:35:41 +02:00
Simon Giraudot 8595fea36d Include random forest if OpenCV is found 2017-04-13 11:39:57 +02:00
Simon Giraudot 3cf8890f08 Minor corrections in doc 2017-04-12 11:35:29 +02:00
Simon Giraudot a981d14cd0 Simplify API (no more templates) of Local_eigen_analysis 2017-04-10 15:05:50 +02:00
Simon Giraudot 8b70069135 Add IO methods for random forest (non-documented so far as it's not stable) 2017-04-03 08:05:47 +02:00
Simon Giraudot 73fd922748 Fix identation everywhere (big commit) 2017-03-31 08:31:41 +02:00
Simon Giraudot 00c34dd436 Fix API 2017-03-28 11:51:07 +02:00
Simon Giraudot 09484dd752 Clean up predicate code 2017-03-28 11:50:56 +02:00
Simon Giraudot bf2dfdd3af Fix doc 2017-03-28 11:50:49 +02:00
Simon Giraudot 36febd05a9 Update vertical dispersion with new grid API 2017-03-28 11:50:26 +02:00
Simon Giraudot 3c8a48aa8f Update doc and examples 2017-03-28 11:50:13 +02:00
Simon Giraudot 6712e04b60 Fix duplicated ref 2017-03-27 15:18:22 +02:00
Simon Giraudot 735c3d5d54 Add random forest predicate 2017-03-27 15:17:27 +02:00
Simon Giraudot 34070bfd52 Update reference manual 2017-03-27 15:03:55 +02:00
Simon Giraudot d69dd37c6d Update examples and add example for Random Forest 2017-03-27 15:02:46 +02:00
Simon Giraudot db64648774 Update manual 2017-03-27 15:02:15 +02:00
Simon Giraudot ea5dbb8315 Add predicate concept 2017-03-27 10:35:09 +02:00
Simon Giraudot c62d35fadc Use IoU instead of recall as training score 2017-03-27 09:28:36 +02:00
Simon Giraudot fa967afa16 Optimize multiscale planimetric grid 2017-03-27 09:28:07 +02:00
Simon Giraudot d0ff9fdc64 Add undocumented method to free memory (for testing purposes) 2017-03-27 09:27:04 +02:00
Simon Giraudot 17343421f5 Use floats everywhere (need for very little memory size) 2017-03-17 14:32:45 +01:00
Simon Giraudot 026a01b140 Remove useless class 2017-03-17 13:53:20 +01:00
Simon Giraudot acb17da8c8 Reduce memory usage of features 2017-03-17 12:54:14 +01:00
Simon Giraudot 77a590d338 Global change of API 2017-03-16 14:16:44 +01:00
Simon Giraudot 6eda0387d0 Bugfix in HSV feature: differentiate mean and m_mean 2017-03-15 09:22:04 +01:00
Simon Giraudot d73f7d3718 Parallelize graphcut computation 2017-03-13 07:48:45 +01:00
Simon Giraudot 058a455e3c Remove unused variable 2017-03-10 13:51:37 +01:00
Simon Giraudot aefbb150e2 Update doc 2017-03-06 13:52:51 +01:00
Simon Giraudot 1e3aaabd07 Fix bug in demo 2017-03-06 13:52:24 +01:00
Simon Giraudot 4d17c623aa Parallelize feature computation, Eigen analysis, etc. 2017-03-06 11:09:25 +01:00
Simon Giraudot e50cd5442d Replace Timer with Real_timer 2017-03-03 12:40:36 +01:00
Simon Giraudot ec8a00dce7 Parallelize local eigen analysis with TBB 2017-03-03 11:15:44 +01:00
Simon Giraudot e1f4ff000b Some optimizations in trainer 2017-03-03 10:48:46 +01:00
Simon Giraudot eb4a3503a6 Fix doc parameter 2017-03-03 08:14:31 +01:00
Simon Giraudot af912272b7 Parallelize run() and run_with_local_smoothing() with TBB 2017-03-02 19:00:01 +01:00
Simon Giraudot 6e86dc3afc Parallelize training with TBB 2017-03-02 18:13:35 +01:00
Simon Giraudot 1255a9e794 Optimize training 2017-03-02 17:43:46 +01:00
Simon Giraudot 89b6c64cdf Add missing concept 2017-03-02 16:09:26 +01:00
Simon Giraudot 96ef96ac6d Make public and document energy_of 2017-03-02 16:08:47 +01:00
Simon Giraudot cea79f650a Add accuracy, mean F1 and mean IoU to trainer 2017-03-02 16:08:28 +01:00
Simon Giraudot 4feca8dec0 Update documentation with latest review 2017-03-02 16:03:57 +01:00
Simon Giraudot 8f4974df7b New example + update examples + documentation 2017-03-01 15:35:01 +01:00
Simon Giraudot 7e181c9c7e Additional documentation 2017-03-01 15:34:32 +01:00
Simon Giraudot 26ff6ca76a New access methods + documentation for trainer 2017-03-01 15:34:01 +01:00