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
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
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
609143bbf4
Make a copy of "points" for the second run
2014-12-17 14:59:23 +01:00
Clement Jamin
785f2fda7e
Concurrency should be OFF by default
2014-12-17 14:46:36 +01:00
Sébastien Loriot
1cf3c2fe91
cosmetic
2014-12-16 11:06:48 +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
5b519f69fa
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-16 10:39:00 +01:00
Clement Jamin
8a13f68814
Minor spelling fixes
2014-12-16 10:38:41 +01:00
Sébastien Loriot
c986f850a0
remove warning
2014-12-16 10:21:25 +01:00
Clement Jamin
4a87c7ab22
This test was too slow in Debug mode
2014-12-16 10:18:41 +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
766db429aa
Added the ability to activate concurrency through environment variable
2014-12-15 11:03:02 +01:00
Clement Jamin
6831f140df
Improve the tests for the testsuit
2014-12-15 10:54:49 +01:00
Clement Jamin
c1e8e00d81
Protect all TBB code by #ifdef
2014-12-15 10:38:13 +01:00
Clement Jamin
c91979f236
Remove non-portable code
2014-12-15 09:57:28 +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
8440455c17
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-14 19:30:40 +08:00
Shihao Wu
03fbb454c6
fixed a bug: added a radius parameter in Pwn_updater.
2014-12-14 19:29:00 +08:00
Clement Jamin
170016ffaf
Replace the saint_jean example by the sphere
2014-12-14 12:25:19 +01: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
54f9f56409
updated the *.cmd file for using new test data
2014-12-12 20:54:06 +08:00
Shihao Wu
548f4db02f
uploaded three new test data
2014-12-12 20:53:22 +08:00
Shihao Wu
76447192d8
removed 'original_first_iter' and 'sample_first_iter'
2014-12-12 20:50:25 +08: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
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
Laurent Rineau
80784a3292
Use characters that may be in a double
2014-12-04 13:01:15 +01:00
Andreas Fabri
9650d226a1
typos and partial switching to \tparam
2014-12-04 09:52:01 +01:00
m.overtheil
9da9cff768
Merge branch 'Spatial_searching-Rectangle_compiletimeD-gf' into Spatial_searching-final_acceleration-gf
...
Conflicts:
Spatial_searching/benchmark/Spatial_searching/nn3cgal.cpp
Spatial_searching/include/CGAL/Kd_tree.h
Spatial_searching/include/CGAL/Kd_tree_node.h
2014-11-28 13:10:08 +01: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
Shihao Wu
bfdb547077
one pass on user manual
2014-11-05 19:07:13 +08:00
Shihao Wu
9347ece127
simplified wlop example
2014-11-05 19:01:31 +08:00
Shihao Wu
0fc690a32b
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-11-05 18:51:17 +08:00
Shihao Wu
702de70f63
updated three figures, zoom in two figures and change parameter values for one
2014-11-05 18:50:44 +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
a23848013f
Remove useless comma
2014-11-04 23:32:25 +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
Clement Jamin
7f64df43ba
Use cgalCite
2014-11-04 22:51:10 +01:00
Shihao Wu
ff143bf650
removed the duplicated figure.
2014-11-05 03:16:30 +08: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
pierre alliez
4d44591c66
one pass on history and few fixes
2014-11-01 07:27:29 +01: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
Shihao Wu
c5f3ba1f47
EPIC are replaced with Simple_cartesian.
2014-09-22 04:21:38 +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
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
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
Clement Jamin
7efbf6ca36
Use lowercase for const filename variables
2014-07-24 16:51:22 +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
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
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
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
Jocelyn MEYRON
cb18c331b2
Fix crash in halfspaces_intersection_3
2014-07-17 16:11:52 +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
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
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
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
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