songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
70,153 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

335 Commits

Author SHA1 Message Date
Clement Jamin b0add30089 Updated the concept accordingly 2015-07-10 09:08:20 +02:00
Clement Jamin bb5b745d98 The torus is working fine, now 2015-07-10 09:08:07 +02:00
Clement Jamin fbb6494658 Restore Point_set_shape_detection_3/test_torus_connected_component.cpp 2015-07-10 08:39:20 +02:00
Sven Oesau 3e218a2c07 adapted torus to traits concept 
ToDo: Collinear_2 needs to be adapted
 2015-07-10 00:14:09 +02:00
Sven Oesau bb2998e11f bugfix 2015-07-10 00:12:32 +02:00
Clement Jamin 00e48dd169 Added right header in comments 2015-07-09 10:27:14 +02:00
Clement Jamin 7ee1ac7c41 Fix warnings 2015-07-09 10:22:43 +02:00
Clement Jamin 33d1b9f971 Doc: updated requirements for the shapes 2015-07-09 10:01:45 +02:00
Clement Jamin 7c45024d90 Dispatched utilities 2015-07-09 09:38:08 +02:00
Clement Jamin b19f7107de We don't care about "i" 2015-07-09 09:37:27 +02:00
Clement Jamin e4c7d8a865 Fix most tests 2015-07-09 09:20:45 +02:00
Clement Jamin 40fd40cc0e Missing param 2015-07-09 09:20:25 +02:00
Clement Jamin b645b9b084 Compute_cross_product_3 => Construct_cross_product_vector_3 2015-07-09 08:59:06 +02:00
Clement Jamin b1a8059dc3 Fix warning 2015-07-09 08:58:43 +02:00
Clement Jamin daaa0a87d1 Update the real traits class 2015-07-09 08:58:22 +02:00
Clement Jamin 36d7bfa2c8 Compute_cross_product_3 => Construct_cross_product_vector_3 2015-07-09 08:57:27 +02:00
Clement Jamin 553b240631 Fix the traits concept 2015-07-09 08:55:55 +02:00
Clement Jamin 8be5f5d31a Restore the generators as they was before 2015-07-09 08:49:22 +02:00
Clement Jamin 6dc0ff6ada Reordering 2015-07-09 08:28:07 +02:00
Clement Jamin 545756f2fc Merge branch 'Point_set_shape_detection_3-cjamin' of github.com:CGAL/cgal-dev into Point_set_shape_detection_3-cjamin 2015-07-09 08:09:13 +02:00
Clement Jamin 0968103236 Removed warning 2015-07-09 08:08:58 +02:00
Sébastien Loriot a2c1f72164 fix compilation issue 2015-07-09 08:07:49 +02:00
Clement Jamin 5d5b60d130 Revert "Make the utilities public" 
This reverts commit 230c4aea14.
 2015-07-09 07:47:36 +02:00
Clement Jamin 230c4aea14 Make the utilities public 2015-07-09 07:45:53 +02:00
Clement Jamin 986571c5e9 Added Efficient_RANSAC_fake_traits_for_testing.h to dont_submit 2015-07-08 19:49:57 +02:00
Clement Jamin 3d4832f0b8 Restore torus => doesn't compile for now 2015-07-08 19:48:57 +02:00
Clement Jamin f64caa9a93 WIP: use functors from the trait class and update the concept 
Temporarily replaced the actual traits class by a fake one to test the concept
Only a few examples compile for now
 2015-07-08 19:45:02 +02:00
Sven Oesau d73676eb8f renamed several variables to follow CGAL standard 
changed main loop: after search probability for min_points is surpassed, no more candidates are generated and the remaining ones are searched. Duplicate candidates are filtered.

added Shape_base::is_same(): compares to shapes by testing distance and normal deviation from random points from other shape
 2015-07-08 18:55:52 +02:00
Sven Oesau f550b731ce changed Shape_base::squared_distance to const 2015-07-08 18:38:09 +02:00
Clement Jamin 385b5ee6ac Fix warnings + CGAL_M_PI => CGAL_PI 2015-07-07 16:54:27 +02:00
Clement Jamin 61eb5e7640 Fix PI macros 2015-07-07 12:06:45 +02:00
Sven Oesau 8db1f99353 bugfix 2015-07-07 12:06:45 +02:00
Sven Oesau 44a01d3b4c removed cross filtering kernel 2015-07-07 12:06:45 +02:00
Sven Oesau 81033fd37d added connected component for cones 
2 case handling:
flat cones (opening angle > PI/4) are mapped onto circles
acute cones are mapped onto rectangular parameter space
 2015-07-07 12:06:45 +02:00
Sven Oesau b58bc98206 added cross kernel for connected component labeling 2015-07-07 12:06:45 +02:00
Sven Oesau e2d60afdee unit tests for connected component now use the number of input points after filtering for parametrization 2015-07-07 12:06:45 +02:00
Sven Oesau fbdfc61922 corrected the default value of the min_points parameter as specified in documentation (1% of input points), but not less than 10 points 2015-07-07 12:06:44 +02:00
Sven Oesau 4e51eee527 adjusted parameters for sphere connected component unit test 2015-07-07 12:06:44 +02:00
Sven Oesau 8949009469 moved pi defines to Shape_base 2015-07-07 12:06:44 +02:00
Sven Oesau a2dc47ca3e fixed warning 2015-07-07 12:06:44 +02:00
Sven Oesau 73e28e6798 some bugfixes 2015-07-07 12:06:44 +02:00
Sven Oesau c1669667d3 added connected component for Sphere 
removed few warnings
 2015-07-07 12:06:44 +02:00
Sven Oesau 3300eb746b changed connected component (more flexible for other shape types) 2015-07-07 12:06:43 +02:00
Sven Oesau 272b29209e Fixed deadlock in test_cone_parameters by increasing point density 2015-06-29 15:49:42 +02:00
Sven Oesau dc3eb93332 avoiding crash if Efficient_RANSAC instance is released after releasing the input data range 2015-06-29 15:46:51 +02:00
Sven Oesau ab7a764f53 Revert "changed connected component" 
This reverts commit f525f447b2bd1aa2f004d2be0705c7749eef235b.
 2015-06-29 15:40:54 +02:00
Sven Oesau 365d114ac0 changed connected component 
removed wraps_u_wraps_v
adapted plane and cylinder
 2015-06-29 11:13:22 +02:00
Sven Oesau d9ab3eec09 prevent spheres to be detected as tori (decision based on chosen epsilon) 2015-06-29 10:47:07 +02:00
Sven Oesau 0365e18bc9 small simplification of subset random number generation 2015-06-29 10:01:30 +02:00
Sven Oesau d8a830183a fixed warning and added a check to the average distance of assigned points 2015-06-27 10:44:34 +02:00
Clement Jamin a1b916c578 Fix warning: unused types 2015-06-26 19:20:58 +02:00
Sven Oesau 9c69a5f0d4 added data/cube.pwn 2015-06-26 15:44:09 +02:00
Sven Oesau 8ce8ebaff2 fixed memory leak 2015-06-26 14:50:57 +02:00
Sven Oesau 9513f2ecc3 downsampled example data set 
moved data set to data folder
 2015-06-26 14:49:48 +02:00
Clement Jamin 43a4a00964 Fix warnings 2015-06-23 17:58:30 +02:00
Clement Jamin a9be1b0a20 "template" not needed here 2015-06-23 08:49:23 +02:00
Clement Jamin d1e901d9c4 Oops 2015-06-22 20:19:27 +02:00
Clement Jamin 6ef625cc58 Temporary comment this test 2015-06-22 18:09:09 +02:00
Clement Jamin 136c6c6886 Use std::distance + reduce some line lengths 2015-06-22 11:30:13 +02:00
Clement Jamin b6e3c417aa Fix warnings 2015-06-22 11:15:11 +02:00
Clement Jamin 1335a1eaf7 Use CGAL::abs everywhere 2015-06-22 11:09:23 +02:00
Clement Jamin 40df02cc75 Removed "template" keyword + quick note in the doc 
"template" should only be added before "add_shape_factory"
when the call is within a template
 2015-06-22 10:43:21 +02:00
Clement Jamin 1f16a606d9 Fix compilation with GCC 2015-06-22 10:41:19 +02:00
Sven Oesau f139720b8d added unit test for scenes 
accesses all points assigned to a shape
retrieves the unassigned point range
validates coverage
requires cube.pwn
 2015-06-22 00:04:31 +02:00
Sven Oesau 17caccffea added calls to all specific shape functions 
added remaining connected component unit tests
small bugfixes (small datasets, cylinder parameter space mapping)
 2015-06-21 22:58:18 +02:00
Sven Oesau 086363af4f connected component unit test for torus 
some parameter and comment adjustments
 2015-06-21 15:38:07 +02:00
Sven Oesau 529327b603 renaming file for consistency 2015-06-21 15:36:01 +02:00
Andreas Fabri 27aa60c2dc more fixes 2015-06-19 10:04:36 +02:00
Andreas Fabri 8615f1b874 protect max() 2015-06-19 09:06:06 +02:00
Sven Oesau 3c50ebbb95 64 bit compatibility 
changed random index selection in Octree to Random::uniform_int
switched hypergeometrical_dist from int to std::ptrdiff_t
 2015-06-17 17:36:07 +02:00
Sven Oesau dfba7e2ce0 changed variable naming in several classes to match CGAL standard 
octree now uses size_t instead of singed integers
added missing Plane::d() function to retrieve d parameter from plane equation (= - distance from origin)
changed many variables from int to size_t to remove 64 bit warnings
 2015-06-17 10:27:14 +02:00
Clement Jamin 114aa3e6c2 Fix GCC compilation of examples 2015-06-15 14:33:40 +02:00
Clement Jamin dd855e0a43 Missing "template" 2015-06-15 14:26:32 +02:00
Clement Jamin 7453cfe396 Unused varialbe 2015-06-15 14:04:18 +02:00
Clement Jamin 4519de4b12 Merge branch 'Point_set_shape_detection_3-cjamin' of github.com:CGAL/cgal-dev into Point_set_shape_detection_3-cjamin 2015-06-15 14:01:22 +02:00
Clement Jamin 83cbb3b2f4 Use CGAL::Random instead of C++11 2015-06-15 14:01:07 +02:00
Clement Jamin d1563accc1 Missing typename, missing include and unused var 2015-06-15 13:55:34 +02:00
Clement Jamin 06b210f25a Fix "typename"-related issues 2015-06-15 13:48:45 +02:00
Sven Oesau 471166dc3b more unit tests 2015-06-15 12:22:43 +02:00
Sven Oesau d42aa18936 bugfix for clang (removed empty Filter_unassigned_points constructor) 
removed several warnings
switch to CGAL::sqrt
 2015-06-15 11:21:08 +02:00
Clement Jamin be9a7921eb Revert "Missing parenthesis" 
This reverts commit 5a620cb873d2665eeac0f2d948fd03b578e9b127.
 2015-06-12 17:39:17 +02:00
Clement Jamin f8cab87f5f Fix more errors 2015-06-12 17:31:04 +02:00
Clement Jamin ecfc04d451 Fix more compilation errors on GCC 2015-06-12 17:29:25 +02:00
Clement Jamin 1e39860061 Missing parenthesis 2015-06-12 17:06:45 +02:00
Clement Jamin a5e017a7c3 Remove "SIZE_MAX" 2015-06-12 16:51:32 +02:00
Clement Jamin 3ca23b41b6 Fix some compilation errors on GCC 2015-06-12 16:49:18 +02:00
Clement Jamin bfa7c1cd18 Add CmakeLists.txt files 2015-06-12 16:18:08 +02:00
Pierre Alliez a076bc5630 quick code review (some comments for Sven) 2015-06-03 11:54:20 +02:00
Sven Oesau 7adb8b5a1a first draft of unit tests 2015-06-02 13:15:34 +02:00
Sven Oesau 4fbb438a8a fixed memory leak 2015-06-02 13:15:15 +02:00
Sébastien Loriot 0b77c9bf7e use CGAL::default_random instead of std::mt19937 2015-05-15 09:13:49 +02:00
Sébastien Loriot f7804127e9 give the shapes access to the traits 2015-04-29 15:28:15 +02:00
Sébastien Loriot dbf54bc4f4 the constructor of the default traits takes the geometric traits as parameter 2015-04-29 15:27:43 +02:00
Sébastien Loriot 37922582ff remove a More in the doc 2015-04-29 15:19:09 +02:00
Sébastien Loriot 4bc3ed055b fix compilation issues and warnings 2015-04-29 14:54:02 +02:00
Sébastien Loriot 7c757b8d8c fix the return type of point() and normal() 2015-04-29 14:36:44 +02:00
Sébastien Loriot 782a21822c clean do not call clear_shape_factories 2015-04-29 14:33:42 +02:00
Sven Oesau 41de18ca64 added traits class to Shape_base (set via compute) 
removed clear_shape_factories()
removed unused member
 2015-04-29 12:22:29 +02:00
Sébastien Loriot 13ef35d8e6 remove extra comma 2015-04-28 21:11:20 +02:00
Sébastien Loriot 3f6eba7993 improve wording 2015-04-28 21:10:40 +02:00
Sven Oesau e3761ae9d2 added example call to Efficient_RANSAC::add_shape_factory() documentation 2015-04-28 17:49:38 +02:00
Andreas Fabri 3983a2cb02 fix 'Adding More Shapes' 2015-04-24 16:36:49 +02:00
Sven Oesau 83b7a30f8f changed 0.05 to 5% (documentation) 2015-04-24 16:26:24 +02:00
Andreas Fabri 6a7500a881 polish 2015-04-24 16:10:07 +02:00
Andreas Fabri 6a81833648 polish 2015-04-24 16:04:46 +02:00
Andreas Fabri 831c6f383a Add an example that uses the custom shape (and fix bugs in the custom shape) 2015-04-24 15:54:39 +02:00
Sébastien Loriot b0f50afafe fix citation 2015-04-24 15:26:38 +02:00
Sébastien Loriot 50cba4f5cb uniformize 2015-04-23 09:13:59 +02:00
Sébastien Loriot 08f17c33eb update doc 2015-04-23 08:43:57 +02:00
Sébastien Loriot 87ec11c370 Search_traits_3 requires a Kernel as template parameter 2015-04-23 08:42:56 +02:00
Andreas Fabri 676fd7d1c4 renamed assigned_points_indices to indices_of_assignd_points 2015-04-22 20:08:37 +02:00
Andreas Fabri b282414acf renamed unassigned_points_indices to indices_of_unassigned_points 2015-04-22 19:43:41 +02:00
Andreas Fabri 0676c53db4 fixes so that the examples compile again 2015-04-22 19:24:19 +02:00
Andreas Fabri fbf6926585 polish 2015-04-22 18:40:35 +02:00
Andreas Fabri 3aabefb150 refer to the property maps 2015-04-22 17:39:29 +02:00
Andreas Fabri 75622f39e4 Point ->Point_3 2015-04-22 17:39:29 +02:00
Sébastien Loriot 447d9adce0 fix link to pmap chapter 2015-04-22 17:02:09 +02:00
Andreas Fabri 62da6b4082 WIP concerning feedback of reviewers 2015-04-22 16:32:27 +02:00
Andreas Fabri cd693f27cb typos 2015-04-22 12:35:39 +02:00
Sven Oesau 6f9ac59ec5 renamed unassigned_points() to unassigned_points_indices() 2015-04-21 10:03:14 +02:00
Sven Oesau 7aeecf742b changed Shape_range and unassigned_points to Iterator_range 2015-04-20 23:26:18 +02:00
Sven Oesau 9f3da4f70d adapted example to perform multiple detects and choose one set of shapes 2015-04-20 22:56:56 +02:00
Sven Oesau bc5cba7df6 adapted to boost::shared_ptr 2015-04-20 14:08:41 +02:00
Sven Oesau 7dce2f8303 changed term 'spatially neighbored' to 'connected component' 2015-04-20 13:45:51 +02:00
Sven Oesau 64f2036e69 remove Geom_traits from Efficient_RANSAC_traits 
added used classes to Efficient_RANSAC_traits
boost::shared_ptr are now used for shapes retrieved from Efficient_RANSAC
renamed build_octrees to preprocess
renamed set_input_data to set_input
 2015-04-20 13:34:35 +02:00
Sébastien Loriot dee7570550 fix anchor 2015-04-10 14:09:40 +02:00
Andreas Fabri 4a0f1e7926 cleanup 2015-04-10 09:04:06 +02:00
Andreas Fabri ff460d5f42 fix the scope 2015-04-08 14:18:48 +02:00
Andreas Fabri ff4807c86c prefix with namspace to get the links right 2015-04-07 19:43:29 +02:00
Andreas Fabri 01ac9aca1c rename main file 2015-04-07 19:43:28 +02:00
Andreas Fabri 0e7020459e capitalize words in headings 2015-04-07 19:43:27 +02:00
Andreas Fabri f2f1e238c1 Property_map is in Pount_set_processing 2015-04-07 19:43:26 +02:00
Sven Oesau adbe110d44 removed unused variable (remnant of debugging code) 
made variable naming more consistent
 2015-04-03 10:08:42 +02:00
Clement Jamin e2eb54590c Pass on the doc 2015-03-27 11:17:13 +01:00
Sébastien Loriot dba58b759a fix typo 2015-03-26 23:47:58 +01:00
Sébastien Loriot b7bd609b20 do not document unused types 2015-03-26 23:44:43 +01:00
Sébastien Loriot 201e76025a use an input range instead of an input iterator in the traits 2015-03-26 23:40:25 +01:00
Sébastien Loriot c0f0b1cd32 rename property map 2015-03-26 23:08:03 +01:00
Sébastien Loriot fd69bbcb4c rename template parameter 2015-03-26 22:58:19 +01:00
Sébastien Loriot 63eb246f93 rename traits 2015-03-26 22:54:42 +01:00
Sébastien Loriot 9958f98341 fix include directives 2015-03-26 22:23:18 +01:00
Sébastien Loriot 995bdbe3f9 move the traits into its own file 2015-03-26 22:21:31 +01:00
Sébastien Loriot 580ebebd03 add traits concept and use a group for the shapes 2015-03-26 22:19:37 +01:00
Sébastien Loriot 47a3023244 add todo 2015-03-26 21:54:58 +01:00
Sébastien Loriot 381cb4edf8 rephrase citation 2015-03-26 21:43:00 +01:00
Sébastien Loriot 9172a349f8 move RANSAC algo header to subdirectory and add convenience header 2015-03-26 20:22:34 +01:00
Sébastien Loriot c6153f1c3c make the demo plugin working again 2015-03-26 20:13:12 +01:00
Sébastien Loriot 61e664c5d2 uppercase RANSAC 2015-03-26 19:35:39 +01:00
Sébastien Loriot bc2555be33 remove warnings and add todos 2015-03-26 19:29:34 +01:00
Sébastien Loriot ea824c5794 fix compilation error 2015-03-26 19:22:33 +01:00