Maxime Gimeno
5c8c60595b
Fix example_cluster_classification
2021-01-13 13:30:04 +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
Mael Rouxel-Labbé
f55ef7dd50
Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno
2020-10-09 18:36:17 +02:00
Simon Giraudot
dea945f78b
Update config files with 32b size_t
2020-10-01 13:27:19 +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
Maxime Gimeno
9c15f2c9dc
Use FeatureSummary in the demo, and remove CGAL_FOUND
2020-08-04 12:46:17 +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é
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
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
Maxime Gimeno
049439fa6b
Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno
2020-04-30 16:47:58 +02:00
Simon Giraudot
4c9f76f584
Fix conversion warnings
2020-04-21 09:11:45 +02:00
Mael
8d0a0dda7e
Fix initializating order warning
2020-04-16 19:49:54 +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
9e2ce819f0
Merge remote-tracking branch 'mine/Tutorials-GIS-GF' into Tutorials-GIS-GF
2020-04-07 10:15:50 +02:00
Simon Giraudot
59f86419bf
Remove trailing whitespaces
2020-04-07 09:51:40 +02:00
Simon Giraudot
39ca0f3bf7
Extended labels with indices and colors
2020-04-06 10:25:21 +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
Maxime Gimeno
69a2a23cc6
rename IO functions in point_set packages
2020-04-01 14:33:14 +02: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
cfb7ea076c
Update with review
2020-03-16 16:07:41 +01:00
Simon Giraudot
793ac58b91
Conversion of deprecated config files
2020-02-25 11:44:29 +01:00
Simon Giraudot
e32e5d58e0
Add hole filling and remeshing to GIS tutorial
2020-02-13 13:02:52 +01:00
Simon Giraudot
6c8fd43ebb
Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization
2020-02-10 11:57:56 +01:00
Simon Giraudot
a573cb93b0
Update tutorial + example
2020-02-05 16:05:30 +01:00
Simon Giraudot
345d22ae5a
Add polyline simplification to GIS tutorial + several fixes
2020-02-04 14:35:39 +01:00
Simon Giraudot
98faa60276
GIS tutorial v1
2020-02-03 16:28:14 +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
Laurent Rineau
4fbf00fb8a
CMake>=3.13: opt for for new policies up to 3.15
2019-06-19 14:34:59 +02:00
Dmitry Anisimov
3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston
2019-05-23 10:38:45 +02:00
Laurent Rineau
870ff45168
Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
...
Adapt to Boost 1.70
2019-05-07 15:48:03 +02:00
Laurent Rineau
aebb058b58
Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
...
Adapt to Boost 1.70
2019-05-07 15:45:00 +02:00
Laurent Rineau
02dd93fc27
Boost Iostreams: link with ZLIB, if not Windows
...
If Boost static libraries are used, then ZLIB must be linked with
manually. With Boost shared libraries, the shared library
`boost_iostreams` itself is linked with ZLIB.
2019-04-30 11:21:47 +02:00
Dmitry Anisimov
0ebebab1b8
shape detection dependent packages are fixed
2019-04-25 13:27:41 +02:00
Andreas Fabri
f3c5d11884
Don't suppress warnings
2019-02-18 08:40:08 +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
f3dc5f1de7
Remove useless full find_package for OpenCV
2019-02-01 09:13:36 +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
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
Guillaume Damiand
7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand
2018-11-05 07:32:58 +01:00
Guillaume Damiand
9e3f264e2c
Add an include CGAL_Common.cmake
2018-10-23 13:44:00 +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
Simon Giraudot
d07dd3c17e
Update config files with new format
2018-10-12 10:35:40 +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
c50ccdbcde
Fix not found library notice in CMakeLists
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
656d0a5e78
Update doc with review
2018-07-05 09:08:27 +02:00
Simon Giraudot
99447947a8
Update Classification examples
2018-07-05 09:07:33 +02:00
Simon Giraudot
369d93aca7
Update examples
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
95e6d089fa
Include Eigen in CMakeLists.txt where needed
2018-06-19 10:57:55 +02:00
Simon Giraudot
30713b02c6
Disable *once again* that boost counting iterator warning
2018-01-31 13:56:05 +01:00
Andreas Fabri
8d15f77479
Workaround for silencing a cmake warning for older versions
2018-01-17 08:54:06 +00:00
Simon Giraudot
3d17f81308
Fix bug in CMakeLists: WIN23 -> WIN32
2018-01-15 11:00:20 +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
Simon Giraudot
8c725b75a9
Fix CMakeLists: make components of Boost needed for classif optional
2018-01-12 14:15:03 +01:00
Simon Giraudot
b9126941ad
Improve CMakeLists of classification
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
497066d68d
Update example with random forest
2018-01-12 14:15:02 +01:00
Simon Giraudot
53f4f21d2d
Unify names of random forest classifiers
2018-01-12 14:14:59 +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
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
e3ba95d97d
Fix binary input stream for Windows
2017-09-18 15:11:00 +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
c3aa19458e
Make find_package of OpenCV quiet
2017-08-30 14:30:29 +02:00
Simon Giraudot
862a265383
Fix parallel tag if TBB not there
2017-08-30 11:14:27 +02:00
Simon Giraudot
f808a11146
Fix CMakeLists project names
2017-08-29 17:10:14 +02:00