Commit Graph

426 Commits

Author SHA1 Message Date
Pierre Alliez 07cb9e4c52 cleanup examples 2018-11-30 15:30:51 +08:00
Pierre Alliez 1048255d6d massaging reference manual 2018-11-30 15:30:51 +08:00
Pierre Alliez fb4c41bcae massaging user manual 2018-11-30 15:30:51 +08:00
Pierre Alliez 4c227e134c simpler abstract 2018-11-30 15:30:08 +08:00
Lingjie Zhu a0937c4d01 fix manual 2018-11-30 15:30:08 +08:00
Lingjie Zhu 33913d6664 add_proxy_furthest -> add_to_furthest_proxies
maybe better name
2018-11-30 15:30:08 +08:00
Lingjie Zhu f5b27f3411 indexed triangle switch to CGAL::cpp11::array<std::size_t, 3> 2018-11-30 15:30:08 +08:00
Lingjie Zhu 11bcd9fa1e metric reference with groups 2018-11-30 15:30:08 +08:00
Lingjie Zhu 4bbda56a37 reference manual with groups 2018-11-30 15:30:08 +08:00
Lingjie Zhu 555c9ed342 ApproximationTraits to ErrorMetric 2018-11-30 15:30:08 +08:00
Lingjie Zhu a362d6d83a update doc 2018-11-30 15:30:08 +08:00
Lingjie Zhu 66f6c52a7b remove VSA_metrics.h 2018-11-30 15:30:08 +08:00
Lingjie Zhu 247ce2f858 switch demo/example/test/benchmark to Approximation traits 2018-11-30 15:30:08 +08:00
Lingjie Zhu b2d75c5879 add Approximation traits class 2018-11-30 15:30:08 +08:00
Lingjie Zhu f276cac096 remove Polyhedron output mesh
vsa_mesh_approximation + vsa_mesh_segmentation -> mesh_approximation
2018-11-30 15:30:08 +08:00
Lingjie Zhu 745f87e172 remove VSA namespace
CGAL::VSA::Metrics -> CGAL::Metrics
CGAL::VSA::parameters -> CGAL::Surface_mesh_approximation::parameters
2018-11-30 15:30:08 +08:00
Lingjie Zhu e94ee29de2 remove VSA namespace
CGAL::VSA::Mesh_approximation -> CGAL::VSA_approximation
2018-11-30 15:30:08 +08:00
Lingjie Zhu 2d9c6a1161 tm_in -> tm, FaceGraph -> FaceListGraph, remove hashable 2018-11-30 15:30:08 +08:00
Lingjie Zhu 74f5357120 remove free function VSA:: namespace 2018-11-30 15:30:08 +08:00
Lingjie Zhu 3fbad90a07 fix user manual
to Sebastien's review
2018-11-30 15:30:08 +08:00
Lingjie Zhu a34d2e651c fix error rounding up
code and document
2018-11-30 15:30:08 +08:00
Lingjie Zhu f2cc1a019b fix user manual
link to background of proxy
recommend for seeding
section not start with a figure
update workflow chart
2018-11-30 15:30:08 +08:00
Lingjie Zhu 9db2720d6f fix reference manual 2018-11-30 15:30:08 +08:00
Lingjie Zhu 2911a86b2f fix concept page 2018-11-30 15:30:08 +08:00
Lingjie Zhu b66c35aa83 remove get_ in member functions 2018-11-30 15:30:08 +08:00
Lingjie Zhu b593ef4622 fix proxy error update
should subtract error fitted to the original proxy not the new one
fix demo run m_iso_approx
2018-11-30 15:30:08 +08:00
Lingjie Zhu ae08e9a152 fix unused parameter warning 2018-11-30 15:30:08 +08:00
Lingjie Zhu b3a891e220 update demo cmake scripts
cmake version required update
optional verbose
get rid of include xx.cpp
fix duplicate optimize_anchor_location parameter and function name
2018-11-30 15:30:08 +08:00
Pierre Alliez 6ee63ceb4e added TODO in doc 2018-11-30 15:30:08 +08:00
Pierre Alliez bb0f671fa2 rename optimization option 2018-11-30 15:30:08 +08:00
Lingjie Zhu 522df74309 remove redundant fit function 2018-11-30 15:30:08 +08:00
Lingjie Zhu 9c0de51b79 optional tbb concurrency 2018-11-30 15:29:18 +08:00
Lingjie Zhu 8ea905adcd add TBB parallelism in fit
Can't find tbb on Windows10 with TBB from 44_20150728 to 2018_20171205.
Seems like FindTBB module is outdated.
cgal-discuss.949826.n4.nabble.com/how-to-enable-TBB-td4659985.html
2018-11-30 15:29:18 +08:00
Pierre Alliez 2767fe3b7b fix conflict 2018-11-30 15:29:18 +08:00
Lingjie Zhu b17ca72645 fix split
modify proxy map before add_one_proxy_at
2018-11-30 15:28:00 +08:00
Lingjie Zhu e4f08cb18e remove preconditions
facet proxy map and proxy error are always valid
2018-11-30 15:28:00 +08:00
Lingjie Zhu d1bf782a2e fit_proxy_from_facet update error and proxy map
this maitain the proxy map and proxy error always valid
even if the number of iteration is 0
connected component fitted from patch
need error/vector degeneracy handeling
2018-11-30 15:28:00 +08:00
Lingjie Zhu 4750ea9328 add_one_proxy_at 2018-11-30 15:28:00 +08:00
Lingjie Zhu d7f7369416 random pick non-seed facets
without proxies clear which invalidates existing proxy map
2018-11-30 15:28:00 +08:00
Lingjie Zhu a693b2d928 compute_fitting_error -> compute_total_error
proxy error has already been computed in fit_proxy_from_patch
2018-11-30 15:28:00 +08:00
Lingjie Zhu f951b81e62 fit proxy from patch & seed facet 2018-11-30 15:28:00 +08:00
Lingjie Zhu 27d4485393 proxy_wrapper constructor with error 2018-11-30 15:28:00 +08:00
Lingjie Zhu fc6788b9b4 use Vector and CGAL::ORIGIN to compute anchor location 2018-11-30 15:28:00 +08:00
Lingjie Zhu e69d136e13 add optional anchor location optimization 2018-11-30 15:28:00 +08:00
Lingjie Zhu ae2c59100d check meshing with visibility 2018-11-30 15:28:00 +08:00
Lingjie Zhu a880ee100d add forced teleportation test
check L2,1 metric, square root can be omitted since we only care about the
relative error. maybe a post-processing is needed to handle sum of error
2018-11-30 15:28:00 +08:00
Lingjie Zhu ba2ef67904 check forced teleportation 2018-11-30 15:28:00 +08:00
Lingjie Zhu 5bdfd10e3d add surface with disconnected components to correctness test 2018-11-30 15:24:16 +08:00
Lingjie Zhu f81c885a69 approximate on geometry with disconnected component
random shuffle on non seed facets
2018-11-30 15:24:16 +08:00
Lingjie Zhu 888ebfd4ea add connected component detection 2018-11-30 15:24:16 +08:00
Lingjie Zhu c07b7daf3a fix naming
fit_error -> m_perror_metric
proxy_fitting -> m_pproxy_fitting
2018-11-30 15:24:16 +08:00
Lingjie Zhu 59e314ce21 fix naming
m_borders -> m_bcycles
2018-11-30 15:24:16 +08:00
Lingjie Zhu 4fc49c26c7 fix naming
Chord_vector -> Boundary_chord
Border -> Boundary_cycle
2018-11-30 15:24:16 +08:00
Lingjie Zhu 97fdfd2965 prefix data member with m_ 2018-11-30 15:24:16 +08:00
Lingjie Zhu 48086ed3f0 fix naming and spacing 2018-11-30 15:24:16 +08:00
Lingjie Zhu e7945764a5 fix manifold test
forgot to compute average_edge_length when algorithm
instance is constructed from (tm, vpmap)
2018-11-30 15:24:16 +08:00
Pierre Alliez 0371c66ca7 TBB 2018-11-30 15:24:16 +08:00
Pierre Alliez bcfd60e918 massaged examples
(one TODO added)
2018-11-30 15:24:16 +08:00
Pierre Alliez ff1244189f added list of fixes
massaging user manual
2018-11-30 15:24:16 +08:00
Lingjie Zhu 66458af0bd consistent naming and spacing 2018-11-30 15:24:16 +08:00
Lingjie Zhu f1a5f76f00 fix dynamic_property_map compiling issue 2018-11-30 15:24:16 +08:00
Pierre Alliez bf5f14d40b user manual (default approach) 2018-11-30 15:24:16 +08:00
Pierre Alliez a0be4c1779 refined description 2018-11-30 15:24:16 +08:00
Pierre Alliez 958477c466 ref manual 2018-11-30 15:24:16 +08:00
Pierre Alliez 53b05ced85 massaging user manual 2018-11-30 15:24:16 +08:00
Pierre Alliez 9045c762dd massaging user manual
Added David CS as co-author.
2018-11-30 15:24:16 +08:00
Andreas Fabri 0cb55dfd8d Use dynamic_property_map 2018-11-30 15:24:16 +08:00
Lingjie Zhu 22661170f8 remove unnecessary get_ helper functions 2018-11-30 15:24:16 +08:00
Lingjie Zhu 05bcc6b0c6 rebase: fix named parameter compile error
error c2953: class template has already been defined
after rebase: property_map_selector/get_property_map/get_const_property_map
has already been defined in CGAL/boost/graph/named_function_params.h
2018-11-30 15:24:16 +08:00
Lingjie Zhu a3c5432ad0 doc: add workflow figure
rename relaxation.png to iterations.png
clarify relaxation in seeding
fix typos
2018-11-30 15:24:16 +08:00
Lingjie Zhu 604d124c8f doc: update chord figure 2018-11-30 15:24:16 +08:00
Lingjie Zhu 3901f033be doc: update subdivision 2018-11-30 15:24:16 +08:00
Lingjie Zhu 52da6dbb12 subdivision with relative/absolute error options 2018-11-30 15:24:16 +08:00
Lingjie Zhu 30351b0bbb doc: update named parameters 2018-11-30 15:24:16 +08:00
Lingjie Zhu b85d520c6c test: add mesh_segmentation() test 2018-11-30 15:24:16 +08:00
Lingjie Zhu 6434be16d5 doc: add another approximation example files 2018-11-30 15:24:16 +08:00
Lingjie Zhu 11f138df8f doc: update examples 2018-11-30 15:24:16 +08:00
Lingjie Zhu b5156563be doc: add additional anchors 2018-11-30 15:24:16 +08:00
Lingjie Zhu 2540672e3d doc: update operations 2018-11-30 15:24:16 +08:00
Lingjie Zhu 2d939eb2be fix fit
partition always writes to global facet proxy map
fit takes input proxies and write back, maybe not the global proxies(in split)
2018-11-30 15:24:16 +08:00
Lingjie Zhu 5734237ced split in confined area 2018-11-30 15:24:16 +08:00
Lingjie Zhu ca22427e42 partition and fitting tagged area
use tag to stop the partition flooding
partition/fitting range of proxies
2018-11-30 15:24:16 +08:00
Lingjie Zhu 58f5a58eb5 add proxy wrapper with index
mantain the index when addding/refitting/merging/teleporting
2018-11-30 15:24:16 +08:00
Lingjie Zhu 7d06955b2b make partition and fitting private
because they are always used together --> run(nb_iterations)
2018-11-30 15:24:16 +08:00
Lingjie Zhu 1a94e743ad vertex anchor map int -> std::size_t
anchor map value type int to std::size_t
general invalid tag
2018-11-30 15:24:16 +08:00
Lingjie Zhu 521d9566bc no initialization in manual
move initialization under seeding as stop criteria part
update method figure
formulate method
2018-11-30 15:24:16 +08:00
Lingjie Zhu 8bd68fa3ec update seeding method figure 2018-11-30 15:24:16 +08:00
Lingjie Zhu e4ad5e4490 add number of proxies curve
add nb_proxies - error curve
curve description
error debug output
2018-11-30 15:24:16 +08:00
Lingjie Zhu 50c1e11ee9 add error converge curve
add converge curve figure
add converge description
demo error output
2018-11-30 15:24:16 +08:00
Lingjie Zhu 255e107942 remove init from named parameters 2018-11-30 15:24:16 +08:00
Lingjie Zhu 9c9cfc8f53 pulic compute_fitting_error 2018-11-30 15:24:16 +08:00
Lingjie Zhu af6a8a5df2 replace init with seeding 2018-11-30 15:24:16 +08:00
Lingjie Zhu b11b32e35e remove init_by_ interfaces 2018-11-30 15:24:16 +08:00
Lingjie Zhu fb794ec591 add reasonable default number of iterations 2018-11-30 15:24:16 +08:00
Lingjie Zhu fa81af898f named parameter
iterations -> nb_of_iterations
inner_iterations -> nb_of_relaxations
2018-11-30 15:24:16 +08:00
Pierre Alliez ed053b5f2c Minor improvement on comments. 2018-11-30 15:24:16 +08:00
Pierre Alliez a146ab46cb two figures added to user manual 2018-11-30 15:24:16 +08:00
Pierre Alliez 8a4525ea05 massaging user manual 2018-11-30 15:24:16 +08:00
Pierre Alliez 88e0d86f30 Extended list of TODOs 2018-11-30 15:24:16 +08:00
Pierre Alliez e2b2498b8d massaging user manual 2018-11-30 15:24:16 +08:00