Commit Graph

256 Commits

Author SHA1 Message Date
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
Sébastien Loriot ca36c1da05 fix include header format 2015-03-26 19:18:00 +01:00
Sébastien Loriot 1f92b66621 try to improve doc 2015-03-26 19:12:08 +01:00
Sébastien Loriot 3df82d0488 remove errors with examples in the doc 2015-03-26 15:24:38 +01:00
Sven Oesau 0e7604f32b removed _3 from all class names as _3 is included in the namespace name
added checking for degenerate cases
updated examples to new interface
use of iterator range for input points
2015-03-19 16:51:58 +01:00
Sven Oesau 51abca5ea3 changed Sd_traits to ERTraits 2015-03-17 00:04:22 +01:00
Sven Oesau c3b5c387b2 renamed examples
adapted documentation to changed file names
2015-03-16 23:54:29 +01:00
Sven Oesau 865f841fbf added suffix _3 to shape and the internal octree class names
removed some unused headers
renamed Shape_base::assigned_points to assigned_point_indices
renamed Shape_base::required_samples to minimum_sample_size
changed interface of Efficient_RANSAC according to discussion of 1st round
adapted examples
2015-03-16 23:40:55 +01:00
Sven Oesau 44955deed0 created own namespace
moved shape classes to subfolder
all shape classes are now included by Efficient_RANSAC_3
2015-03-15 21:19:58 +01:00
Sven Oesau 07a89a654b renamed Shape_detection_3 to Efficient_RANSAC_3
replaced Shape_Factory by template method of Efficient_RANSAC_3
renamed several functions and variables (from camel case to use of underscores)
2015-03-15 19:56:32 +01:00
Sven Oesau 4ed62c9931 version sent to PhD student in Aachen (Leif Kobbelts group) for review 2015-03-15 15:52:57 +01:00
Sébastien Loriot 4198ecabbb add tmp documentation only interface functions 2015-02-19 16:41:35 +01:00
Sébastien Loriot 1fd27e1cb9 use backticking 2015-02-19 16:02:56 +01:00
Sébastien Loriot 92970c81ac add missing parameter name 2015-02-19 16:01:18 +01:00
Sébastien Loriot 7474efeeb3 prevent generating a detailed description 2015-02-19 16:01:18 +01:00
Sébastien Loriot a3a3dee4cd add missing header files 2015-02-19 16:01:18 +01:00
Sébastien Loriot fb8f400adb add missing groups and bibtex id 2015-02-19 16:01:18 +01:00
pierre alliez 3a13c570cb fighting with virtual class (does not compile) 2015-02-19 16:00:15 +01:00
pierre alliez f1f805a0f1 fighting with abstract class 2015-02-19 15:37:37 +01:00
pierre alliez 5fdfa20a83 Merge branch 'Point_set_shape_detection_3-cjamin' of ssh://scm.cgal.org/var/git/cgal into Point_set_shape_detection_3-cjamin 2015-02-19 14:56:31 +01:00
pierre alliez 015f11d971 shut up warning 2015-02-19 14:54:41 +01:00
pierre alliez 3f806b8069 Now compiles on Linux (Manish) 2015-02-19 14:51:02 +01:00
Sven Oesau 37152aebe4 removed inheritance from documentation 2015-02-17 10:27:35 +01:00
Sven Oesau fdda6298e6 added virtual to all functions 2015-02-16 17:25:50 +01:00
Sven Oesau 4692d4a16b changes comment style to include comments into documentation 2015-02-16 17:21:54 +01:00
Sven Oesau 8764fc79f2 added comments 2015-02-16 17:01:15 +01:00
Sven Oesau 375b6a01c6 unified comments 2015-02-16 17:01:05 +01:00
Sven Oesau 6abc0d3950 fixed path to example 2015-02-16 17:00:35 +01:00
Sven Oesau 4f64e05d93 replaced 'subset' in first paragraph to be more consistent in usage of 'subset' 2015-02-16 17:00:21 +01:00
Clement Jamin 004f7fe445 Added a remark 2015-02-16 10:36:56 +01:00
pierre alliez 031c6dd5fc provide -> compute 2015-02-15 11:19:34 +01:00
pierre alliez 91baac79d0 One pass on doc (in particular for other types of shapes) 2015-02-15 10:48:06 +01:00
pierre alliez f8c89c01d7 some comments for code review 2015-02-15 10:19:06 +01:00
pierre alliez 6e622ac4c9 few changes in comments 2015-02-15 09:45:19 +01:00
pierre alliez f724c6c11b massaging doc (other shapes) - unfinished 2015-02-13 22:57:23 +01:00
pierre alliez f3721a8778 longer description
rename file
2015-02-13 22:14:15 +01:00
pierre alliez b78a6a2d16 One pass on examples
The basic example now registers several shapes
2015-02-13 21:57:05 +01:00
Sven Oesau 156e1401f4 added two protected methods in Shape_base for convenient point and normal access
removed some unnecessary includes
2015-02-12 14:22:28 +01:00
Sven Oesau 350b4be5a7 included 'Arbitrary shapes" section to documentation
adapted documentation/images to comments from reviewer
added examples.txt
removed unused types from documentation in shapes
added own planar shape example
2015-02-12 13:01:16 +01:00
Sven Oesau 125db85b3b fixed types 2014-11-04 11:00:38 +01:00
Clement Jamin 913d670457 My pass on the user manual 2014-10-31 17:41:35 +01:00
Clement Jamin c8997de887 Use CGAL::sqrt 2014-10-31 17:38:08 +01:00
Clement Jamin 0b5e72f08d Remove argc/argv as they are not used 2014-10-31 17:23:48 +01:00
Clement Jamin 90110dd38f Align types + remove f suffix 2014-10-31 17:22:25 +01:00
Clement Jamin a699cc8cdb Remove unused includes and typedef + clean the code 2014-10-31 17:14:07 +01:00
Clement Jamin 239f41d73c Remove unused includes and typedef 2014-10-31 17:08:52 +01:00
Pierre Alliez 50e9182746 few changes in comments 2014-10-30 15:51:33 +01:00
Pierre Alliez ccc8a0194a examples:
- rename cub.xyz to .pwn
- point with normal
- few fixes in comments
2014-10-30 15:45:08 +01:00
Pierre Alliez 9c30c5cee4 another pass on doc
one more author
2014-10-30 15:33:43 +01:00
Sven Oesau 45d4b1e8ee some changes
changed image of mesh to input point data (section performance)
2014-10-30 14:43:48 +01:00
pierre alliez 1eaaa82c5e first pass over examples 2014-10-28 08:49:56 +01:00
pierre alliez 5c8fe581c3 description 2014-10-28 08:36:01 +01:00
pierre alliez efc2f0b5c3 One global pass on user manual 2014-10-28 08:33:23 +01:00
pierre alliez ec423888c3 more on parameters 2014-10-28 07:56:08 +01:00
pierre alliez ca95a340a2 more on user manual (params)
(unfinished)
2014-10-27 22:12:29 +01:00
pierre alliez 4f7a7dcf39 more on introduction of user manual 2014-10-27 21:55:01 +01:00
Pierre Alliez 948570c7c2 massaging user manual 2014-10-27 17:21:21 +01:00
Pierre Alliez cdd8a2aa5e start massaging user manual 2014-10-27 16:17:32 +01:00
Sven Oesau aeff843b13 some corrections 2014-10-27 15:30:51 +01:00
Sven Oesau 2194594433 changed structure of user manual (added section Parameters)
added two images (impact of variation of epsilon and cluster_epsilon)
2014-10-27 15:12:19 +01:00
Sven Oesau fbfdf6c68f added two images to show impact of epsilon and cluster_epsilon
changed title
2014-10-27 09:50:09 +01:00
Sven Oesau 93b5ba7f9a added three examples:
- basic example using default parameters
- example showing parameters and different shape types
- advanced example using timing and iterating over assigned points
2014-10-27 09:30:40 +01:00
Sven Oesau 49f64a06b4 squared_distance method on single points of Shape_base is now public
added default parameters (partially based on the input data)
changed some data types from size_t to int
2014-10-27 09:27:46 +01:00
Sven Oesau 4c05f487d3 changed Shape_detection_3::add_shape_factory to remove reference to internal class 2014-10-21 11:32:01 +02:00
Sven Oesau 578b380d80 removed Shape_base::parameterExtend()
fixed spelling extend -> extent in Shape_base::connected_component
removed redundant variables in Sphere_shape and Plane_shape
2014-10-21 10:51:55 +02:00
Sven Oesau 57e6d4f5c8 adapted the code to the feedback
- replacing float/double by Kernel::FT
- changed maximum line length to 80 characters (with expection of some doxygen comments)
- size_t is now used for sizes and indexing
2014-10-17 17:16:52 +02:00
Clement Jamin 226a1dee4e Rename types to follow coding conventions 2014-07-21 15:49:20 +02:00
Clement Jamin 763ce3d135 Some fixes in the doc + renaming of some variables 2014-07-18 15:56:04 +02:00
Clement Jamin 30f4037b73 Replace a const pointer by a const ref 2014-07-18 14:54:16 +02:00
Clement Jamin 679edffd72 Rename types to follow coding conventions 2014-07-18 14:51:46 +02:00
Sven Oesau 2dc771d03a encapsulated std::max and std::min because of a conflict with a macro 2014-07-15 10:01:55 +02:00
Sven Oesau eb360523c6 changed CGAL package registration (added point_set_shape_detection_3 in some places)
adapted benchmark
small change in documentation text
2014-05-26 10:03:47 +02:00
Sven Oesau 55f4585a34 added another graph (performance depending on probability parameter) in documentation
small changes in source
2014-05-23 17:14:51 +02:00
Sven Oesau 3370e5f8e9 redesigning the interface
doxygen documentation of the public api
user manual
example added
2014-05-13 15:07:59 +02:00
Sven Oesau 7c0ed9c010 renaming of files
removed dependency on schnabels ransac
2014-05-13 14:57:37 +02:00
Sven Oesau dfb30c068b fixed connected component for cylinders (was not working correctly for large radii) 2014-02-19 09:06:00 +01:00
Sven Oesau 86834b7f2c implementation of torus and cone primitive
small bugfix in updatePoints in Efficient_ransac.h (crash)
2014-01-20 16:10:42 +01:00
Sven Oesau 0f46847b9f added profiling to implementation
StopProbability for candidate generation fixed (closer to schnabels implementation)
2013-11-25 11:32:03 +01:00
Sven Oesau a24d771308 connected component takes bitmap extend now from extracted parameters (instead from bbox)
cylinder maps sample point to axis instead of using Line::point from CGAL
added some profiling to Primitive.h
2013-11-25 11:30:34 +01:00
Sven Oesau b53fd21fc7 removed some unused code
added saving of primitives as ply
added operator for sorting to Primitive.h and Efficient_ransac.h (reference and pointer versions)
replaced point on primitive for planes with one of the samples instead of using the CGAL function
added destructor to Octree.h for memory cleanup
2013-11-25 09:36:22 +01:00