Commit Graph

263 Commits

Author SHA1 Message Date
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 a214819b8b write points on feature in a file 2015-06-02 09:40:07 +02:00
Andreas Fabri fcfd9a7fa1 Add the example in the user manual, examples/, and examples.txt 2015-05-11 20:53:51 +02:00
Andreas Fabri 754795d560 remove example that revealed the problem 2015-05-11 20:44:50 +02:00
Andreas Fabri b8d9925cbc remove target that does not exist 2015-04-30 10:24:53 +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 27a3531bd6 rename is_on_edge 2015-04-20 18:31:12 +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 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
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
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 66c8fe04de revert part of ef6488a7 that was supposed to be only a typo fix
|---------------------------------------------------
  |commit ef6488a7c6
  |Author: Andreas Fabri <andreas.fabri@geometryfactory.com>
  |Date:   Thu Feb 5 09:40:06 2015 +0100
  |
  |  fix typo
  |
  |  Approved by the release manager (SL interim)
  |--------------------------------------------------
2015-02-11 09:29:14 +01:00
Andreas Fabri 1e99228829 improve wording concerning value_type 2015-02-05 14:53:01 +01:00
Andreas Fabri f1bd6f1627 All examples now read from argv if argc!= 1 2015-02-05 14:29:20 +01:00
Andreas Fabri ef6488a7c6 fix typo
Approved by the release manager (SL interim)
2015-02-05 09:40:06 +01:00
Clement Jamin ecda2555ab Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu-old' into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2015-01-09 15:55:40 +01:00
Clement Jamin fe47edc68a Faster example 2015-01-09 15:51:09 +01:00
Clement Jamin c853129ac8 Reduce the number of points (the execution is too long for the testsuite) 2015-01-08 17:52:18 +01:00
Sébastien Loriot 652be47d1f remove conditional compilation that is no longer needed 2015-01-07 15:50:36 +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
Shihao Wu 1280fb4c67 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-19 21:13:08 +08:00
Clement Jamin b85087260f Add the new examples in the custom cgal_test_with_cmake file 2014-12-19 13:29:29 +01:00
Shihao Wu 495c2e5af7 For WLOP, removed the saint data, selected better parameters. 2014-12-19 19:12:08 +08:00
Shihao Wu e6b640528a use sphere_20k for WLOP's example 2014-12-19 18:29:56 +08:00
Shihao Wu d2af2f3677 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-19 18:26:24 +08:00
Shihao Wu 978f9602e3 use sphere_20k for example for WLOP 2014-12-19 18:26:06 +08:00
Clement Jamin 785f2fda7e Concurrency should be OFF by default 2014-12-17 14:46:36 +01:00
Sébastien Loriot 9bc80b47f2 reduce the number of points to add to speed up the runtime 2014-12-16 10:57:00 +01:00
Clement Jamin 766db429aa Added the ability to activate concurrency through environment variable 2014-12-15 11:03:02 +01:00
Clement Jamin c91979f236 Remove non-portable code 2014-12-15 09:57:28 +01: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
Clement Jamin 170016ffaf Replace the saint_jean example by the sphere 2014-12-14 12:25:19 +01:00
Sébastien Loriot 8596cc316d update filename 2014-12-12 12:05:54 +01:00
Sébastien Loriot 6fc84fb659 remove warnings 2014-12-12 11:53:25 +01:00
Shihao Wu c6d5186493 cleaned up the code and tested three new examples. 2014-12-11 23:00:22 +08:00
Shihao Wu 210fe526b8 addressed Quentin's comments 2014-11-10 02:46:20 +08: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 9347ece127 simplified wlop example 2014-11-05 19:01:31 +08:00
Shihao Wu c5f3ba1f47 EPIC are replaced with Simple_cartesian. 2014-09-22 04:21:38 +08: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
Clement Jamin 7efbf6ca36 Use lowercase for const filename variables 2014-07-24 16:51:22 +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
Sébastien Loriot 6ed1ba826e Merge branch 'to-be-tested/Stop_testing_taucs-sloriot'
Taucs, Lapack and Blas supports are no longer tested

Approved by the Release Manager
Tested in CGAL-4.5-Ic-97

Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
2014-07-16 20:19:21 +02:00
Jocelyn MEYRON e6b4c7664a VCM normal estimation plugin 2014-07-15 14:53:51 +02:00
Laurent Rineau 84fcae4788 Workaround the incompatibility with Boost 1.54 2014-07-11 12:04:42 +02:00
Jocelyn MEYRON a46ebb1d94 begin working on edges detection + refactoring normal estimation 2014-07-09 17:28:22 +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
Sébastien Loriot aeb094e4cc more Taucs removal 2014-06-25 15:58:37 +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 7118ac8fe1 Updated documentations according to Qmerigot's review about user manual 2014-06-21 17:29:26 +08:00
Shihao Wu bc3674eef4 refined the doc of WLOP 2014-06-12 18:34:37 +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 0aa78d6202 added INPUT_FILENAME 2014-06-09 15:26:33 +08:00
Shihao Wu 564d23607b "need_compute_density" -> "compute_density" 2014-06-09 15:13:45 +08:00
Shihao Wu dd422d09ab removed "#include <CGAL/tags.h>
#include <CGAL/Simple_cartesian.h>"
2014-06-09 15:04:32 +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 16768cbb10 updated the parallel_WLOP_performance chart 2014-03-27 10:55:15 +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 cc6cdf5a1a replace "way 1" and "way 2" as "with default parameters" and "with all parameters" respectively. 2014-03-26 10:11:33 +08:00
Pierre Alliez 8fcdcef4a4 few changes in doc
one comment in WLOP example
2014-03-25 13:06:00 +01:00
Shihao Wu c1671dd9e6 minor changes, removed some redundancy words 2014-03-19 11:02:31 +08:00
Shihao Wu 05911d932f added 2 PointPMap: PointPMapIn and PointPMapOut 2014-03-19 10:15:07 +08:00
Shihao Wu 3bace9f01e *remove unused codes for sample points 2014-03-17 15:47:41 +08:00
Shihao Wu 108b3ba790 * remove the timers and memory sizers from examples 2014-03-17 15:38:22 +08:00
Shihao Wu 866452aa14 * remove 'system("pause")' 2014-03-17 15:21:50 +08:00
Shihao Wu 575c3521f9 * restore grid_simplification_example.cpp to its original state. 2014-03-17 15:13:07 +08: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 3d8e34e606 tiny modification 2014-02-24 18:31:58 +08:00
Shihao Wu 99220af199 confirmed wlop_simplify_and_regularize_point_set_example 2014-02-24 17:36:00 +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
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 32f3ebcf6a change way of call AABB-wlop 2013-09-24 14:27:17 +08:00
Shihao Wu f89b18a7a7 code-cleanups 2013-09-24 13:36:36 +08:00
Shihao Wu 48706aa565 unified the function call 2013-09-24 13:24:23 +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 fd3df5ad8e changes on ways of function call 2013-09-24 11:28:10 +08:00
Shihao Wu 32640b6f9c change parameters of WLop_AABB_tree 2013-09-24 00:06:28 +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 d33724369e successfully used AABB in compute_average_term function 2013-09-18 16:25:45 +08:00
Shihao Wu bdd71f289f Added AABB test codes, can't get neighborhood now 2013-09-18 00:45:55 +08:00
Shihao Wu 6c87a6c09d use different ways to call function 2013-09-13 16:17:18 +08:00
Andreas Fabri 3d6ceb79bb Add newline at end of file 2013-09-12 14:12:12 +02:00
Shihao Wu 6b1abd547b add Concurrentcy_tag to wlop example 2013-08-31 23:17:13 +08:00
Shihao Wu ee86560649 Improved readability of bilateral_smooth.. 2013-08-30 22:58:15 +08:00
Shihao Wu 4da24d2c1c added wlop default parameters, estimate default neighborhood radius 2013-08-28 10:45:42 +08:00