Commit Graph

629 Commits

Author SHA1 Message Date
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
Shihao Wu c5f3ba1f47 EPIC are replaced with Simple_cartesian. 2014-09-22 04:21:38 +08:00
Shihao Wu cb1bc80b0a Minor change in doc:
- Replaced  ' \f$ S\f$ ' with '\b S'.
- Added a rough draft of implementation history, according to Mesh_3
2014-08-05 12:59:09 +08:00
Clement Jamin 7efbf6ca36 Use lowercase for const filename variables 2014-07-24 16:51:22 +02:00
Sébastien Loriot cc36cf8359 Merge branch 'boost-work_around_dijktra_bug_1.54-local'
Distribute dijktra header file from boost 1.55 to work around
  a bug in the version 1.54. The header file is only used if the
  user compiles with boost 1.54

Tested in CGAL-4.5-Ic-102
Approved by the release manager

Conflicts:
	Installation/changes.html
2014-07-23 08:46:33 +02:00
Sébastien Loriot 45f7298ce7 Merge branch 'Polyhedron_demo-import_splatting-GF'
Tested in CGAL-4.5-Ic-100
Approved by the release manager

Conflicts:
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
2014-07-21 08:23:36 +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 8b7af3a397 vector_property_map include is done by CGAL/property_map.h 2014-07-19 11:36:33 +02:00
Sébastien Loriot fce46e5164 document the removal of the surface reconstruction demo 2014-07-17 13:41:43 +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
Laurent Rineau 84fcae4788 Workaround the incompatibility with Boost 1.54 2014-07-11 12:04:42 +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
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 381f39c573 removed flow chart of WLOP 2014-06-12 18:41:17 +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 299e4f2f14 updated three figures 2014-06-09 17:28:57 +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 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
Clement Jamin 7b5896d47b Sharp edges => sharps features 2014-03-26 12:42:03 +01:00
Shihao Wu 6f2530452f changed the size of the new figures 2014-03-26 18:17:13 +08:00
Shihao Wu 67aee00ceb added two performance charts 2014-03-26 15:53:19 +08:00
Shihao Wu d7020d5fb8 changed the description of the parameter "edge_sensitivity" in doc 2014-03-26 15:19:58 +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
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
Pierre Alliez 7179a11aa3 my pass on doc for bilateral and WLOP
some TODOs added that must be addressed
2014-03-25 12:58:46 +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 c1671dd9e6 minor changes, removed some redundancy words 2014-03-19 11:02:31 +08:00
Shihao Wu cdf6dee83a refined the parallelism description in doc. 2014-03-19 10:37:37 +08: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
Shihao Wu d7c0e920c2 * added documentation about Concurrency_tag 2014-03-17 15:53:56 +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 944c7016a2 * remove "system('pause')" 2014-03-17 15:26:24 +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 dcada339a3 Doc improvements + removed some useless "const" keywords 2014-03-12 11:24:32 +01:00
Clement Jamin 14df66034c Convert to UTF8 2014-03-12 11:22:24 +01:00
Shihao Wu 7687570c50 modified simplification_comparison.jpg 2014-03-02 18:15:36 +08:00
Shihao Wu 34318822f2 modified the smoothing_comparison.jpg 2014-03-02 17:51:41 +08:00
Clement Jamin 5ea0bc3dcd Doc: fix \cond \endcond 2014-02-27 17:07:36 +01:00
Clement Jamin 99b6979ba3 Convert to UTF8 2014-02-27 17:06: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 3d8e34e606 tiny modification 2014-02-24 18:31:58 +08:00
Shihao Wu e5e7d6c917 confirmed bilateral_smoothing_test and edge_aware_upsample_test
but wlop_simplify_and_regularize_test have bug, it seems like memory leak
2014-02-24 18:30:58 +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 9114db9085 restore figure source files removed in 0fa2cacb
| commit 0fa2cacb60
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Tue Dec 3 17:27:02 2013 +0100
  |
  |     remove doc_tex documentation (including developer manual) and old manual tools
2014-02-10 14:54:23 +01:00
Laurent Rineau 367314623d Add a script to detect wrong permissions, and fix permissions
The script uses zsh, and lists regular files that have the
'executable' permission.

At the same time, I fix the permissions of several files.
2014-02-06 18:49:09 +01: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
Sébastien Loriot 0fa2cacb60 remove doc_tex documentation (including developer manual) and old manual tools 2013-12-03 17:27:02 +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 2cf68f6448 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-09-25 23:45:26 +08:00
Shihao Wu df43219ec8 new wlop_flow_chart.jpg 2013-09-25 23:43:14 +08: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 32f3ebcf6a change way of call AABB-wlop 2013-09-24 14:27:17 +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 f89b18a7a7 code-cleanups 2013-09-24 13:36:36 +08:00
Shihao Wu 70c7edb764 code clean-ups 2013-09-24 13:36:20 +08:00
Shihao Wu 48706aa565 unified the function call 2013-09-24 13:24:23 +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 fd3df5ad8e changes on ways of function call 2013-09-24 11:28:10 +08:00
Shihao Wu 326c9e266b add output parameter 2013-09-24 11:27:16 +08:00
Shihao Wu 32640b6f9c change parameters of WLop_AABB_tree 2013-09-24 00:06:28 +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
Andreas Fabri 9ed4f837c3 Merge branch 'CGAL-compilable_headers-GF'
The conflict was about whitesapce
Approved by the release manager

Conflicts:
	Polyhedron/include/CGAL/Polyhedron_copy_3.h
2013-09-23 14:50:17 +02: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 0f4d566ace change the way of calling WLOP according to the new function declaration 2013-09-20 23:26:32 +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
Clement Jamin 008777c8ad Added new author names 2013-09-13 16:33:48 +02:00
Clement Jamin aea046e94f 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-09-13 16:32:29 +02:00
Clement Jamin a5f62e9c94 Added new author names 2013-09-13 16:32:13 +02:00
Shihao Wu 6c87a6c09d use different ways to call function 2013-09-13 16:17:18 +08:00
Shihao Wu 2d55adc010 refine the wlop flow chart 2013-09-13 16:15:57 +08: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
Andreas Fabri 3d6ceb79bb Add newline at end of file 2013-09-12 14:12:12 +02: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 42f5240d43 refine the wlop flow chart.jpg 2013-09-07 23:27:06 +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 6b1abd547b add Concurrentcy_tag to wlop example 2013-08-31 23:17:13 +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 ee86560649 Improved readability of bilateral_smooth.. 2013-08-30 22:58:15 +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