Commit Graph

664 Commits

Author SHA1 Message Date
Sven Oesau 4f2758777d removed internal storage of regions and access function 2023-03-20 10:49:54 +01:00
Andreas Fabri 0d320e48a8 Merge branch 'Number_types-fix_VC2017_boost_mp-GF' into CORE-boost_mp_number-GF 2023-03-17 08:28:10 +01:00
Sébastien Loriot 41c9f6de7e fix converson warning 2023-03-14 14:28:01 +01:00
Sébastien Loriot 7ff85c0444 fix warnings and typo 2023-03-14 14:22:21 +01:00
Sébastien Loriot 36b448912e add a first simple post-processing step 2023-03-13 12:00:45 +01:00
Sven Oesau 41b1a655e6 bugfix region_map 2023-03-10 10:58:10 +01:00
Sven Oesau bdf1a8271d region vectors are now moved into the OutputIterator instead of copied
added an alternative detect method that only fills internal data structures
2023-03-08 14:18:45 +01:00
Sven Oesau 7c69d0f491 typo 2023-03-08 14:16:59 +01:00
Sébastien Loriot 33c868818f fix property map for region primitives 2023-03-07 17:55:28 +01:00
Sébastien Loriot 33227d5396 recover plane normals from the primitives 2023-03-07 13:20:32 +01:00
Sébastien Loriot afb88fb459 add max distance in the demo plugin 2023-03-03 09:35:54 +01:00
Sébastien Loriot 648377f127 fix np name + plug region growing in decimation plugin + change cosinus sign in decimate + update doc 2023-03-02 19:08:10 +01:00
Sébastien Loriot bdf6714b4c add missing type 2023-02-23 09:46:46 +01:00
Sébastien Loriot 9e72361537 All packages depends now on CGAL_Core (like Kernel) 2023-02-20 15:24:16 +01:00
Sébastien Loriot 99de3fdefc remove pipo 2023-02-16 17:58:41 +01:00
Sébastien Loriot 31f5ce1f6a fix PMP code 2023-02-16 17:28:12 +01:00
Sébastien Loriot 9362ff1ee8 typo 2023-02-16 14:54:52 +01:00
Sébastien Loriot 640910288b Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-16 14:18:17 +01:00
Sébastien Loriot 36deff06d5 add the possibility to use an external region map 2023-02-16 14:01:01 +01:00
Sébastien Loriot 0fc0c8eefc explicit NP type 2023-02-16 11:30:49 +01:00
Sébastien Loriot c1165a79aa rename named parameter 2023-02-16 11:25:23 +01:00
Sébastien Loriot 05d6e2ede9 more changes from review 2023-02-16 10:58:52 +01:00
Sebastien Loriot 2ccaee0d8a
Code review from Mael
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2023-02-16 10:35:17 +01:00
Sébastien Loriot 92309aac3e fix typo 2023-02-09 15:00:20 +01:00
Sébastien Loriot 31827e15af typo and compilation issues after renaming 2023-02-07 15:38:02 +01:00
Sébastien Loriot 6df265125a finish doc for PMP functions 2023-02-07 15:01:00 +01:00
Sébastien Loriot 0e8bc6a7dd add relates 2023-02-07 13:10:34 +01:00
Sébastien Loriot 9242a810c4 Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-07 11:31:55 +01:00
Sébastien Loriot 7cd8572dbf divide refman + remove deprecated section somehow outdated 2023-02-07 11:06:10 +01:00
Sven Oesau 27194a9ac4 fixed typo
[skip CI]
2023-02-07 10:03:27 +01:00
Sven Oesau eaf78fcb72 fixed type
[skip CI]
2023-02-07 09:59:11 +01:00
Sébastien Loriot e50dcb76bf doc improvements 2023-02-06 19:25:10 +01:00
Sébastien Loriot e78a8ed293 spell checking 2023-02-06 18:08:28 +01:00
Sébastien Loriot 97e7f6a5e5 do not recommand to use EPECK + dual compilation of the example to test both options 2023-02-06 18:04:23 +01:00
Sébastien Loriot fab5dd1865 pass on the user manual 2023-02-06 17:48:50 +01:00
Sébastien Loriot fb20fd0f38 the fitting of a sphere circle is "always" successful 2023-01-31 11:49:50 +01:00
Sébastien Loriot 331323ea44 create the primitive only if the propagation was successful 2023-01-31 11:49:29 +01:00
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +01:00
Sébastien Loriot 24a063a292 fix update() for spheres 2023-01-27 15:24:30 +01:00
Sébastien Loriot 0f73fdb218 try workaround an issue on the testsuite I cannot reproduce 2023-01-26 11:46:00 +01:00
Sébastien Loriot cc5b000728 use a new property map with more verbose name 2023-01-19 11:30:52 +01:00
Sébastien Loriot cd76994056 rename property map and deprecated old name 2023-01-18 13:45:37 +01:00
Sébastien Loriot f4c6299adc use default random so that we can use the seed to reproduce issues 2023-01-18 10:24:34 +01:00
Sébastien Loriot 328cba0530 fix compilation issue 2022-12-27 14:40:28 +01:00
Sébastien Loriot 632c500cd5 add draft for corner extraction 2022-12-23 18:12:47 +01:00
Sébastien Loriot 4ed5c2ce65 fix include 2022-12-23 14:15:02 +01:00
Sébastien Loriot 79f03ff660 fix template parameter in the classified user manual 2022-12-22 17:26:47 +01:00
albert-github c32b1f4127 spelling corrections
Some spelling corrections (Directories starting with `S` rest - `W`),
2022-11-16 13:22:39 +01:00
Sébastien Loriot adc42a5363 add missing include directive 2022-10-27 18:16:21 +02:00
Mael Rouxel-Labbé 6f187f332c Misc minor fixes/improvements 2022-09-14 14:08:23 +02:00
Mael Rouxel-Labbé 9b265fddf8 Uniformize REQUIRED / QUIET usage:
Following this:
- CGAL: always REQUIRED
- CGAL component: COMPONENT / OPTIONAL_COMPONENT (never QUIET)
- required 3rd party: (not QUIET) + message(NOTICE "") on NOT_FOUND
- optional 3rd party: QUIET + message(STATUS "") except for Polyhedron/demo
- 3rd party components: COMPONENT / OPTIONAL_COMPONENT
                        (QUIET depending on required or optional 3rd party)
2022-09-06 16:24:27 +02:00
Sven Oesau 2321427500 Revert "using m_region_map instead of m_visited resolves failed test on Archlinux-clang-release"
This reverts commit 421c88d363.
2022-09-06 16:14:07 +02:00
Mael Rouxel-Labbé 7cb21c24b0 Uniformize message() for missing 3rd party libraries
STATUS for non-essential, NOTICE for important stuff
2022-09-06 16:07:31 +02:00
Mael Rouxel-Labbé 28ba446895 Clean (some) CMakeLists.txt indentation 2022-09-06 15:38:18 +02:00
Sven Oesau 147c092746 fixed changed include location 2022-09-02 17:05:38 +02:00
Sven Oesau 421c88d363 using m_region_map instead of m_visited resolves failed test on Archlinux-clang-release 2022-09-01 19:30:09 +02:00
Sébastien Loriot 765538818c fix warnings 2022-08-05 10:00:24 +02:00
Sébastien Loriot 738c3e9a3e missing include statement 2022-08-04 10:39:06 +02:00
Sébastien Loriot b8711b4bf5 number of regions changed since we fit triangles and no longer points 2022-08-04 09:55:56 +02:00
Sébastien Loriot ce0ae181c4 fix warning 2022-08-04 08:46:18 +02:00
Sébastien Loriot 888c64fd74 add PMP region growing function (plane/face) 2022-08-03 20:08:05 +02:00
Sébastien Loriot af974c8f98 add data member storing the number of regions detected 2022-08-03 13:19:44 +02:00
Sébastien Loriot f38a481873 add missing include statement 2022-08-03 11:37:20 +02:00
Sébastien Loriot 0177465086 add missing include directives 2022-08-03 09:18:27 +02:00
Sébastien Loriot 52ff783f21 add missing include 2022-08-02 14:59:00 +02:00
Sébastien Loriot 53cd79fa1a remove trailing whitespaces 2022-08-02 13:30:16 +02:00
Sébastien Loriot 588bbb5a23 use 2D dimension tag and centroid triangulation for non triangle faces 2022-08-02 11:56:20 +02:00
Sébastien Loriot b45c44dddc add missing parameter 2022-08-02 10:38:46 +02:00
Sébastien Loriot e344d43259 remove free_functions.h and update tests 2022-08-02 10:27:55 +02:00
Sébastien Loriot f693471647 finally get rid of conditional_deref 2022-07-22 16:07:06 +02:00
Sébastien Loriot 2541f7c22c pass the maps 2022-07-22 13:57:59 +02:00
Sébastien Loriot 5b77ac4149 remove some conditional_deref 2022-07-22 12:10:43 +02:00
Sébastien Loriot ffe2bd232a fix include 2022-07-22 11:52:52 +02:00
Sébastien Loriot d33b46724e ADL can be used with hash_value() 2022-07-22 11:52:24 +02:00
Sébastien Loriot 7a5cbc6940 fix assertion 2022-07-22 11:51:32 +02:00
Sébastien Loriot fc4b1870c4 update tests to new API 2022-07-22 11:44:47 +02:00
Sébastien Loriot a1169c021b WIP improvement on Point_set
--> plane_fit
2022-07-21 16:56:37 +02:00
Sébastien Loriot 7b8b14a37d WIP improvement on Point_set
--> sphere_fit
2022-07-21 16:56:24 +02:00
Sébastien Loriot 17b9e439ec WIP improvement on Point_set
--> line_fit
2022-07-21 15:51:42 +02:00
Sébastien Loriot 69fdb46fcb WIP improvement on Point_set
--> cylinder_fit
2022-07-21 11:42:10 +02:00
Sébastien Loriot db7dfd97e5 get rid of the GeomTraits template parameter 2022-07-21 10:20:20 +02:00
Sébastien Loriot b714a6d1ff WIP improvement on Point_set
--> circle_fit
2022-07-20 18:22:46 +02:00
Sébastien Loriot 0d0e3e4ff9 fix undoc parameter 2022-07-19 17:36:02 +02:00
Sébastien Loriot 367f3805ad remove region growing on polylines
not being able to share vertices does not really
make sense for a polyline. Segment_set should
be used instead
2022-07-19 17:33:04 +02:00
Sébastien Loriot 2c1a0fddd7 remove range as template parameter for Polygon_mesh classes 2022-07-19 17:18:20 +02:00
Sébastien Loriot 85bf2ef2b4 remove more conditional_ref from segment_set class 2022-07-19 15:28:05 +02:00
Sébastien Loriot b89bb215d3 WIP: removing InputRange from type definition 2022-07-18 18:04:45 +02:00
Sébastien Loriot 1475a61aba remove last reference to input range 2022-07-12 16:04:50 +02:00
Sébastien Loriot d7a339d621 remove the need to keep a reference to the input range 2022-07-12 15:46:57 +02:00
Sébastien Loriot 2a91d6f35b workaround to clear() 2022-07-12 11:24:07 +02:00
Sébastien Loriot 158b8535ba return the dereference as a reference
used in unordered_map
2022-07-12 10:55:16 +02:00
Sébastien Loriot c90ec50894 use Boolean_property_map 2022-07-12 06:21:30 +02:00
Sébastien Loriot 2f47bbb599 remove input range from Region_growing parameters 2022-07-11 16:59:48 +02:00
Sébastien Loriot 536fa70418 remove unused Boolean parameter 2022-07-11 15:47:05 +02:00
Sven Oesau 9fe15e6fe6 region growing on segments now uses edge_descriptor as type if available 2022-07-10 19:08:40 +02:00
Sven Oesau 6f24d198cc removal of Result_type and Unassigned_type from Region_growing
changed Primitive type declarations
2022-07-06 14:58:29 +02:00
Sébastien Loriot 6e2a091dbd fix doc 2022-07-06 14:02:16 +02:00
Sébastien Loriot 1bba24fc1e remove non-needed config 2022-07-05 14:40:03 +02:00
Sébastien Loriot 4a839b3449 backslash 2022-07-05 14:36:31 +02:00
Sven Oesau 821f7dc924 doc fix
[skip ci]
2022-07-05 11:49:15 +02:00
Sven Oesau 5dd7b2768c doc fix 2022-07-05 10:51:15 +02:00
Sven Oesau 24e0d3b194 moving free_functions out of internal 2022-07-05 10:12:42 +02:00
Sven Oesau ab049bb927 doc fix 2022-07-04 14:59:47 +02:00
Sven Oesau 51884f52e1 renaming triangle_mesh namespace back to polygon_mesh namespace 2022-07-04 14:18:07 +02:00
Sven Oesau 47f8f326fd corrections of documentation 2022-07-04 14:10:27 +02:00
Sven Oesau 365a7651af adapting benchmark 2022-07-04 14:10:27 +02:00
Sébastien Loriot c55edba1a0 fix doc issues 2022-06-27 10:14:55 +02:00
Sven Oesau a8e4050206 updated the concepts and documentation of all files 2022-06-24 17:12:43 +02:00
Sven Oesau 8a53d4c3be added a cut off to the seeds of circles, cylinders and spheres 2022-06-24 14:39:04 +02:00
Sven Oesau 573c555dd8 added missing include for boost::unordered_map 2022-06-24 12:39:13 +02:00
Sven Oesau 7866ab54bb removed RefInput_range parameter 2022-06-24 12:39:13 +02:00
Sven Oesau 17e0923058
Merge branch 'master' into Region_growing-revision-soesau 2022-06-24 11:06:56 +02:00
Sven Oesau 00601b4801 added region_index_map to Region_growing that maps Item (or face_descriptor) to std::size_t
removed Item_property_map, Item_to_index_property_map and Item_to_region_index_map
various fixes for clang errors/warnings
2022-06-23 16:28:28 +02:00
Sven Oesau 99a711168c fixing Point_set_shape_detection_plugin 2022-06-21 17:23:19 +02:00
Sven Oesau 2194211955 fixing missing include for cylinder_fitting.h 2022-06-21 17:22:38 +02:00
Sven Oesau 127971b465 removed trailing white space 2022-06-21 16:21:52 +02:00
Sven Oesau 8dd1486133 moving template method conditional_deref into partial specialized struct
removing unnecessary typename
2022-06-21 16:15:25 +02:00
Sven Oesau ee2513db89 added include of license header 2022-06-21 14:40:35 +02:00
Sven Oesau 6d469d33cd replaced std::vector<size_t> as region type by vector of input data dependent type
changing seed map to vector of input data dependent type
2022-06-21 12:47:41 +02:00
Sven Oesau 56b21dde16 removed BSL-1.0 license 2022-06-09 10:39:17 +02:00
Sven Oesau 863f89e971 added primitive to RegionType concept 2022-06-07 08:44:39 +02:00
Sven Oesau 255c1ce8f1 fixing license 2022-06-03 13:56:43 +02:00
Sven Oesau 86d26eb74d added eigen dependency 2022-06-03 13:52:21 +02:00
Sven Oesau 862e6cc473 removed unnecessary includes 2022-06-03 13:51:36 +02:00
Sven Oesau b18dcb1880 fixing license header 2022-06-03 13:46:03 +02:00
Sven Oesau 52a7c01637 providing shape parameters of detection shapes
introducing Primitive typedef to all region types
Outputiterator for region growing now needs to accept std::pair<Primitive, std::vector<std::size_t> >
2022-06-02 17:36:40 +02:00
Sven Oesau 72396b638f using proper point clouds for sphere and cylinder tests 2022-06-02 11:48:46 +02:00
Sven Oesau a10b21e7d1 added missing typename 2022-06-02 10:28:08 +02:00
Sven Oesau fc041ebd62 added least squares cylinder fitting 2022-06-01 16:23:05 +02:00
Sven Oesau cb0f9475dc renaming Polygon_mesh namespace to Triangle_mesh
renaming Region_growing_X subfolders to X
2022-05-24 21:11:32 +02:00
Sven Oesau 86a362a871 fixed reference numbers and parameters (circles) in examples 2022-05-24 16:15:43 +02:00
Sven Oesau da14e50a45 fixed number of regions in tests 2022-05-24 15:43:00 +02:00
Sven Oesau dd2774391b fixed score calculation and sorting of cylinders and circles 2022-05-24 15:13:47 +02:00
Sven Oesau 82b3626556 Corrected score to be in descending order from suitable to unsuitable seed point. 2022-05-23 14:00:15 +02:00
Sven Oesau 5ac7cd1ae9 added dynamic_face_property to save regions as face colors 2022-05-23 14:00:15 +02:00
Sébastien Loriot a54fbbf5dc init index map 2022-05-18 17:53:37 +02:00
Sébastien Loriot 66f7199b12 disambiguate 2022-05-18 17:41:11 +02:00
Sébastien Loriot 43104a2772 restore data member init 2022-05-18 16:49:03 +02:00
Sébastien Loriot 66619dbed0 no need to pass property maps 2022-05-18 16:15:02 +02:00
Sébastien Loriot 4bf1069cc8 remove extra typename 2022-05-18 15:25:37 +02:00
Sébastien Loriot 948b2b94ea provide default point and normal maps to the helper 2022-05-18 15:24:36 +02:00
Sébastien Loriot c1ad9fa755 range is a template parameter of the function 2022-05-18 15:00:03 +02:00
Sébastien Loriot 29a0343ec9 remove trailing whitespace 2022-05-18 11:57:37 +02:00
Sven Oesau b5bdc3e7ee added second constructor for passing a edgerange used for detection 2022-05-18 10:19:53 +02:00
Sven Oesau 994c7cbc26 using visited flag for rejected items 2022-05-18 10:19:13 +02:00
Sven Oesau 552fed46c7 added minimum_region_size parameter for polyline_graph construction 2022-05-15 22:26:49 +02:00
Sven Oesau aef4e58e5b Region growing now guarantees that all associated elements are within the specified tolerances of the fitted primitive 2022-05-15 22:05:04 +02:00
Sven Oesau 447f52cbc4 Moved property maps back into NamedParameters 2022-05-13 13:36:43 +02:00
Sven Oesau e5ebd268ef Consolidated free_functions.h
Moved property maps outside of NamedParameters for point-based region growing
2022-05-13 08:57:39 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00