songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix_inconsistencies => fix_inconsistencies_using_perturbation

This commit is contained in:
Clement Jamin 2015-04-29 17:55:06 +02:00
parent e5407e0142
commit 3ceb5992b0
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tangential_complex/benchmark/Tangential_complex/benchmark_tc.cpp
View File

@ -352,7 +352,7 @@ void make_tc(std::vector<Point> &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);

8
Tangential_complex/include/CGAL/Tangential_complex.h
View File

@ -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() << "%)"

7
Tangential_complex/test/Tangential_complex/test_tangential_complex.cpp
View File

@ -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.;