Commit Graph

374 Commits

Author SHA1 Message Date
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
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
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
Simon Giraudot 5d67f15d4b Fix warnings std::size_t -> int 2017-10-03 14:16:14 +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 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 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 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 0880106e1f Fix clang warnings 2017-08-25 15:09:51 +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 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 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 165ad11219 Minor corrections 2017-05-04 09:37:10 +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 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
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 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 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 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 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
Simon Giraudot 0123e5d848 Additional documentation for features 2017-03-01 15:33:46 +01:00
Simon Giraudot 552693c5c0 Add computation of precision and recall 2017-03-01 14:28:55 +01:00
Simon Giraudot f3a703ba2c Minor corrections 2017-03-01 10:43:11 +01:00
Simon Giraudot e63dce356f Change names (attribute -> feature, type -> label) 2017-03-01 09:50:33 +01:00
Simon Giraudot 1222a2a9e4 Minor corrections in Point_set_classifier 2017-03-01 09:26:01 +01:00
Simon Giraudot 5154cd5e29 Separate training in another class 2017-03-01 09:25:39 +01:00
Simon Giraudot b79d8092f3 Remove warning (unused parameter) 2017-02-09 08:35:59 +01:00
Simon Giraudot 9307bb199d Fix voxel size 2017-02-09 08:35:39 +01:00
Simon Giraudot d6f7cd1520 Comment debug info 2017-02-09 08:35:21 +01:00
Simon Giraudot e29d9da43a Debug information for classifier (to handle better later) 2017-02-07 11:41:35 +01:00
Simon Giraudot 8011a2aa9f Add option to not precompute attributes 2017-02-07 11:37:59 +01:00
Simon Giraudot 020822de9f Update license headers everywhere 2017-02-06 12:36:40 +01:00
Simon Giraudot 2b6492a9c0 Correction of verbosity 2017-02-06 12:36:06 +01:00
Simon Giraudot d43fe019fe Update ref and user man 2017-01-09 14:27:03 +01:00
Simon Giraudot 585f034398 Fix user manual 2017-01-06 15:38:53 +01:00
Simon Giraudot dceddbe418 Rework reference manual 2017-01-06 15:25:43 +01:00
Simon Giraudot 9817cadfde Correct Range access (no operator[]) + update Polyhedron plugin 2017-01-06 13:59:56 +01:00
Simon Giraudot 6db1db20c0 Use Default for attribute generation 2017-01-06 08:33:54 +01:00
Simon Giraudot 333eb7a71f Use variadic templates to add attributes 2017-01-05 12:58:20 +01:00
Simon Giraudot be72b48507 Replace Helper by Point_set_classifier class 2017-01-05 12:33:12 +01:00
Simon Giraudot e26cec35ca Change API from pairs of iterators to ranges 2017-01-05 11:39:52 +01:00
Simon Giraudot 37b29b0944 Update with first reviews 2017-01-05 10:25:32 +01:00
Simon Giraudot f01cc40e62 Clean up private/public/SKIP_IN_MANUAL/useless typedefs 2016-11-03 15:12:39 +01:00
Simon Giraudot ed583ac6e9 Change neighborhood API, using a Concept + models 2016-11-03 12:03:45 +01:00
Simon Giraudot 31278c59cb Change package name, namespaces, etc. 2016-11-03 10:05:45 +01:00