From b11b32e35eaf305caa7d4bee23ae77f3dd62a6b0 Mon Sep 17 00:00:00 2001 From: Lingjie Zhu Date: Tue, 21 Nov 2017 09:24:06 +0800 Subject: [PATCH] remove init_by_ interfaces --- .../vsa_autoinit_timing_benchmark.cpp | 4 +-- .../vsa_timing_benchmark.cpp | 2 +- .../vsa_class_interface_example.cpp | 2 +- .../vsa_isotropic_metric_example.cpp | 2 +- .../include/CGAL/vsa_approximation.h | 29 ------------------- .../vsa_class_interface_test.cpp | 6 ++-- .../vsa_correctness_test.cpp | 2 +- .../vsa_error_decrease_test.cpp | 2 +- .../vsa_meshing_manifold_test.cpp | 2 +- .../vsa_metric_test.cpp | 2 +- .../vsa_teleportation_test.cpp | 2 +- 11 files changed, 13 insertions(+), 42 deletions(-) diff --git a/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_autoinit_timing_benchmark.cpp b/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_autoinit_timing_benchmark.cpp index d4a0f4bc3c1..e63436ccf2e 100644 --- a/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_autoinit_timing_benchmark.cpp +++ b/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_autoinit_timing_benchmark.cpp @@ -60,8 +60,8 @@ int main(int argc, char *argv[]) Timer t; std::cerr << "start initialization" << std::endl; t.start(); - approx.init_by_error( - static_cast(init), tol, iterations); + approx.init( + static_cast(init), boost::none, tol, iterations); t.stop(); std::cerr << "initialization time " << t.time() << " sec." << std::endl; std::cerr << "#proxies " << approx.get_proxies_size() << std::endl; diff --git a/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp b/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp index 18630dfc50c..5dc04c51e97 100644 --- a/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp +++ b/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) std::cerr << "start initialization" << std::endl; t0.reset(); t0.start(); - approx.init_by_number( + approx.init( static_cast(init), num_proxies); t0.stop(); std::cerr << "initialization time " << t0.time() << " sec." << std::endl; diff --git a/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_class_interface_example.cpp b/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_class_interface_example.cpp index 36cf9628d30..d9dc58dfa24 100644 --- a/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_class_interface_example.cpp +++ b/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_class_interface_example.cpp @@ -36,7 +36,7 @@ int main() approx.set_metric(metric, proxy_fitting); // initialize 100 random proxies - approx.init_by_number(CGAL::VSA::Random, 100); + approx.init(CGAL::VSA::Random, 100); // run 30 iterations approx.run(30); diff --git a/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_isotropic_metric_example.cpp b/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_isotropic_metric_example.cpp index 9c415d15dc5..4845d7872f1 100644 --- a/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_isotropic_metric_example.cpp +++ b/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_isotropic_metric_example.cpp @@ -109,7 +109,7 @@ int main() approx.set_metric(metric, proxy_fitting); // approximation via 200 proxies and 30 iterations - approx.init_by_number(CGAL::VSA::Hierarchical, 200); + approx.init(CGAL::VSA::Hierarchical, 200); approx.run(30); return EXIT_SUCCESS; diff --git a/Surface_mesh_approximation/include/CGAL/vsa_approximation.h b/Surface_mesh_approximation/include/CGAL/vsa_approximation.h index 6fe4e8d1f7b..60ab2f350de 100644 --- a/Surface_mesh_approximation/include/CGAL/vsa_approximation.h +++ b/Surface_mesh_approximation/include/CGAL/vsa_approximation.h @@ -399,35 +399,6 @@ public: } } - /*! - * @brief Initialize with targeted number of proxies. - * @param method seeding method - * @param max_nb_proxies target maximum number of proxies - * @param num_iterations number of re-fitting iterations - * in incremental and hierarchical seeding - * @return number of proxies initialized - */ - std::size_t init_by_number( - const Seeding method, - const std::size_t max_nb_proxies, - const std::size_t num_iterations = 5) { - return init(method, max_nb_proxies, boost::none, num_iterations); - } - - /*! - * @brief Initialize proxies to targeted error drop. - * @param method seeding method - * @param target_drop targeted error drop to initial state, in range (0, 1) - * @param num_iterations number of re-fitting iterations - * @return number of proxies initialized - */ - std::size_t init_by_error( - const Seeding method, - const FT target_drop, - const std::size_t num_iterations = 5) { - return init(method, boost::none, target_drop, num_iterations); - } - /*! * @brief Run the partitioning and fitting processes. * @param num_iterations number of iterations. diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_class_interface_test.cpp b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_class_interface_test.cpp index 48a856584d0..51817735fef 100644 --- a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_class_interface_test.cpp +++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_class_interface_test.cpp @@ -53,7 +53,7 @@ int main() // random init and run std::cout << "random init and run" << std::endl; - approx.init_by_number(CGAL::VSA::Random, 10); + approx.init(CGAL::VSA::Random, 10); approx.run(10); if (approx.get_proxies_size() != 10) return EXIT_FAILURE; @@ -125,7 +125,7 @@ int main() approx.rebuild(); if (approx.get_proxies_size() != 0) return EXIT_FAILURE; - approx.init_by_error(CGAL::VSA::Hierarchical, drop, iterations); + approx.init(CGAL::VSA::Hierarchical, boost::none, drop, iterations); approx.run(10); std::cout << "#proxies " << approx.get_proxies_size() << std::endl; @@ -133,7 +133,7 @@ int main() approx.rebuild(); if (approx.get_proxies_size() != 0) return EXIT_FAILURE; - approx.init_by_error(CGAL::VSA::Incremental, drop, iterations); + approx.init(CGAL::VSA::Incremental, boost::none, drop, iterations); approx.run(10); std::cout << "#proxies " << approx.get_proxies_size() << std::endl; diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_correctness_test.cpp b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_correctness_test.cpp index 0f75745b72b..da1e0372e93 100644 --- a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_correctness_test.cpp +++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_correctness_test.cpp @@ -40,7 +40,7 @@ bool test_shape(const char *file_name, const std::size_t target_num_proxies) const FT drop(1e-8); const std::size_t num_iterations = 20; const std::size_t inner_iterations = 10; - approx.init_by_error(CGAL::VSA::Incremental, drop, inner_iterations); + approx.init(CGAL::VSA::Incremental, boost::none, drop, inner_iterations); approx.run(num_iterations); // eliminate redundant area (local minima) by merging diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_error_decrease_test.cpp b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_error_decrease_test.cpp index 993ba9588b0..5c57dfbfc3a 100644 --- a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_error_decrease_test.cpp +++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_error_decrease_test.cpp @@ -51,7 +51,7 @@ int main() L21_proxy_fitting proxy_fitting(mesh); approx.set_metric(error_metric, proxy_fitting); - approx.init_by_number(CGAL::VSA::Random, 100); + approx.init(CGAL::VSA::Random, 100); std::vector error; for (std::size_t i = 0; i < 30; ++i) error.push_back(approx.run()); diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_meshing_manifold_test.cpp b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_meshing_manifold_test.cpp index e76dff0fbcf..b09392e318c 100644 --- a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_meshing_manifold_test.cpp +++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_meshing_manifold_test.cpp @@ -38,7 +38,7 @@ bool test_manifold(const char *file_name, const FT drop = FT(1e-8)) // approximation, init from error, drop to the target error incrementally const std::size_t num_iterations = 20; const std::size_t inner_iterations = 5; - approx.init_by_error(CGAL::VSA::Incremental, drop, inner_iterations); + approx.init(CGAL::VSA::Incremental, boost::none, drop, inner_iterations); approx.run(num_iterations); std::cout << "#proxies " << approx.get_proxies_size() << std::endl; diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_metric_test.cpp b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_metric_test.cpp index 9a9cc99ca6e..195596436d3 100644 --- a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_metric_test.cpp +++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_metric_test.cpp @@ -99,7 +99,7 @@ int main() approx.set_metric(error_metric, proxy_fitting); std::cout << "random init and run" << std::endl; - approx.init_by_number(CGAL::VSA::Random, 20); + approx.init(CGAL::VSA::Random, 20); approx.run(20); if (approx.get_proxies_size() != 20) return EXIT_FAILURE; diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_teleportation_test.cpp b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_teleportation_test.cpp index 17c25c99a95..9f6fe038125 100644 --- a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_teleportation_test.cpp +++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_teleportation_test.cpp @@ -66,7 +66,7 @@ int main() approx.set_metric(error_metric, proxy_fitting); std::cout << "Seeding by number." << std::endl; - approx.init_by_number(CGAL::VSA::Random, 50); + approx.init(CGAL::VSA::Random, 50); if (approx.get_proxies_size() != 50) return EXIT_FAILURE; for (std::size_t i = 0; i < 10; ++i) {