Commit Graph

368 Commits

Author SHA1 Message Date
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