Commit Graph

555 Commits

Author SHA1 Message Date
Laurent Rineau 657dadf718 Merge pull request #5351 from sgiraudot/Classification-Fix_boost_optional_dependencies-GF
[Classification] Fix Boost optional dependencies
2021-02-05 16:10:32 +01:00
Simon Giraudot fba2e1fc45 Remove false (outdated) dependency to Boost IO Stream / Serialization in code 2021-01-25 15:48:42 +01:00
Laurent Rineau f176529041 Merge pull request #5357 from sloriot/CGAL-boost_function_output-master
Include non-deprecated header (master)
2021-01-21 16:22:39 +01:00
Laurent Rineau 52bb68c012 Merge pull request #5356 from sloriot/CGAL-boost_function_output-5.2
Include non-deprecated header (5.2)
2021-01-21 16:18:55 +01:00
Laurent Rineau dce5ed14b7 Merge pull request #5355 from sloriot/CGAL-boost_function_output-5.1
Include non-deprecated header (5.1)
2021-01-21 16:09:39 +01:00
Sébastien Loriot bc161f2ae9 Merge 'CGAL-Eigen3_support-5.2' 2021-01-15 10:59:20 +01:00
Sébastien Loriot f4935dc199 Merge branch 'CGAL-Eigen3_support-5.1' 2021-01-15 10:54:02 +01:00
Sébastien Loriot eecb00534e fix macro name to be consistent with find_package 2021-01-15 10:43:34 +01:00
Sébastien Loriot ad911271a9 Merge commit '6594e7549bd70923990d86c31e2aa267a79bb629' into HEAD 2021-01-15 10:12:17 +01:00
Sébastien Loriot bdd4efe3b3 Merge commit 'efc0c525e8b' into HEAD 2021-01-15 10:06:56 +01:00
Sébastien Loriot efc0c525e8 include non-deprecated header 2021-01-15 10:02:00 +01:00
Dmitry Anisimov 269a47d773
Merge branch 'master' into CGAL-clang_warnings_fix-danston 2021-01-14 16:51:13 +01:00
Maxime Gimeno c06dde11ce Fix indentation 2021-01-14 09:12:10 +01:00
Maxime Gimeno 5c8c60595b Fix example_cluster_classification 2021-01-13 13:30:04 +01:00
Dmitry Anisimov 76d1fe8c7e classification range loop analysis ref to copy warning fixed 2021-01-07 16:45:08 +01:00
Maxime Gimeno 545c602cc2 fix classif examples 2020-11-17 15:39:27 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Maxime Gimeno 2ad4c16b6e Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-26 15:00:53 +01:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02:00
Simon Giraudot 80a5deb8e9 Merge remote-tracking branch 'mine/Classification-Simpler_IO_for_ETHZ_Random_forest-GF' into Classification-Simpler_IO_for_ETHZ_Random_forest-GF 2020-10-19 07:59:47 +02:00
Mael Rouxel-Labbé 4b28101397 Misc IO fixes 2020-10-14 21:46:18 +02:00
Simon Giraudot 250ab87886 Fix warning using doxygen command instead of markdown 2020-10-12 08:10:41 +02:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Simon Giraudot 7599bbede7 Better names for 32b size_t IO 2020-10-01 13:53:02 +02:00
Simon Giraudot dea945f78b Update config files with 32b size_t 2020-10-01 13:27:19 +02:00
Simon Giraudot d5df9c1a94 Use binary_file_io.h and fix size_t ambiguity 2020-10-01 13:27:05 +02:00
Simon Giraudot fecb3ff5fc Add Random_numbers dependencies to Classification 2020-09-30 15:24:17 +02:00
Simon Giraudot 627584fd73 Add missing includes 2020-09-30 08:38:45 +02:00
Simon Giraudot c7cd9cbea4 Fix conflicting type name 2020-09-30 08:36:15 +02:00
Simon Giraudot 2d7e15b996 Fix C2563 error on Windows 2020-09-30 08:32:50 +02:00
Laurent Rineau 5cfc758880 Fix a warning
```
C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.27.29110\include\numeric(35): warning C4267: '=': conversion from 'size_t' to '_Ty', possible loss of data
        with
        [
            _Ty=int
        ]
C:\cgal_test\CGAL-5.2-I-14\cmake\platforms\Windows_MSVC-2019-Community-Release-64bits\test\Classification_Examples\gis_tutorial_example.cpp(674): note: see reference to function template instantiation '_Ty std::accumulate<std::_Vector_iterator<std::_Vector_val<std::_Simple_types<std::vector<CGAL::Point_3<Kernel_>,std::allocator<CGAL::Point_3<Kernel_>>>>>>,int,main::<lambda_f241736352025ce40037bac2971f2e7f>>(const _InIt,const _InIt,_Ty,_Fn)' being compiled
        with
        [
            _Ty=int,
            Kernel_=CGAL::Epick,
            _InIt=std::_Vector_iterator<std::_Vector_val<std::_Simple_types<std::vector<CGAL::Point_3<CGAL::Epick>,std::allocator<CGAL::Point_3<CGAL::Epick>>>>>>,
            _Fn=main::<lambda_f241736352025ce40037bac2971f2e7f>
        ]
```
2020-09-29 09:31:03 +02:00
Simon Giraudot 7ed93510a7 Remove trailing whitespaces 2020-09-28 15:24:35 +02:00
Simon Giraudot 19004a7432 Merge remote-tracking branch 'mine/Classification-Simpler_IO_for_ETHZ_Random_forest-GF' into Classification-Simpler_IO_for_ETHZ_Random_forest-GF 2020-08-04 13:41:48 +02:00
Simon Giraudot 93d64d108a Specify constness of iterators 2020-08-04 13:16:54 +02:00
Simon Giraudot 0e934b1673 Fix brief first letter in lowercase 2020-08-04 13:16:13 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Simon Giraudot 5c8df1034c Few fixes from review 2020-07-15 14:56:51 +02:00
Simon Giraudot 12a027b027 Add function to check validity of ground truth + preconditions 2020-06-29 14:04:56 +02:00
Mael Rouxel-Labbé 26355e2e32 Uniformize capital / third person usage of \brief 2020-06-25 15:13:47 +02:00
Mael Rouxel-Labbé 9cca59ba36 Actually use the new IO functions + some example improvements 2020-06-23 18:24:39 +02:00
Mael Rouxel-Labbé 2d49f7d702 Countless IO fixes...
Don't have the patience to split it nicely
2020-06-21 12:03:28 +02:00
Mael Rouxel-Labbé e09eb39a80 Misc cleaning 2020-06-21 11:39:14 +02:00
Maxime Gimeno ea53a8d70d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-06-17 14:25:21 +02:00
Maxime Gimeno ed03dc0cb8 replace read_XXX_points() with read_ZZZ() 2020-06-15 14:01:06 +02:00
Maxime Gimeno 7915057945 add missing includes 2020-05-29 16:35:21 +02:00
Simon Giraudot 89285f1feb Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-05-28 08:53:17 +02:00
Mael Rouxel-Labbé fb8463f470 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-05-22 15:17:56 +02:00
Sebastien Loriot c602038db9
Merge pull request #4559 from sgiraudot/Spatial_searching-Parallelize_kd_tree_build-GF
[Small Feature] Parallelize KD Tree build
2020-05-05 14:35:02 +02:00
Maxime Gimeno 049439fa6b Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-04-30 16:47:58 +02:00
Sebastien Loriot fea3a179bf
Merge pull request #4505 from sgiraudot/Tutorials-GIS-GF
[Small Feature] GIS Tutorial
2020-04-29 15:15:55 +02:00
Simon Giraudot 7702f57620 Merge remote-tracking branch 'mine/Spatial_searching-Parallelize_kd_tree_build-GF' into Spatial_searching-Parallelize_kd_tree_build-GF 2020-04-27 10:24:28 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02:00
Simon Giraudot 4c9f76f584 Fix conversion warnings 2020-04-21 09:11:45 +02:00
Simon Giraudot 1dd6a665a1 Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-04-20 09:09:32 +02:00
Simon Giraudot c03e69d5ae Fix get<>() error on windows 2020-04-20 08:56:08 +02:00
Mael 8d0a0dda7e Fix initializating order warning 2020-04-16 19:49:54 +02:00
Simon Giraudot 95b9f05a28 Merge remote-tracking branch 'mine/Spatial_searching-Parallelize_kd_tree_build-GF' into Spatial_searching-Parallelize_kd_tree_build-GF 2020-04-16 17:03:44 +02:00
Simon Giraudot a08a1e950d Merge remote-tracking branch 'mine/Tutorials-GIS-GF' into Tutorials-GIS-GF 2020-04-16 16:56:13 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Simon Giraudot 14c8e8dd18 Add input file for gis_tutorial example 2020-04-14 09:21:19 +02:00
Simon Giraudot 30e8ac4f7c Improve doc 2020-04-07 14:11:26 +02:00
Simon Giraudot ed25fd2e04 Allow classification package to be used without Boost IO Stream and Serialization 2020-04-07 11:42:56 +02:00
Simon Giraudot 7cfe6df8e3 Allow classification package to be used without Boost IO Stream and Serialization 2020-04-07 11:02:16 +02:00
Simon Giraudot 9e2ce819f0 Merge remote-tracking branch 'mine/Tutorials-GIS-GF' into Tutorials-GIS-GF 2020-04-07 10:15:50 +02:00
Simon Giraudot eee66c5ee7 Fix outdated alpha expansion call 2020-04-07 10:04:05 +02:00
Simon Giraudot 6d0cc18902 Merge remote-tracking branch 'mine/Classification-Simpler_IO_for_ETHZ_Random_forest-GF' into Classification-Simpler_IO_for_ETHZ_Random_forest-GF 2020-04-07 09:54:37 +02:00
Simon Giraudot 59f86419bf Remove trailing whitespaces 2020-04-07 09:51:40 +02:00
Simon Giraudot 2d2fd37799 Small changes 2020-04-07 09:45:00 +02:00
Simon Giraudot f2ca827a5f Split generator function in subfunctions 2020-04-06 11:08:58 +02:00
Simon Giraudot deb64dfd40 Update doc 2020-04-06 10:49:32 +02:00
Simon Giraudot 39ca0f3bf7 Extended labels with indices and colors 2020-04-06 10:25:21 +02:00
Simon Giraudot a51ce12aa5 Use syntaxic sugar for transform iterators / counting ranges 2020-04-02 11:19:01 +02:00
Simon Giraudot d9b5f4f1e5 Use CGAL::for_each in classify functions 2020-04-02 10:44:15 +02:00
Simon Giraudot 43014baa91 Modernize/refresh code with C++11/14 2020-04-02 10:28:50 +02:00
Simon Giraudot f4e52069a5 Fix CMakeLists 2020-04-02 08:30:13 +02:00
Simon Giraudot daa7983aa1 Merge branch 'master' into Classification-Simpler_IO_for_ETHZ_Random_forest-GF 2020-04-02 08:29:18 +02:00
Simon Giraudot 1207cdb22f Update/improve examples 2020-04-02 08:01:30 +02:00
Simon Giraudot dfee57ab3d Make evaluation comply with Range concept 2020-04-02 08:01:23 +02:00
Simon Giraudot 92bba3c700 Make classifiers comply with Range concept 2020-04-02 08:01:00 +02:00
Maxime Gimeno 69a2a23cc6 rename IO functions in point_set packages 2020-04-01 14:33:14 +02:00
Sébastien Loriot d42113bbaf extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:35:20 +01:00
Sébastien Loriot f1e5569404 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:35:02 +01:00
Sébastien Loriot 47027d6f5b extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:59:19 +01:00
Sébastien Loriot 4421fff65f Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:58:50 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Simon Giraudot b77e138438 Fix capitalization 2020-03-24 16:30:01 +01:00
Mael 855003baa1
Merge branch 'master' into BGL-Alpha_expansion_graphcut-GF 2020-03-24 08:18:23 +01:00
Simon Giraudot cfb7ea076c Update with review 2020-03-16 16:07:41 +01:00
Simon Giraudot fe90d1ca1f Include parallel KD tree build in classification 2020-03-05 14:35:24 +01:00
Simon Giraudot 5b1334fd3d Improve API of label/feature sets 2020-02-25 16:25:23 +01:00
Simon Giraudot 311c111f24 Add verbosity info in ETHZ RF 2020-02-25 13:27:40 +01:00
Simon Giraudot 2b2b5c48bf Improve parameter interpretation in OpenCV RF 2020-02-25 13:27:07 +01:00
Simon Giraudot 2d46d220e9 Fix feature usage 2020-02-25 13:23:51 +01:00
Simon Giraudot 279d1584bb Add convenient feature_cast operator 2020-02-25 13:23:12 +01:00
Simon Giraudot 886d1b7810 Update doc of Evaluation 2020-02-25 12:06:27 +01:00
Simon Giraudot aa08a60872 Much better version of evaluation 2020-02-25 11:47:15 +01:00