From 3ceb5992b07fabf29a4ae0437624851cb81fe18e Mon Sep 17 00:00:00 2001 From: Clement Jamin Date: Wed, 29 Apr 2015 17:55:06 +0200 Subject: [PATCH] fix_inconsistencies => fix_inconsistencies_using_perturbation --- .../benchmark/Tangential_complex/benchmark_tc.cpp | 2 +- Tangential_complex/include/CGAL/Tangential_complex.h | 8 ++++---- .../test/Tangential_complex/test_tangential_complex.cpp | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Tangential_complex/benchmark/Tangential_complex/benchmark_tc.cpp b/Tangential_complex/benchmark/Tangential_complex/benchmark_tc.cpp index 548f0c48949..9cf7efbb3e4 100644 --- a/Tangential_complex/benchmark/Tangential_complex/benchmark_tc.cpp +++ b/Tangential_complex/benchmark/Tangential_complex/benchmark_tc.cpp @@ -352,7 +352,7 @@ void make_tc(std::vector &points, std::size_t initial_num_inconsistent_local_tr; std::size_t best_num_inconsistent_local_tr; std::size_t final_num_inconsistent_local_tr; - perturb_ret = tc.fix_inconsistencies( + perturb_ret = tc.fix_inconsistencies_using_perturbation( num_perturb_steps, initial_num_inconsistent_local_tr, best_num_inconsistent_local_tr, final_num_inconsistent_local_tr, time_limit_for_perturb); diff --git a/Tangential_complex/include/CGAL/Tangential_complex.h b/Tangential_complex/include/CGAL/Tangential_complex.h index 38e7d1aa53f..d484bc65b94 100644 --- a/Tangential_complex/include/CGAL/Tangential_complex.h +++ b/Tangential_complex/include/CGAL/Tangential_complex.h @@ -445,7 +445,7 @@ public: } // time_limit in seconds: 0 = no fix to do, < 0 = no time limit - Fix_inconsistencies_status fix_inconsistencies( + Fix_inconsistencies_status fix_inconsistencies_using_perturbation( unsigned int &num_steps, std::size_t &initial_num_inconsistent_local_tr, std::size_t &best_num_inconsistent_local_tr, @@ -533,7 +533,7 @@ public: << "Inconsistencies (detailed stats):\n" << " * Number of vertices: " << m_points.size() << std::endl << std::endl - << " * BEFORE fix_inconsistencies:" << std::endl + << " * BEFORE fix_inconsistencies_using_perturbation:" << std::endl << " - Total number of simplices in stars (incl. duplicates): " << stats_before.first << std::endl << " - Num inconsistent simplices in stars (incl. duplicates): " @@ -545,7 +545,7 @@ public: << " (" << 100. * num_inconsistent_local_tr / m_points.size() << "%)" << std::endl << std::endl - << " * AFTER fix_inconsistencies:" << std::endl + << " * AFTER fix_inconsistencies_using_perturbation:" << std::endl << " - Total number of simplices in stars (incl. duplicates): " << stats_after.first << std::endl << " - Num inconsistent simplices in stars (incl. duplicates): " @@ -563,7 +563,7 @@ public: std::cerr << std::endl << "==========================================================" << std::endl - << "fix_inconsistencies():\n" + << "fix_inconsistencies_using_perturbation():\n" << " * " << m_points.size() << " vertices" << std::endl << " * " << num_inconsistent_local_tr << " (" << 100. * num_inconsistent_local_tr / m_points.size() << "%)" diff --git a/Tangential_complex/test/Tangential_complex/test_tangential_complex.cpp b/Tangential_complex/test/Tangential_complex/test_tangential_complex.cpp index 691f5429c78..9ac1d555c5c 100644 --- a/Tangential_complex/test/Tangential_complex/test_tangential_complex.cpp +++ b/Tangential_complex/test/Tangential_complex/test_tangential_complex.cpp @@ -120,9 +120,10 @@ int main() std::size_t initial_num_inconsistent_local_tr; std::size_t best_num_inconsistent_local_tr; std::size_t final_num_inconsistent_local_tr; - CGAL::Fix_inconsistencies_status fix_ret = tc.fix_inconsistencies( - num_fix_steps, initial_num_inconsistent_local_tr, - best_num_inconsistent_local_tr, final_num_inconsistent_local_tr, 1000.); + CGAL::Fix_inconsistencies_status fix_ret = + tc.fix_inconsistencies_using_perturbation( + num_fix_steps, initial_num_inconsistent_local_tr, + best_num_inconsistent_local_tr, final_num_inconsistent_local_tr, 1000.); double fix_time = t.elapsed(); t.reset(); double export_after_time = -1.;