Commit Graph

324 Commits

Author SHA1 Message Date
Sébastien Loriot 0adf55363f document implementation detail 2013-02-13 08:04:00 +01:00
Sébastien Loriot 4a0e6b7707 use the note doxygen command to emphase 2013-02-12 18:35:21 +01:00
Sébastien Loriot 2f43a47554 prevent linking 2013-02-11 19:22:53 +01:00
Sébastien Loriot 63de1129d1 update code for plugin compilation 2013-01-16 18:54:59 +01:00
Sébastien Loriot b9a42236d5 port the documention to the latest CGAL doxygen setup 2013-01-16 18:05:13 +01:00
Sébastien Loriot 82eec48453 Merge branch 'gsoc2012-segmentation-iyaz-old' into gsoc2012-segmentation-iyaz
Conflicts:
	.gitattributes
	Polyhedron/demo/Polyhedron/CMakeLists.txt
2013-01-14 19:48:08 +01:00
iyaz 80521d65a4 A comment on cone-angle was forgotten, fixed. 2013-01-14 18:57:01 +02:00
iyaz e440cb2c1d AABB_traversal_traits.h & Alpha_expansion_graph_cut.h & SDF_calculation.h: Removal of unused code sections.
SDF_calculation.h: MAD for removing outlier approach
2013-01-12 21:55:34 +02:00
iyaz c6cc177bfa API function names are changed:
old name                                  -> new name
sdf_values_computation                    -> compute_sdf_values
surface_mesh_segmentation_from_sdf_values -> segment_from_sdf_values
surface_mesh_segmentation                 -> compute_sdf_values_and_segment

Also example code files are changed accordingly.
2013-01-12 15:59:58 +02:00
Ílker Yaz 03e0952c96 -code review in outlier-removal
-use make_pair & make_tuple
-handles are passed by value
2012-09-05 17:25:44 +00:00
Sébastien Loriot 5cd9c2ce74 do not document internal namespace 2012-09-03 08:52:34 +00:00
Ílker Yaz 5ff1aed804 changing dft to bft (for segment extracting)
and review.
2012-09-01 02:26:02 +00:00
Ílker Yaz ab6b5ebb57 Code & comment review. 2012-08-30 18:18:40 +00:00
Ílker Yaz 7064d52d63 Integrating MAXFLOW software. 2012-08-30 14:58:37 +00:00
Ílker Yaz 42e8424912 Taking traits object as parameter. 2012-08-30 11:41:00 +00:00
Ílker Yaz 3b121490a4 small change (convert substraction of points to vector construction) 2012-08-29 02:37:51 +00:00
Ílker Yaz 92a49835d8 Integrating Construct_centroid_3 2012-08-29 02:26:09 +00:00
Ílker Yaz 83d2f4d8b6 Integrating Construct_translated_point_3 2012-08-29 02:23:43 +00:00
Ílker Yaz fe60f52cd3 Integrating Construct_normal_3 & Construct_unit_normal_3 2012-08-29 02:16:54 +00:00
Ílker Yaz d114ec42d8 Intergating Construct_sum_of_vectors_3 2012-08-29 02:11:52 +00:00
Ílker Yaz 223ed06159 Integrating Construct_scaled_vector_3 2012-08-29 02:05:04 +00:00
Ílker Yaz 4feaec7dba Change Polyhedron::Traits with SegmentationGeomTraits
- integrate Angle_3
2012-08-29 01:58:54 +00:00
Ílker Yaz 27b6cb1507 Integrating SegmentationGeomTraits into Surface_mesh_segmentation 2012-08-29 01:14:43 +00:00
Ílker Yaz 298f168346 Integrating SegmentationGeomTraits
- New template parameter is added to SDF_calculation and Surface_mesh_segmentation
- mesh_segmentation.h is changed according to passing trait parameter to Surface_mesh_segmentation
2012-08-29 00:57:38 +00:00
Ílker Yaz 445e63c40c Added test files, and code review. 2012-08-29 00:16:44 +00:00
Sébastien Loriot 38a712b5cf introduce the geometric traits in the code and
in the documentation, but did not really change something in the code.
2012-08-28 15:28:37 +00:00
Sébastien Loriot 7fb3bfaaa2 avoid conflict with CGAL::internal::sqrt 2012-08-28 13:21:47 +00:00
Sébastien Loriot 98ec2762eb use CGAL's sqrt function 2012-08-28 13:18:54 +00:00
Sébastien Loriot aa3a0b0cdf fix initialization order 2012-08-28 13:16:26 +00:00
Ílker Yaz d92e7ecebd Small correction for comments. 2012-08-28 02:49:42 +00:00
Ílker Yaz ab9cb4b250 Code review. 2012-08-28 02:44:30 +00:00
Sébastien Loriot 1a62f79ae1 rephrase doc 2012-08-27 08:57:28 +00:00
Ílker Yaz 6b8835b9b1 User manual is updated.
Code review (unused includes are removed)
(Added an experimental filtering)
2012-08-27 02:40:34 +00:00
Ílker Yaz c001aa1662 Now, returned segment-ids are ordered by average sdf value of the segment (facets that construct that segment). 2012-08-24 19:33:41 +00:00
Ílker Yaz 58fccbef0a Fix a copy-paste error. 2012-08-24 02:53:25 +00:00
Ílker Yaz b093a9a7c7 Small changes on Surface_mesh_segmentation 2012-08-24 02:29:00 +00:00
Ílker Yaz d6f1d70ebe Fix (copy/paste error) 2012-08-23 13:37:51 +00:00
Ílker Yaz 83d5a268c8 remove unused functions 2012-08-23 12:27:21 +00:00
Sébastien Loriot de3c160b41 rephrase 2012-08-23 07:25:55 +00:00
Sébastien Loriot 17aff431e2 missing typename 2012-08-23 06:23:34 +00:00
Ílker Yaz 0c484a175e Changes on documentation & Small change on demo. 2012-08-23 00:50:22 +00:00
Ílker Yaz fcfc79dfc7 1) Surface_mesh_segmentation does not hold any state now.
2) Demo is updated (it uses the API now) (also cleaned)
   Also SDF values that are used for visualization (result of "Calculate SDF") is now linearly normalized values (previously they were log-normalized)
3) New example is added (using id's to access pmap data)
2012-08-22 15:37:31 +00:00
Sébastien Loriot 3e5d71bcaa update reference manual 2012-08-21 07:38:50 +00:00
Sébastien Loriot edec4fd899 accomodate change in template parameters 2012-08-21 07:18:25 +00:00
Sébastien Loriot 407e8c12da invalid end of comment 2012-08-21 06:56:48 +00:00
Ílker Yaz 7d4447bd1c Alpha_expansion_graph_cut.h:
Mostly reviewing. Also including a note about performance.
It now contains an implementation which uses MAXFLOW software (see comments in performance)

Documentation update (reference manual part)
2012-08-21 02:48:34 +00:00
Ílker Yaz ccfa68b331 small fix 2012-08-20 12:15:01 +00:00
Ílker Yaz 6887a24ec0 Warnings are fixed (hopefully). 2012-08-20 11:50:53 +00:00
Sébastien Loriot 252a20862c do not document internal class 2012-08-20 08:45:21 +00:00
Sébastien Loriot f2abaabc8f reorder init of members 2012-08-20 08:27:55 +00:00
Sébastien Loriot 9b407ec3c1 reorder initialization of members 2012-08-20 07:29:52 +00:00
Sébastien Loriot 6d8a745407 fix compilation issue on linux 2012-08-20 06:56:54 +00:00
Ílker Yaz ec4e20c39c Documentation updates.
Filters are moved to another file (Filters.h)
Surface_mesh_segmentation.h moved to internal folder (and namespace).
2012-08-20 02:29:43 +00:00
Ílker Yaz cd74403410 Documentation update 2012-08-17 17:16:06 +00:00
Ílker Yaz a743b4d572 Small corrections on examples 2012-08-16 22:59:22 +00:00
Ílker Yaz 166034aac6 Documentation update. 2012-08-16 22:38:02 +00:00
Ílker Yaz 746fdb74a3 Documentation update. 2012-08-16 01:52:30 +00:00
Ílker Yaz 0898e0a24e Mostly documentation update,
Also small adaptor for pmap (in Surface_Mesh_Segmentation.h).
2012-08-15 17:40:44 +00:00
Ílker Yaz bd16899b40 doc folder generated. 2012-08-14 01:15:23 +00:00
Sébastien Loriot cc454b6386 remove double init 2012-08-13 13:49:10 +00:00
Ílker Yaz 66d1bf2351 Supporting meshes which have holes.
Commenting Surface_mesh_segmentation.h functions.
2012-08-10 17:15:47 +00:00
Ílker Yaz ed2c1a2072 Code review ( Additions to Disk_sampling.h) 2012-08-10 00:44:58 +00:00
Ílker Yaz c069153f81 Reducing effect of smoothing.
(Actually needs to be adaptive (according to triangle count etc.))
2012-08-07 14:02:18 +00:00
Ílker Yaz 10f4ec26ad Changing dihedral-calculation function (using Mesh_3::dihedral_angle)
Added logging code.
2012-08-07 00:45:57 +00:00
Ílker Yaz 8e05879f2a Code review,
Doxygen style commenting SDF_calculation.h
Seperating 'ray sampling from cone' from SDF calculation. 
(Advanced user might want to place their own sampling algorithm for SDF calculation)
2012-08-06 20:30:37 +00:00
Ílker Yaz 722369eda0 Reverting graph-cut to its first version.
Adding logging to Graph-cut.
2012-08-06 17:46:36 +00:00
Ílker Yaz 49a03e1876 Added print-outs for debugging. 2012-08-06 13:47:17 +00:00
Ílker Yaz bbec5ac94e Small changes in demo.
(Setting rendering mode for item)
2012-08-03 10:13:54 +00:00
Ílker Yaz 050562a5c8 demo update- 2012-08-03 09:24:39 +00:00
Ílker Yaz 58b1a2ed41 Demo - small changes. 2012-08-01 12:14:31 +00:00
Sébastien Loriot a47e562f2e fix compilation on linux 2012-07-31 06:10:18 +00:00
Ílker Yaz 4142ebbddc typo correction. 2012-07-31 01:47:31 +00:00
Ílker Yaz 792ab1f525 Using FacetIndexMap for in Surface_mesh_segmentation.
(other structures which have a facet as key-value are converted to vectors)
Using const Polyhedron& as a parameter (previously I was using Polyhedron pointer).

mesh_segmentation.h added for API which includes free functions.

AABB_const_polyhedron_triangle_primitive.h is added for supporting Facet_const_iterator as a parameter to AABB Tree. (I am not sure that is the best solution.)
2012-07-31 01:01:18 +00:00
Sébastien Loriot d2b5143ab7 fix compilation issue on linux 2012-07-30 08:16:36 +00:00
Ílker Yaz 3b3df1e417 Comments in Expectation_maximization. 2012-07-26 00:35:37 +00:00
Ílker Yaz 7ab40cfe7a Code review.
SDF Calculation is separated from Surface_mesh_segmentation (more compact design).
K-means clustering is 'heavily' commented in Doxygen style.
2012-07-24 23:58:36 +00:00
Ílker Yaz 6c28442322 Mostly code review. 2012-07-18 23:33:34 +00:00
Ílker Yaz acd80fa21e Cast more rays if accepted rays after outlier removal are below some threshold.
Graph-cut experimets for optimization.
Sampling methods are removed (other than Vogel).
(a not for me: benchmark result-10)
2012-07-17 23:35:51 +00:00
Ílker Yaz c6b47c931c Smoothing approaches. 2012-07-12 11:54:15 +00:00
Ílker Yaz 3e25f4267f A new cone sampling approach,
Automatic estimation of number of clusters (experiments)
Removed two outlier removal functions (one remains).
2012-07-09 18:39:30 +00:00
Ílker Yaz 9ace58d7d5 EM - log-sum-exp trick addition. 2012-07-05 00:19:28 +00:00
Ílker Yaz 23465d67a2 Demo update
K-means: implemented k-means++ for initialization (just for try)
2012-06-28 17:31:50 +00:00
Ílker Yaz e7e45a3587 Additions to segmentation, and parameter adjustments. 2012-06-26 00:25:40 +00:00
Ílker Yaz e130186592 Some experimental code (for graph-cut), and additions to other source files. 2012-06-21 23:24:01 +00:00
Sébastien Loriot d0e208d165 missing typename + CGAL::max missing include? 2012-06-21 07:11:01 +00:00
Ílker Yaz 14a1fad644 A few additions to graph-cut, and EM. 2012-06-20 19:08:32 +00:00
Ílker Yaz 8e0538d2c7 First version of alpha expansion graph cut. 2012-06-19 18:17:19 +00:00
Ílker Yaz 9d28b10663 Alpha_expansion_graph_cut includes simple graph-cut only. 2012-06-18 21:24:40 +00:00
Ílker Yaz 3b2fd53b48 AABB traversal traits: additions for 'return closest' trait. 2012-06-15 22:35:45 +00:00
Ílker Yaz daf1187c0d Profile function for providing info about AABB - ray/segment intersections. 2012-06-14 15:38:10 +00:00
Ílker Yaz f66b998a45 Another function for calculating dihedral angles,
(will be reduced to one function)
2012-06-14 10:08:42 +00:00
Sébastien Loriot 3d6995b23b add a switch to shoot only rays 2012-06-14 07:17:01 +00:00
Ílker Yaz 5e3da7d5fc commented lines - (not changing anything at all, just for internal use). 2012-06-13 19:50:59 +00:00
Ílker Yaz 5819ab029f Addition for using segments for SDF calculation. 2012-06-13 17:28:47 +00:00
Sébastien Loriot 17eedd3969 new AABB_traits that make a do_intersect before intersection
that speed up the run time.
2012-06-13 09:09:19 +00:00
Sébastien Loriot 076dc28e3b revert modifications in AABB_tree package and put them in a dedicated file for the package 2012-06-13 08:37:52 +00:00
Ílker Yaz 17b1662b4f EM - now just using matrix-based algorithm. 2012-06-12 18:06:23 +00:00
Ílker Yaz 87ad1a4f8a A few more small changes. 2012-06-12 15:51:09 +00:00
Ílker Yaz e16ef4c0ac small changes considering Andreas's comments 2012-06-12 15:06:13 +00:00
Andreas Fabri 16ce6302fb some minor comments on the code, Best regards, andreas 2012-06-12 14:02:15 +00:00
Sébastien Loriot 91bf02acc1 missing typename 2012-06-12 12:04:09 +00:00
Ílker Yaz 4e06dc8221 uncomment header includes 2012-06-12 09:35:53 +00:00
Ílker Yaz 6fd7deecc9 Forgotten comments - removed 2012-06-11 18:27:06 +00:00
Ílker Yaz 299b48fcfb forgotten line - added in dihedral angle computation. 2012-06-11 18:25:49 +00:00
Ílker Yaz d04a716854 Dihedral angle computation, with concave filtering. 2012-06-11 18:20:29 +00:00
Ílker Yaz 8aa3d37806 EM - using probability-matrix (center x point), a faster implementation (nearly 2x). 2012-06-08 18:48:26 +00:00
Ílker Yaz b96af69120 internal code left uncommented - commented. 2012-06-08 06:49:35 +00:00
Ílker Yaz 915b71b951 Filtered traversal for AABB - just a sketch implementation with a lot of assumptions. 2012-06-07 18:14:52 +00:00
Ílker Yaz 11a35afb12 Several modifications in segmentation, EM, k-means:
segmentation : moving center points which falls wrong side of the facet.
EM: random initialization
2012-06-07 12:21:02 +00:00
Ílker Yaz 66d4234134 correction - 2012-06-05 17:29:38 +00:00
Ílker Yaz a9215c5c00 small modifications on k-means and segmentation, random initialization is added in EM. 2012-06-05 13:11:44 +00:00
Sébastien Loriot 84334e6bc1 renaming 2012-06-05 09:35:00 +00:00
Sébastien Loriot 4899778c41 remove warnings and compilation issue on linux 2012-06-05 09:27:37 +00:00
Sébastien Loriot ba86b462b6 remove warnings and compilation errors on linux 2012-06-05 07:15:39 +00:00
Ílker Yaz 26ea633931 Demo commit. 2012-06-04 17:11:43 +00:00
Ílker Yaz 203905730f Mostly code review + a few small addition to segmentation 2012-06-01 18:33:53 +00:00
Ílker Yaz ae1b4eb61f some modifications on EM, first version of k-means clustering. 2012-05-31 16:30:18 +00:00
Sébastien Loriot bbda7671d8 fix for linux 2012-05-30 08:13:02 +00:00
Ílker Yaz 1a97c50d10 reversing changes. 2012-05-29 23:10:23 +00:00
Ílker Yaz e96059b6f9 Adding typename keyword. 2012-05-29 23:05:07 +00:00
Ílker Yaz 83b5c4b029 First commit of EM, also several changes in segmentation 2012-05-29 19:06:30 +00:00
Sébastien Loriot 2d597b30bd add comments
linux compilation fix
2012-05-29 12:34:57 +00:00
Ílker Yaz 98aa5931b6 Several changes in Surface_mesh_segmentation.h 2012-05-27 22:34:14 +00:00
Ílker Yaz d2e22d67f6 5/23/2012 - First Version of Surface_mesh_segmentation.h 2012-05-23 20:32:33 +00:00