Commit Graph

684 Commits

Author SHA1 Message Date
Simon Giraudot 8f98d9dc0a Fixed indentation issues 2015-08-31 10:09:54 +02:00
Simon Giraudot 28e5432c16 Renaming 'VCM' to 'diagonalize' 2015-08-31 08:30:01 +02:00
Sébastien Loriot aed4e8b2fc fix doc typos 2015-08-28 15:36:29 +02:00
Simon Giraudot bd7ea48403 Propagating API change to Point_set_processing package (vcm_estimate_*) 2015-08-26 14:01:47 +02:00
Simon Giraudot 146378dd38 Fix compilation errors if TBB is missing (missing #ifdef in the files) 2015-08-24 10:22:54 +02:00
Simon Giraudot abf9063561 Move Eigen_vcm_traits.h to Solver package 2015-08-20 16:43:58 +02:00
Simon Giraudot 05e0965655 Fix warnings of possible loss of data converting std::size_t to unsigned int 2015-08-19 15:22:17 +02:00
Simon Giraudot bf70be5a52 Update function calls with concurrency tag 2015-08-19 11:59:22 +02:00
Simon Giraudot 84528727a1 Fix warning unused variable 2015-08-18 11:50:26 +02:00
Simon Giraudot 24c89aaf00 Added missing TBB includes 2015-08-18 11:49:25 +02:00
Simon Giraudot 77779ff559 PCA estimate normals parallelized with TBB 2015-08-18 11:16:46 +02:00
Simon Giraudot 0902708bfd Removed useless namespace 2015-08-18 11:09:34 +02:00
Simon Giraudot 6f0113054a Removed useless point counter 2015-08-18 11:08:28 +02:00
Andreas Fabri 67d72675fe split packages 2015-08-17 23:46:59 +02:00
Simon Giraudot 9ae599848d Compute average spaciong parallelized with TBB 2015-08-17 12:12:35 +02:00
Simon Giraudot 8fa51591d7 Added missing tbb include 2015-08-17 12:04:38 +02:00
Simon Giraudot 82d91da597 Removed unused propertymap attribute 2015-08-17 08:29:16 +02:00
Simon Giraudot f85b38361a Jet estimate normals parallelized with TBB 2015-08-17 08:28:09 +02:00
Simon Giraudot 34cc20a034 Removed useless function 2015-08-14 17:18:47 +02:00
Simon Giraudot 734c491ac8 Jet smoothing parallelized with TBB 2015-08-14 17:12:02 +02:00
Clement Jamin 3fac8e761a Merge branch 'Point_set_shape_detection_3-cjamin-old' into Point_set_shape_detection_3-cjamin 2015-06-30 10:36:11 +02:00
Clement Jamin ad91ed562f Fix a warning 2015-06-26 19:20:31 +02:00
Sébastien Loriot 646650be81 disambiguate call to std::sqrt for MSVC10 2015-06-10 16:12:59 +02:00
Sébastien Loriot 966f0188b2 force use of std::sqrt 2015-06-08 12:06:23 +02:00
Sébastien Loriot fb2a3a2f50 accomodate update of the halfspace intersection that is now outward oriented 2015-06-05 14:43:55 +02:00
Sébastien Loriot 11a75f1e3c remove extra semi-columns 2015-06-05 14:32:04 +02:00
Sébastien Loriot c2cd87865e Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron
Conflicts:
	Installation/changes.html
	Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
	Point_set_processing_3/doc/Point_set_processing_3/Point_set_processing_3.txt
	Point_set_processing_3/doc/Point_set_processing_3/examples.txt
	Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
	Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-06-04 11:27:56 +02:00
Sébastien Loriot a2f05fb8bb remove warning 2015-05-19 16:43:27 +02:00
Sébastien Loriot bdba9d2c7c do not convolve if nb neighbors <= 0 2015-05-19 16:09:41 +02:00
Sébastien Loriot 0036cc585e add a switch to use constructions in the covariance computation 2015-05-19 15:28:28 +02:00
Sébastien Loriot 115e22ec29 copy input point to be able to use the insert by range of DT 2015-05-19 15:17:53 +02:00
Sébastien Loriot 1a51d32df9 size_t -> std::size_t 2015-05-19 15:06:14 +02:00
Sébastien Loriot 48b41d8610 avoid using a map to get the index of a point and use reserve 2015-05-19 15:04:36 +02:00
Sébastien Loriot d43529c131 save the indexof the point covariance matrix to avoid a lookup in a map 2015-05-19 11:28:01 +02:00
Laurent Rineau a2ffb7d6f8 Merge pull request #80 from afabri/CGAL-array_as_property_map_example-GF
Add an example for an array as property map
2015-05-18 11:17:23 +02:00
Andreas Fabri b7f9849599 Replace CGAL::get() with CGAL::get_pointee_or_identity() and remove using get:: 2015-04-30 11:31:21 +02:00
Sébastien Loriot 82e7da19a5 forgot to init the array
this is a bug in introduced in this commit:
  |--
  |commit 8bc716abf6
  |Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  |Date:   Mon Apr 20 17:59:52 2015 +0200
  |
  |    directly use CGAL::cpp11::array rather than a custom class
  |--

The initialization was done in the default construtor of the custom class
2015-04-29 23:31:21 +02:00
Sébastien Loriot 97c8a07289 remove experimental code to extract feature polylines that is not working good
update the demo plugin accordingly
2015-04-27 21:42:22 +02:00
Sébastien Loriot c9131379e1 accomodate Pierre's review 2015-04-27 14:15:30 +02:00
Andreas Fabri 688e16b26a Add an example that works with built-in array as property map; Add using ::get 2015-04-24 08:55:38 +02:00
Sébastien Loriot 200229dcec eigen foo -> eigenfoo 2015-04-24 08:52:12 +02:00
Sébastien Loriot 90530f83ce greatest -> largest 2015-04-24 08:38:40 +02:00
Sébastien Loriot 3c7c06e539 rename variables 2015-04-23 15:46:59 +02:00
Sébastien Loriot 8adf56212d overlay -> overload 2015-04-23 15:22:40 +02:00
Andreas Fabri 52382276a8 Escape the word Index with '%' 2015-04-23 12:04:35 +02:00
Sébastien Loriot 94d84aebf7 fix compilation issues 2015-04-23 10:30:02 +02:00
Sébastien Loriot 40c5fc574c make Eigen optional through the abstraction of a concept 2015-04-22 19:54:06 +02:00
Sébastien Loriot c990781b78 fix typo 2015-04-22 19:16:21 +02:00
Sébastien Loriot 6b139d10ae move the eigen traits in the CGAL dir 2015-04-22 19:13:45 +02:00
Sébastien Loriot 1e502253cd gather the usage of eigen into a traits 2015-04-22 19:08:46 +02:00
Sébastien Loriot a0d60a94de remove warnings 2015-04-22 18:43:13 +02:00
Sébastien Loriot 7fab19d2df forgot to rename a is_on_edge 2015-04-22 11:44:04 +02:00
Sébastien Loriot f098d8508c use mathjax for the matrix 2015-04-20 18:39:41 +02:00
Sébastien Loriot 27a3531bd6 rename is_on_edge 2015-04-20 18:31:12 +02:00
Sébastien Loriot e312edf41d add doc todo 2015-04-20 18:30:52 +02:00
Sébastien Loriot 8bc716abf6 directly use CGAL::cpp11::array rather than a custom class 2015-04-20 18:11:25 +02:00
Sébastien Loriot e553310940 update of is_edge and vcm_estimate_normals 2015-04-20 17:40:08 +02:00
Sébastien Loriot d7e6b7dfa8 update doc of vcm_compute 2015-04-20 17:10:40 +02:00
Sébastien Loriot f3d774e005 document the function to know whether a point is on a sharp feature
and hide the function trying to reconstruct edges
2015-04-20 17:05:42 +02:00
Sébastien Loriot 5dcc322f78 rename include guards 2015-04-20 16:10:55 +02:00
Sébastien Loriot 8b455b2710 add license headers 2015-04-20 16:09:38 +02:00
Sébastien Loriot 4f177e0e65 move internal details to internal directory 2015-04-20 16:06:55 +02:00
Sébastien Loriot 1f871965ed remove warning and compilation issue 2015-04-14 16:39:36 +02:00
Clement Jamin 1a2a2004f6 Merge branch 'gsoc2013-Point_set_processing_3-fix-swu_cjamin' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Point_set_processing_3-fix-swu_cjamin 2015-02-20 16:56:13 +01:00
Clement Jamin 6183b02f54 Untabify 2015-02-20 16:55:34 +01:00
Shihao Wu 4825fd601b replaced all "CGAL_DEBUG_MODE" with "CGAL_PSP3_VERBOSE" 2015-02-20 15:43:04 +02:00
Shihao Wu 053ee4d507 Fixed the bug of not initializing CGAL::Bbox_3
In Debug mode, the default CGAL::Bbox_3 is not (0,0,0,0,0,0)
2015-02-19 17:27:24 +02:00
Shihao Wu ad20bfab93 CGAL::Bbox_3 might behave differently in Debug/Release mode. 2015-02-19 15:41:37 +02:00
Shihao Wu 6fc6e1ef42 Used another way to prevent the neighbor_size from being set too small in EAR.
If the value given by user is smaller than the default value,
the function will use the default value instead.
2015-02-19 15:07:09 +02:00
Clement Jamin 60f382034d Updated doc and default value for neighbor radius 2015-02-18 18:00:20 +01:00
Sébastien Loriot c3c749ef0b Merge branch 'Point_set_processing-IO-GF'
improve doc and IO in examples

  Tested in CGAL-4.6-Ic-126
  Approved by the release manager

Conflicts:
	Point_set_processing_3/examples/Point_set_processing_3/wlop_simplify_and_regularize_point_set_example.cpp
2015-02-16 10:42:27 +01:00
Sébastien Loriot da7e2e0f1e missing backtick 2015-02-16 08:38:21 +01:00
Sébastien Loriot faa598a9ab prevent the creation of an empty internal namespace in the doc
trivial bugfix for master
2015-02-13 15:13:23 +01:00
Andreas Fabri a3cb5af9b0 more wording fixes for value type 2015-02-06 12:06:14 +01:00
Andreas Fabri 1e99228829 improve wording concerning value_type 2015-02-05 14:53:01 +01:00
Andreas Fabri ef6488a7c6 fix typo
Approved by the release manager (SL interim)
2015-02-05 09:40:06 +01:00
Laurent Rineau ff62595012 Merge branch 'CGAL-fix_compilation_boost_1_56-lrineau'
Fix compilation issues with Boost-1.56 and later.

Approved by the Release Manager.
2015-01-26 11:42:29 +01:00
Laurent Rineau 59a7f710dd Merge branch 'Spatial_searching-final_acceleration-gf'
Improve the performance of Spatial Searching.

Small features:

  https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Spatial_searching_performance_optimization

  https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/spatial_searching_compiletimeD

Approved by the Release Manager

Conflicts:
	Installation/changes.html
2015-01-15 15:31:35 +01:00
Laurent Rineau 48fa201043 Add a comment about a bug in Boost-1.56 2015-01-14 14:48:11 +01:00
Sébastien Loriot ab133ebe3d move implementation detail out of the scope of include/CGAL
trivial bug fix for master
2015-01-13 18:31:28 +01:00
Andreas Fabri bdf65f0151 upgrade {min/max}_distance_to_rectangle 2015-01-07 12:58:56 +01:00
Clement Jamin 7be3c2cbd2 Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu-old' into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2015-01-06 18:34:43 +01:00
Clement Jamin 31a0ee4831 Address warnings (testsuite) 2015-01-06 17:37:50 +01:00
Clement Jamin ac0c5886e1 Use references instead of pointers here 2015-01-05 16:06:39 +01:00
Shihao Wu 02d318d374 "void static"->"static void" 2014-12-19 21:13:50 +08:00
Shihao Wu acd79fb8fa Addressed warnings. 2014-12-19 19:25:58 +08:00
Shihao Wu 495c2e5af7 For WLOP, removed the saint data, selected better parameters. 2014-12-19 19:12:08 +08:00
Shihao Wu 7bc1f19343 Fixed a bug in Rich_grid.h
- Move "Rich_grid::iterator dest" outside of the loop.
2014-12-19 19:02:41 +08:00
Sébastien Loriot c986f850a0 remove warning 2014-12-16 10:21:25 +01:00
Clement Jamin 64d9501cde Removed unused variable 2014-12-16 09:24:39 +01:00
Clement Jamin 7d2f0cf9eb Replaced a lambda function by a functor 2014-12-15 11:22:39 +01:00
Clement Jamin c1e8e00d81 Protect all TBB code by #ifdef 2014-12-15 10:38:13 +01:00
Shihao Wu f5561e7f3a Simply removed the TBB code for the compute_density_weight_for_original_point()
It won't make much difference for small data because this is an initialization
step and it is not inside of the loop. Otherwise, it need to add another
functor.
2014-12-14 20:56:26 +08:00
Shihao Wu cabd51b75f Added a Sample_point_updator to remove the lambda function 2014-12-14 20:48:52 +08:00
Shihao Wu b5e7de47c8 Change the radius estimation method in WLOP, in order to get good result for the sphere input. 2014-12-14 19:56:59 +08:00
Shihao Wu 03fbb454c6 fixed a bug: added a radius parameter in Pwn_updater. 2014-12-14 19:29:00 +08:00
Shihao Wu 4b091995fa added two assert to check if the input contains normal information. 2014-12-12 21:18:57 +08:00
Shihao Wu 6def93d375 Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2014-12-12 21:03:21 +08:00
Shihao Wu 76447192d8 removed 'original_first_iter' and 'sample_first_iter' 2014-12-12 20:50:25 +08:00
Sébastien Loriot 6fc84fb659 remove warnings 2014-12-12 11:53:25 +01:00
Clement Jamin 6c4d0a65ee Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2014-12-12 11:26:03 +01:00
Clement Jamin a35b38dbde We don't want tbb's malloc proxy
It doesn't work on all the supported platform.
2014-12-12 11:25:49 +01:00
Sébastien Loriot a4f52a5fa0 add missing typename keywords 2014-12-12 11:21:47 +01:00
Sébastien Loriot 1030e433c3 add missing typename and typedefs 2014-12-12 10:08:03 +01:00
Clement Jamin 6ccf0c41a0 Bug fix: 1e-100 was too small here 2014-12-12 07:22:47 +01:00
Shihao Wu c6d5186493 cleaned up the code and tested three new examples. 2014-12-11 23:00:22 +08:00
Shihao Wu f88a9891d1 Replaced aabb-tree with kd-tree, the result is the same, but might be two times slower. 2014-12-11 22:46:58 +08:00
Andreas Fabri 13928cd516 add missing 'i' and parenthesis 2014-11-27 08:51:46 +01:00
Andreas Fabri 2916850771 use iformat for reading doubles 2014-11-26 16:53:50 +01:00
Jocelyn MEYRON fb23ce1419 fix include voronoi_covariance_3.h 2014-11-11 16:05:41 +01:00
Shihao Wu 210fe526b8 addressed Quentin's comments 2014-11-10 02:46:20 +08:00
Sébastien Loriot 921f7a53f6 cosmetic fixes in the doc 2014-11-09 19:23:16 +01:00
Sébastien Loriot 4c7132643d improve parameter doc 2014-11-06 15:04:29 +01:00
Sébastien Loriot ae71e5632a cosmetic doc changes 2014-11-06 14:45:55 +01:00
Sébastien Loriot e508147c7d move header files in CGAL/Convex_hull_3/dual 2014-11-05 16:36:16 +01:00
Sébastien Loriot e5b72ac5b3 Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron
Conflicts:
	Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
	BGL/examples/BGL_arrangement_2/primal.cpp
	BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.hpp
	Installation/changes.html
	Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
2014-11-05 16:11:35 +01:00
Shihao Wu 8d84db1626 did a pass on reference manual, added TBB links. 2014-11-05 21:15:23 +08:00
Clement Jamin af7db50731 A few more doc fixes 2014-11-05 10:55:51 +01:00
Clement Jamin b207f6a364 General pass on the ref manual 2014-11-05 10:51:12 +01:00
Clement Jamin 27237f8654 Doc improvements 2014-11-05 10:27:02 +01:00
Clement Jamin b545546290 Simplify output iterators (no property maps anymore) 2014-11-05 09:50:43 +01:00
Clement Jamin 6aec1354d3 Add refs to the user manual + minor fixes 2014-11-04 23:42:23 +01:00
Clement Jamin 6a09ac08e9 Redondant 2014-11-04 23:29:24 +01:00
Clement Jamin af24514f8f Fix typos and sentences 2014-11-04 23:26:07 +01:00
Clement Jamin 0f2fdb97d5 Return output iterator + fix const 2014-11-04 23:17:31 +01:00
Clement Jamin e33b778ec0 update cgalCite refs 2014-11-04 23:01:07 +01:00
Shihao Wu cb626399b5 make value range of edge_senstivity [0, 1]. 2014-11-05 02:59:22 +08:00
Shihao Wu da89d3f285 combined the function description from user manual to reference manual. 2014-11-05 00:36:38 +08:00
Shihao Wu 8098a4b740 replace "links to web page in the doc" with "references to the paper citation" 2014-11-03 08:17:56 +08:00
Jocelyn MEYRON cce3188a2d documenting VCM 2014-09-28 13:59:16 +02:00
Shihao Wu 453c707220 I changed all "ForwardIterator value_type" to "ForwardIterator::value_type". 2014-09-22 04:40:47 +08:00
Shihao Wu 94b263151b added: "/// Kernel_traits are used for deducing the Kernel." 2014-09-22 04:37:45 +08:00
Jocelyn MEYRON b14ffe8183 minor fix for halfspace_intersection_3 2014-09-16 17:10:46 +02:00
Jocelyn MEYRON 04df458137 minor fix for halfspace_intersection_3 2014-09-16 16:27:16 +02:00
Jocelyn MEYRON b2ac8e72d8 change halfspaces to halfspace 2014-09-16 15:01:34 +02:00
Jocelyn MEYRON af3fd69dd1 divide the vcm_estimate_edges into a vcm_compute and construct_mst 2014-09-15 15:10:50 +02:00
Jocelyn MEYRON 663e41741b doc for vcm normals and feature edges estimation 2014-08-14 17:35:25 +02:00
Jocelyn MEYRON ac0921866c add origin to halfspaces_intersection_with_construction_3 + doc vcm normal 2014-08-08 18:28:23 +02:00
Jocelyn MEYRON 4a50711cf8 add halfspaces_intersection_with_construction_3 + doc + benchmark 2014-08-08 17:32:58 +02:00
Sébastien Loriot fbf21351b8 using nested Vector_3 and Point_3 (K is not necessarily a valid kernel) 2014-07-29 11:35:45 +02:00
Sébastien Loriot 9d54c40a1c remove unneeded typename and use kernel parameter instead of default constructed 2014-07-29 11:34:46 +02:00
Jocelyn MEYRON a6adefb0c3 Finish documentation for vcm_estimate_normals + Add a variant with a number of neighbors. 2014-07-23 14:23:48 +02:00
Sébastien Loriot 8f44942268 workaround a bug in dijsktra algorithm in boost 1.54 affecting normal estimation
(cherry picked from commit bc8e1f399d)

Conflicts:
	Installation/changes.html
2014-07-21 14:36:30 +02:00
Sébastien Loriot bc8e1f399d workaround a bug in dijsktra algorithm in boost 1.54 affecting normal estimation 2014-07-19 12:20:29 +02:00
Jocelyn MEYRON cb18c331b2 Fix crash in halfspaces_intersection_3 2014-07-17 16:11:52 +02:00
Sébastien Loriot 3ee7070476 remove unused type 2014-07-15 15:25:19 +02:00
Sébastien Loriot abfc353866 fix include directive 2014-07-15 15:25:08 +02:00
Jocelyn MEYRON e6b4c7664a VCM normal estimation plugin 2014-07-15 14:53:51 +02:00
Jocelyn MEYRON a46ebb1d94 begin working on edges detection + refactoring normal estimation 2014-07-09 17:28:22 +02:00
Jocelyn MEYRON c2debb7a9c change halfspaces_intersection to halfspaces_intersection_3 and change
the associated example + fix normals estimation using VCM
2014-07-09 10:56:21 +02:00
Jocelyn MEYRON c0c481571c Corrections on the documentation + add test if origin inside the
polyhedron during in halfspaces_intersection
2014-07-04 18:14:11 +02:00
Jocelyn MEYRON f26c973028 Add VCM normal estimation to the Point_set_processing_3 normal
estimation demo

Doc and tests must be made now
2014-07-02 10:23:37 +02:00
Andreas Fabri 9b0bbf4d1f The old boost/property_map.hpp did not include vector_property_map.hpp 2014-07-01 13:55:14 +02:00
Shihao Wu 3c7637d3a0 Double check and did more refinement for the 1st round review of three new functions. 2014-06-21 22:19:00 +08:00
Shihao Wu 07686efadd Added OUTPUT_FILENAME.c_str().
Added (Please cite the paper if you use this function).
2014-06-21 21:31:10 +08:00
Shihao Wu b8c47eac1a Refined the documentation. 2014-06-21 21:06:21 +08:00
Shihao Wu 3340ce305b Updated documentations according to Qmerigot's review about reference manual 2014-06-21 18:14:22 +08:00
Shihao Wu bc3674eef4 refined the doc of WLOP 2014-06-12 18:34:37 +08:00
Shihao Wu e218a962db I added "@param output output iterator", but I may did the wrong way... 2014-06-12 18:13:13 +08:00
Shihao Wu 097e322899 intuition on what parameters represents for the last 4 parameters 2014-06-12 17:06:16 +08:00
Shihao Wu 13b100c836 refined the documentation of bilateral_smoothing 2014-06-09 20:25:39 +08:00
Shihao Wu 860b476ac2 sharp_sigma -> sharp_angle 2014-06-09 18:35:39 +08:00
Shihao Wu d778282040 'compute density' -> 'require_uniform_sampling' 2014-06-09 16:37:56 +08:00
Shihao Wu cf267b2524 "need_compute_density=false" -> <code>`compute_density=false`</code> 2014-06-09 16:03:05 +08:00
Shihao Wu 08cd36bcdb retained to the submission state.. 2014-03-27 18:28:49 +08:00
Shihao Wu b1c0196fc6 changed the performance figure
note: this version can test the parallel performance
2014-03-27 18:23:27 +08:00
Shihao Wu be4b8e817c Fixed a bug about need_compute_density, and changed its description in doc.
Note: When "need_compute_density = false", it won't compute density weights for original points.
      however, it still compute density weights for sample points.
2014-03-26 14:55:21 +08:00
Shihao Wu 666ce38fb5 re-inserted the need_compute_density option for sample points.
in this case, the result will be more non-uniform if "need_compute_density = true".
2014-03-26 10:01:31 +08:00
Pierre Alliez 8fcdcef4a4 few changes in doc
one comment in WLOP example
2014-03-25 13:06:00 +01:00
Shihao Wu c534020413 Documented the template parameters for three functions 2014-03-20 11:15:35 +08:00
Clement Jamin 7b07111614 Improve parallelism doc 2014-03-19 11:43:22 +01:00
Shihao Wu 05911d932f added 2 PointPMap: PointPMapIn and PointPMapOut 2014-03-19 10:15:07 +08:00
Shihao Wu 36efbf79a4 * clean up the "CGAL_DEBUG_MODE" blocks
* GENERATE_LATEX was changed, but I don't know why
2014-03-17 16:12:23 +08:00
Clement Jamin dcada339a3 Doc improvements + removed some useless "const" keywords 2014-03-12 11:24:32 +01:00
Clement Jamin 5ea0bc3dcd Doc: fix \cond \endcond 2014-02-27 17:07:36 +01:00
Clement Jamin 143b6a6419 Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu-old' into gsoc2013-Point_set_processing_3-point_set_consolidation-swu
Conflicts:
	Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
2014-02-27 13:57:34 +01:00
Shihao Wu 1ce3373988 fixed a bug for wlop_simplify_and_regularize_point_set_test
all the codes are confirmed now
2014-02-25 20:47:24 +08:00
Shihao Wu 99220af199 confirmed wlop_simplify_and_regularize_point_set_example 2014-02-24 17:36:00 +08:00
Shihao Wu acff809244 deleted wlop_simplify_and_regularize_point_set.h 2014-02-24 17:33:38 +08:00
Shihao Wu 7555d1ba9a confirmed edge_aware_upsampl_point_set_example 2014-02-24 17:03:28 +08:00
Shihao Wu 91e0fbf60c confirm the bilateral_smooth_point_set_example 2014-02-24 16:43:20 +08:00
Sébastien Loriot b2b7e5cb7c bugfix to avoid assuming Monge_via_jet_fitting has default template parameters 2014-01-23 10:32:30 +01:00
Laurent Rineau 6708200dfd Warn about a bug of prim_minimum_spanning_tree() in Boost.Graph 1.54
That bug causes mst_orient_normals() to fail with Boost 1.54. Hopefully,
the bug is fixed in Boost 1.55 beta.
2013-10-10 16:18:51 +02:00
Shihao Wu aff98aae58 minor change
I neglect some bugs in the last push, this version works fine
2013-09-25 10:30:23 +08:00
Shihao Wu 3b520c1405 set need_compute_density default to 'false'.
However, we still compute sample densities inside the function.
2013-09-25 10:04:48 +08:00
Shihao Wu 1f5c21ec14 a small bug 2013-09-25 00:24:42 +08:00
Shihao Wu 0a0d49b535 abandoned compute orignal density weights to save time 2013-09-25 00:17:21 +08:00
Shihao Wu 2e70b4fa97 minor change, but found the code slower 2013-09-24 22:51:20 +08:00
Shihao Wu 6e3298a514 add const to some parameters
code cleanups
2013-09-24 19:02:02 +08:00
Shihao Wu 0ca03a18c1 parallel the AABB-Tree code 2013-09-24 18:44:51 +08:00
Shihao Wu 2874361903 use "radius2" instead of "radius" as parameter for density computing functions 2013-09-24 18:22:22 +08:00
Shihao Wu 6ab108d0ab add debug output control 2013-09-24 18:14:07 +08:00
Shihao Wu 78d4a70807 added compute_update_sample_point in AABB_WLOP 2013-09-24 16:29:21 +08:00
Shihao Wu 0b9812f517 further clean-ups and alignment 2013-09-24 14:26:49 +08:00
Shihao Wu 323a0ccb82 add compute default radius to AABB-tree-wlop 2013-09-24 14:11:56 +08:00
Shihao Wu 70c7edb764 code clean-ups 2013-09-24 13:36:20 +08:00
Shihao Wu 0044439f82 add output parameter 2013-09-24 13:23:39 +08:00
Shihao Wu 234efb6812 back to version of parallelization, and the both sequential and parallel works 2013-09-24 12:43:57 +08:00
Shihao Wu 326c9e266b add output parameter 2013-09-24 11:27:16 +08:00
Shihao Wu 53d2e45f9f add staL::advance to parallel section 2013-09-24 00:00:01 +08:00
Shihao Wu 710ed737bf change forwardIterator name 2013-09-23 23:46:12 +08:00
Shihao Wu 8d8be527d7 change ForwardIterator to RandomAccessIterator 2013-09-23 23:09:39 +08:00
Shihao Wu b594258cef change function name, before add output parameter 2013-09-23 21:03:41 +08:00
Shihao Wu 0ffb95ea92 code clean-ups 2013-09-21 18:21:54 +08:00
Shihao Wu 886c8efc22 parallelized "compute density for original" 2013-09-21 18:02:22 +08:00
Shihao Wu 1aa5c402c7 add <tbb/tbbmalloc_proxy> 2013-09-21 18:01:53 +08:00
Shihao Wu c525d4545c parallelized AABB_tree code 2013-09-21 17:15:54 +08:00
Shihao Wu 4c852f8703 code clean ups 2013-09-21 11:46:19 +08:00
Shihao Wu 76cafe691d change name to wlop_simplify_and_regularize_point_set_test_AABB_tree.h 2013-09-21 10:58:58 +08:00
Shihao Wu 7c72370269 Back to bebug aabb slow problem 2013-09-19 23:35:24 +08:00
Shihao Wu ed5c9e69b9 Followed Clément's suggestion:
Another thing: it's better to use
  std::vector<Point> original_points;   +
original_points.reserve(nb_points_original)   +
original_points.push_back
than
  std::vector<Point> original_points(nb_points_original);   +   *it = blabla;
because it avoids initializing member variables twice.
2013-09-19 23:09:46 +08:00
Shihao Wu 43b70bd3e3 finished AABB in regularize_and_simplify_point_set.h 2013-09-19 22:12:42 +08:00
Shihao Wu 825d98a4f3 change repulsion to AABB too 2013-09-18 17:05:36 +08:00
Shihao Wu d33724369e successfully used AABB in compute_average_term function 2013-09-18 16:25:45 +08:00
Shihao Wu 04158e689d added two output debug sentences 2013-09-18 10:45:03 +08:00
Shihao Wu 3a0369afe9 in function "compute average term" AABB_tree got the right result 2013-09-18 10:05:41 +08:00
Shihao Wu bdd71f289f Added AABB test codes, can't get neighborhood now 2013-09-18 00:45:55 +08:00
Andreas Fabri 527a4bc63d Add #includes 2013-09-16 19:12:28 +02:00
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Shihao Wu 3770bdec46 clean up the code 2013-09-13 15:58:31 +08:00
Shihao Wu 676da9c403 clean up the code 2013-09-13 15:51:42 +08:00
Shihao Wu 446c54eab8 add output parameter to wlop 2013-09-13 15:46:27 +08:00
Shihao Wu 132f290750 parallelize one "for" circle in the iteration loop 2013-09-11 20:17:37 +08:00
Shihao Wu fe0a47377f add spaces between ">>>" 2013-09-11 00:11:05 +08:00
Shihao Wu e68679a692 *refine the codes format 2013-09-11 00:04:26 +08:00
Shihao Wu 8754fb924b change to range search 2013-09-11 00:01:22 +08:00
Shihao Wu ded3c99a9b add spaces between the ">" 2013-09-10 23:51:29 +08:00
Shihao Wu 9eec0a0e66 control debug output using #ifdef and #endif on stable version 2013-09-08 15:59:00 +08:00
Shihao Wu 0569983ad9 rule out possible Zero-divide error 2013-09-08 15:55:47 +08:00
Shihao Wu e8839230d2 stable parallel version 2013-09-08 15:49:39 +08:00
Shihao Wu c559180c01 control debug output using #ifdef and #endif
check to make sure that no "Divid Zero" will appear
2013-09-02 22:38:20 +08:00
Shihao Wu 5212ab7592 control the debug cout using #ifdef #endif 2013-09-02 20:45:17 +08:00
Shihao Wu 823fa14050 delete task_scheduler_init() 2013-09-02 10:17:00 +08:00
Shihao Wu 977b730109 parallelize another code section 2013-09-01 16:24:50 +08:00
Shihao Wu 1cd3220b81 add branch return value 2013-09-01 16:04:38 +08:00
Shihao Wu 98e7af81e2 parallelize function "compute_update_sample_point" 2013-09-01 16:01:53 +08:00
Shihao Wu 9cdebe1b23 parallelize the most time-consuming "for" circle 2013-09-01 11:35:59 +08:00
Shihao Wu d7bae5b864 add Concurrency_tag to wlop_simplify_and_regularize_point_set.h 2013-08-31 23:16:45 +08:00
Shihao Wu 52a07ec4cd Forgot to commit bilateral..h 2013-08-30 23:18:20 +08:00
Shihao Wu 339f7d3f51 Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2013-08-30 22:18:41 +08:00
Shihao Wu 8a7de648ea comment the parallelization of code around "compute_kdtree_neighbors" 2013-08-30 22:08:01 +08:00
Shihao Wu 5f11cf141e format the file
delete unnecessary spaces at the beginning of each line
2013-08-30 19:26:51 +08:00
Clement Jamin d03d1426dc Minor doc fix 2013-08-30 12:02:21 +02:00
Clement Jamin d033fd4044 Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2013-08-30 11:50:41 +02:00
Clement Jamin 3daa44a9df Untabify + typos 2013-08-30 11:50:17 +02:00
Shihao Wu c87d859f12 1.add Concurrency_tag judge in template file
2.add parallelization to codes around invocation of "compute_max_spacing"
2013-08-30 17:30:00 +08:00
Clement Jamin ea22837a40 Untabify 2013-08-30 10:34:12 +02:00
Shihao Wu 9028b7e8a0 updated default parameter documentation,
changed ForwardIterator to RandomAccessIterator for random_shuffle
2013-08-30 11:29:50 +08:00
Shihao Wu b757f01555 I copied the wrong version of tests, now is correct 2013-08-28 12:04:20 +08:00
Shihao Wu 4da24d2c1c added wlop default parameters, estimate default neighborhood radius 2013-08-28 10:45:42 +08:00
Shihao Wu 6d42c0ef9c refined codes, updated documentations, added tests 2013-08-27 09:49:22 +08:00
Shihao Wu f1c15e1678 refined the code for wlop_regularize_and_simplify points
mainly try to replace index with iterator
2013-07-31 17:39:07 +08:00
Shihao Wu fd81a098f8 finished large data experiment 2013-07-30 13:56:05 +08:00
Clement Jamin 5ab8c9aae2 First pass on the upsampling code 2013-07-26 19:26:45 +02:00
Clement Jamin f835a5f498 Fix parallel code 2013-07-26 02:06:38 +02:00
Clement Jamin 5a9249dab5 Small improvements in the code
const, smaller #ifdef #else #endif blocks, code formatting...
2013-07-26 02:02:34 +02:00
Clement Jamin 6afcc387d0 Typo 2013-07-24 20:58:13 +02:00
Clement Jamin d53a1a7a46 Bugfix related to CGAL_USE_PROPERTY_MAPS_API_V1 2013-07-24 20:22:26 +02:00
Clement Jamin 8c5c6b7ce9 Minor code corrections: variable names, template params order, etc. 2013-07-24 20:15:52 +02:00
Clement Jamin e85f55417e Fix typo 2013-07-24 11:56:01 +02:00
Clement Jamin df18f59902 Fix charset problem 2013-07-24 11:50:04 +02:00
Clement Jamin 74264b6038 Change the name everywhere + delete old file 2013-07-24 11:47:51 +02:00
Shihao Wu dfbb89339b improved the readability of Rich_grid.h as Pierre said. 2013-07-19 22:41:50 +08:00
Shihao Wu 296f51c320 change function name to: edge_aware_upsample_point_set
Added three .h files with new names
2013-07-19 22:13:58 +08:00
Shihao Wu 894fcbe3d2 change function name to: bilateral_smooth_point_set 2013-07-19 21:59:44 +08:00
Shihao Wu 884f6306f6 change function name to: wlop_regularize_and_simplify_point_set_using_rich_grid 2013-07-19 21:51:24 +08:00
Shihao Wu 5e8d302f89 added tbb to CMakeLists.txt
tried to add Concurrency_tag but have compile error..
2013-07-17 00:47:02 +08:00
Shihao Wu 499b97e321 Added some tbb codes for denoise_Point_set.
it pass complie, but the cmakelist may have problem.
2013-07-16 00:39:02 +08:00
Shihao Wu bed181be5c added a sphere test data, the upsample codes works well on it too 2013-07-14 23:41:15 +08:00
Shihao Wu d8ea879471 added predict neighbor size and threshold size.
this version work well on the example
2013-07-14 20:24:20 +08:00
Shihao Wu c9150d9854 consistency with my original old code.
I found the result is not perfect, so I checked carefully with the old code.

I tested some data with exact parameters.

The result is almost the same, the difference is cased by numerical problem.

So I commit this version for record.
2013-07-14 13:52:24 +08:00
Shihao Wu 5b0befd9e3 I tried to make it easier for parallelization but not worked.
here just a record of this version, I will try another way out.
2013-07-13 01:49:52 +08:00
Shihao Wu 34b61f3471 finished the first version of upsample_point_set
the rest is how to speed up by estimating radius

and make it more easy for parallelization
2013-07-12 01:01:18 +08:00
Shihao Wu 43bb5bd574 now back_inserter works, the pipeline of upsample have set up 2013-07-11 00:17:24 +08:00
Shihao Wu e1e6df6575 added the key part of upsample_point_set
considering how to use back_inserter
2013-07-10 22:32:16 +08:00
Shihao Wu caf50a5233 added normal variable to Rich_point 2013-07-10 18:37:14 +08:00
Shihao Wu 9de9f54ebd Started coding for upsample_point_set.
added two new files and one new test data.
2013-07-10 00:20:52 +08:00
Shihao Wu b370deff80 added timing and sharpness_sigma parameter 2013-07-09 19:20:44 +08:00
Shihao Wu b8b2379c09 update formating for denoise_point_set 2013-07-09 18:54:20 +08:00
Shihao Wu 863462e10a modified denoise_point_set for new PROPERTY_MAPS, and fixed a bug in kd-tree
now the example can run and I added a new test data "sphere_20k_normal.xyz"
2013-07-09 18:44:17 +08:00
Shihao Wu 03e2c02484 I used get() instead of put(), and get correct result.
Maybe I used put() in a wrong way.
Or maybe put() function have bugs.
2013-07-09 17:00:19 +08:00
Shihao Wu c68f8de8f1 Try to change to PROPERTY_MAPS_API_V2, but the output is wrong.
Figuring out...
2013-07-09 16:53:54 +08:00
Shihao Wu 0f3f314b71 use Kd_tree_xxx instead of KdTree_xxx 2013-07-08 23:14:30 +08:00
Shihao Wu 0aba742b5c change some class names to obey the name convention of CGAL 2013-07-08 22:52:33 +08:00
Shihao Wu 091f17b3dd working on code formating and get some wired errors
Maybe I'm working in a wrong branch?
2013-07-08 22:39:47 +08:00
Shihao Wu 1ececf54a1 limit each line to 80 characters. 2013-07-08 17:09:50 +08:00
Shihao Wu 273eb39cd2 Added Rich_grid.h file
Modified regularize_and_simplify_point_set_using_balltree for Rich_grid

Used CGAL::Timer instead
2013-07-08 16:02:15 +08:00
Clement Jamin 6bb238d5cb Replace "<..<...>>" by "<...<...> >" (>> is correct in C++11 only) 2013-07-05 13:46:43 +02:00
Clement Jamin 130a0b4287 Use Point_3::x/y/z() functions: it's clearer and faster 2013-07-05 13:26:46 +02:00
Clement Jamin 8809c071a5 A bit of code formatting 2013-07-05 11:33:38 +02:00
Clement Jamin a8d438eece Everything should be in the CGAL namespace 2013-07-05 11:08:46 +02:00
Clement Jamin fcc02e2547 Add a typedef XXX Base and use it 2013-07-05 10:53:14 +02:00
Clement Jamin 229430f96a Clean-up some comments 2013-07-05 10:49:19 +02:00
Clement Jamin 63b67c89ad Clean-up some comments 2013-07-05 10:48:26 +02:00
Clement Jamin a54cce9d1d Fix charset problem 2013-07-05 10:36:03 +02:00
Clement Jamin 6c44ab3306 Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu-old' into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2013-07-05 08:58:45 +01:00
Shihao Wu b836e36808 added denoise_point_set function/files and example
also refine the code of wlop
2013-07-05 00:28:39 +08:00
Shihao Wu eeb5350fce Added a new file/function for Grid Tree implementation
The new file/function name is "regularize_and_simplify_point_set_using_balltree"
2013-07-04 00:17:51 +08:00
Shihao Wu c4d7e2d39b Add guess KNN trick
To speed up compute_average_term
I guess the suitable KNN size to reduce the redundant visit.
2013-06-28 00:51:16 +08:00
Shihao Wu 9924c4c652 <Trying to add tbb> 2013-06-25 23:26:46 +08:00