Commit Graph

391 Commits

Author SHA1 Message Date
Sébastien Loriot b91dc57fd2 approximate_mesh -> approximate_triangle_mesh 2018-11-30 15:32:34 +08:00
Sébastien Loriot f8c7ef3090 rename namespace from VSA -> Surface_mesh_approximation 2018-11-30 15:32:34 +08:00
Sébastien Loriot fa0577a25a rename subdirectory 2018-11-30 15:32:34 +08:00
Sébastien Loriot 15c4fed427 add license headers 2018-11-30 15:32:34 +08:00
Sébastien Loriot c9d4ab26df update signature to be consistent 2018-11-30 15:32:34 +08:00
Sébastien Loriot ad964de61d remove trailing whitespaces 2018-11-30 15:32:34 +08:00
Sébastien Loriot e2c7c233f1 lower case verb in brief 2018-11-30 15:32:34 +08:00
Sébastien Loriot b095d8011d change return type of find_best_merge() and update doc 2018-11-30 15:32:34 +08:00
Sébastien Loriot 79347110d3 cosmetic renaming of parameters 2018-11-30 15:32:34 +08:00
Sébastien Loriot 7bf5cff4cf accomodate update from master 2018-11-30 15:32:34 +08:00
Lingjie Zhu 2221f818b9 fix doc 2018-11-30 15:32:34 +08:00
Sébastien Loriot 99e09bba7a use uppercase for enums and rephrasing 2018-11-30 15:32:34 +08:00
Lingjie Zhu 4d5f2ee7ca change parameter order 2018-11-30 15:32:34 +08:00
Lingjie Zhu 0aa0eac88e fix naming 2018-11-30 15:32:34 +08:00
Lingjie Zhu 70ad3d2984 initialize seeds with named parameters 2018-11-30 15:32:34 +08:00
Lingjie Zhu 379daa1074 add directories reflecting the namespace 2018-11-30 15:32:34 +08:00
Lingjie Zhu 1c54d9660f fix compile issue 2018-11-30 15:32:34 +08:00
Lingjie Zhu 30d6058bf1 fix number to add in error diffusion 2018-11-30 15:32:34 +08:00
Lingjie Zhu 095f2da2e7 add output function with named parameters in class interface
keep trivial output functions internal in the doc
2018-11-30 15:32:34 +08:00
Lingjie Zhu e1b5252f19 remove setup functions
get rid of set_mesh, set_metric, rebuild functions
2018-11-30 15:32:34 +08:00
Lingjie Zhu e27a6b2b51 remove default constructor 2018-11-30 15:32:34 +08:00
Lingjie Zhu 1f78b9590c grouping named parameters 2018-11-30 15:32:34 +08:00
Lingjie Zhu 3fdd1ee45b facet -> face everywhere 2018-11-30 15:32:34 +08:00
Lingjie Zhu 878e0f3ad0 facet -> face 2018-11-30 15:32:34 +08:00
Lingjie Zhu 4b03e9de89 seeding -> initialize_seeds 2018-11-30 15:32:34 +08:00
Lingjie Zhu b3c0cf16a5 facet_proxy_map -> face_proxy_map 2018-11-30 15:32:34 +08:00
Lingjie Zhu 851cf8c49a max_nb_proxies -> max_nb_of_proxies 2018-11-30 15:32:34 +08:00
Lingjie Zhu e91b469190 move free function and enumerations in namespace VSA 2018-11-30 15:32:34 +08:00
Lingjie Zhu 0711b40335 fix verbose level 2018-11-30 15:32:34 +08:00
Lingjie Zhu 201f3145bb fix template parameter, remove unnecessary grouping 2018-11-30 15:32:34 +08:00
Lingjie Zhu eabcfd2d08 never take a reference over a descriptor 2018-11-30 15:32:34 +08:00
Lingjie Zhu cfd47020bd switch parameter order in ErrorMetricProxy concept 2018-11-30 15:32:34 +08:00
Lingjie Zhu 4a9a1ae57e L21_metric_vector_proxy -> L21_metric_plane_proxy.h
better name for quadric surface
2018-11-30 15:30:51 +08:00
Lingjie Zhu 0eeed88a85 fix tparam in manual 2018-11-30 15:30:51 +08:00
Lingjie Zhu 679cb1e1fa fix GeomTraits requirements 2018-11-30 15:30:51 +08:00
Lingjie Zhu 7a52839028 fix clashing doxygen link
Polygon_mesh_processing named parameters has same doxygen tag
It is caused by the doxygen dependency
2018-11-30 15:30:51 +08:00
Lingjie Zhu 3bcf533cf5 move named parameters under namespace VSA
both error metrics and parameters are in the same namespace
2018-11-30 15:30:51 +08:00
Lingjie Zhu f5696aca49 fix naming
mesh_approximation to approximate_mesh
2018-11-30 15:30:51 +08:00
Lingjie Zhu 183a092e6b fix naming
class name VSA_approximation to Variational_shape_approximation
2018-11-30 15:30:51 +08:00
Lingjie Zhu c203a3a38f move file VSA_approximation.h to Variational_shape_approximation.h 2018-11-30 15:30:51 +08:00
Lingjie Zhu fe2bdbd5c9 fix clashed names with PMP named parameters
move named parameters from CGAL::internal_np to CGAL::Surface_mesh_approximation::internal_np
2018-11-30 15:30:51 +08:00
Lingjie Zhu 350c15a18a named parameter 'vsa' prefix to 'sma' 2018-11-30 15:30:51 +08:00
Lingjie Zhu 6560bab1ee fix unused parameter warning 2018-11-30 15:30:51 +08:00
Lingjie Zhu 5065974185 fix missing typename 2018-11-30 15:30:51 +08:00
Lingjie Zhu 5bf415fb31 fix ErrorMetricProxy
member function with face_descriptor and TriangleMesh parameter
FacetIterator to FaceRange template parameter
2018-11-30 15:30:51 +08:00
Lingjie Zhu da78cb080c fix ErrorMetricProxy concept 2018-11-30 15:30:51 +08:00
Lingjie Zhu 82d4501d92 remove area weighing l21 proxy 2018-11-30 15:30:51 +08:00
Lingjie Zhu 6f928384e8 add all_default named parameter 2018-11-30 15:30:51 +08:00
Lingjie Zhu 6ce0fe2ab5 tweak meshing named parameters
mesh_chord_error -> subdivision_ratio
is_relative_to_chord -> relative_to_chord
2018-11-30 15:30:51 +08:00
Lingjie Zhu 1f93c8558c update doc 2018-11-30 15:30:51 +08:00
Lingjie Zhu ee3c15e0fe optional extract mesh 2018-11-30 15:30:51 +08:00
Lingjie Zhu 74a8e9cfd5 add level of verbose 2018-11-30 15:30:51 +08:00
Lingjie Zhu 97372be65f l21 metric plane proxy to l21 metric vector proxy 2018-11-30 15:30:51 +08:00
Lingjie Zhu 73608d2510 extract_mesh with named parameters 2018-11-30 15:30:51 +08:00
Lingjie Zhu f679888c7e fix compilation error 2018-11-30 15:30:51 +08:00
Pierre Alliez b9be820b74 some TODOs 2018-11-30 15:30:51 +08:00
Pierre Alliez 8ca8794bda simpler named params. 2018-11-30 15:30:51 +08:00
Pierre Alliez c50bb0593a named params 2018-11-30 15:30:51 +08:00
Pierre Alliez 64261f0acd shorter named parameters (code to update in accordance!)
namespace VSA for error metrics

file and classes renamed for error metrics (should be named xx_metric_yy_proxy)
2018-11-30 15:30:51 +08:00
Pierre Alliez 1048255d6d massaging reference manual 2018-11-30 15:30:51 +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 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 a34d2e651c fix error rounding up
code and document
2018-11-30 15:30:08 +08:00
Lingjie Zhu 9db2720d6f fix reference manual 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 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
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 ba2ef67904 check forced teleportation 2018-11-30 15:28:00 +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