Commit Graph

337 Commits

Author SHA1 Message Date
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
Laurent Rineau e7d60760b9 Minimized the diff
Minimized the diff between:
  - `examples/Classification/CMakeLists.txt`, and
  - `test/Classification/CMakeLists.txt`.
2019-04-30 11:22:52 +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
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02: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