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

fix compute fitting error

This commit is contained in:
Lingjie Zhu 2017-08-28 23:02:50 +08:00
parent b4eead5e7b
commit 9fd77a904f
1 changed files with 28 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Surface_mesh_approximation/include/CGAL/VSA_approximation.h
View File

@ -493,13 +493,12 @@ public:
std::cerr << "#px " << proxies.size() << std::endl; std::cerr << "#px " << proxies.size() << std::endl;
#endif #endif
std::vector<FT> err(proxies.size(), FT(0)); const FT sum_error = compute_fitting_error();
const FT sum_error = compute_fitting_error(err);
const FT avg_error = sum_error / FT(static_cast<double>(num_proxies)); const FT avg_error = sum_error / FT(static_cast<double>(num_proxies));
std::vector<ProxyError> px_error; std::vector<ProxyError> px_error;
for (std::size_t i = 0; i < proxies.size(); ++i) for (std::size_t i = 0; i < proxies.size(); ++i)
px_error.push_back(ProxyError(i, err[i])); px_error.push_back(ProxyError(i, proxies[i].err));
// sort partition by error // sort partition by error
std::sort(px_error.begin(), px_error.end()); std::sort(px_error.begin(), px_error.end());
@ -559,13 +558,12 @@ public:
std::size_t num_teleported = 0; std::size_t num_teleported = 0;
while (num_teleported < num_proxies) { while (num_teleported < num_proxies) {
// find worst proxy // find worst proxy
std::vector<FT> px_error(proxies.size(), FT(0)); compute_fitting_error();
compute_fitting_error(px_error);
std::size_t px_worst = 0; std::size_t px_worst = 0;
FT max_error = px_error.front(); FT max_error = proxies.front().err;
for (std::size_t i = 0; i < proxies.size(); ++i) { for (std::size_t i = 0; i < proxies.size(); ++i) {
if (max_error < px_error[i]) { if (max_error < proxies[i].err) {
max_error = px_error[i]; max_error = proxies[i].err;
px_worst = i; px_worst = i;
} }
} }
@ -634,15 +632,11 @@ public:
std::list<face_descriptor> merged_patch; std::list<face_descriptor> merged_patch;
BOOST_FOREACH(face_descriptor f, faces(*m_pmesh)) { BOOST_FOREACH(face_descriptor f, faces(*m_pmesh)) {
std::size_t px_idx = fproxy_map[f]; std::size_t px_idx = fproxy_map[f];
if (px_idx == px1) { if (px_idx == px1 || px_idx == px0) {
err_sum += (*fit_error)(f, proxies[px_idx].px); err_sum += (*fit_error)(f, proxies[px_idx].px);
fproxy_map[f] = px0; fproxy_map[f] = px0;
merged_patch.push_back(f); merged_patch.push_back(f);
} }
else if (px_idx == px0) {
err_sum += (*fit_error)(f, proxies[px_idx].px);
merged_patch.push_back(f);
}
} }
proxies[px0] = fit_new_proxy(merged_patch.begin(), merged_patch.end()); proxies[px0] = fit_new_proxy(merged_patch.begin(), merged_patch.end());
@ -679,7 +673,6 @@ public:
// find best merge // find best merge
MergedPair merged_set; MergedPair merged_set;
// Proxy merged_px;
FT min_merged_error = FT(0); FT min_merged_error = FT(0);
bool first_merge = true; bool first_merge = true;
BOOST_FOREACH(edge_descriptor e, edges(*m_pmesh)) { BOOST_FOREACH(edge_descriptor e, edges(*m_pmesh)) {
@ -698,33 +691,30 @@ public:
BOOST_FOREACH(face_descriptor f, px_facets[pxj]) BOOST_FOREACH(face_descriptor f, px_facets[pxj])
merged_patch.push_back(f); merged_patch.push_back(f);
ProxyWrapper px = fit_new_proxy(merged_patch.begin(), merged_patch.end()); ProxyWrapper pxw = fit_new_proxy(merged_patch.begin(), merged_patch.end());
FT sum_error(0); FT sum_error(0);
BOOST_FOREACH(face_descriptor f, merged_patch) BOOST_FOREACH(face_descriptor f, merged_patch)
sum_error += (*fit_error)(f, px.px); sum_error += (*fit_error)(f, pxw.px);
merged_set.insert(ProxyPair(pxi, pxj)); merged_set.insert(ProxyPair(pxi, pxj));
if (first_merge || sum_error < min_merged_error) { if (first_merge || sum_error < min_merged_error) {
first_merge = false; first_merge = false;
min_merged_error = sum_error; min_merged_error = sum_error;
// merged_px = px;
px_enlarged = pxi; px_enlarged = pxi;
px_merged = pxj; px_merged = pxj;
} }
} }
std::vector<FT> px_error(proxies.size(), FT(0));
compute_fitting_error(px_error);
FT max_error = px_error.front();
for (std::size_t i = 0; i < proxies.size(); ++i) {
if (max_error < px_error[i])
max_error = px_error[i];
}
// test if merge worth it // test if merge worth it
if (if_test) { if (if_test) {
compute_fitting_error();
FT max_error = proxies.front().err;
for (std::size_t i = 0; i < proxies.size(); ++i) {
if (max_error < proxies[i].err)
max_error = proxies[i].err;
}
const FT merge_thre = max_error / FT(2); const FT merge_thre = max_error / FT(2);
const FT increase = min_merged_error - (px_error[px_enlarged] + px_error[px_merged]); const FT increase = min_merged_error - (proxies[px_enlarged].err + proxies[px_merged].err);
if (increase > merge_thre) if (increase > merge_thre)
return false; return false;
} }
@ -744,20 +734,20 @@ public:
return FT(0); return FT(0);
std::size_t count = 1; std::size_t count = 1;
FT err(0); FT sum_err(0);
BOOST_FOREACH(face_descriptor f, faces(*m_pmesh)) { BOOST_FOREACH(face_descriptor f, faces(*m_pmesh)) {
if (count >= n) if (count >= n)
break; break;
if (fproxy_map[f] == px && f != proxies[px].seed) { if (fproxy_map[f] == px && f != proxies[px].seed) {
err += (*fit_error)(f, proxies[px].px); sum_err += (*fit_error)(f, proxies[px].px);
fproxy_map[f] = proxies.size(); fproxy_map[f] = proxies.size();
proxies.push_back(fit_new_proxy(f)); proxies.push_back(fit_new_proxy(f));
++count; ++count;
} }
} }
return err; return sum_err;
} }
/*! /*!
@ -1157,25 +1147,17 @@ private:
* @return total fitting error * @return total fitting error
*/ */
FT compute_fitting_error() { FT compute_fitting_error() {
FT sum_error(0); BOOST_FOREACH(ProxyWrapper &pxw, proxies)
BOOST_FOREACH(face_descriptor f, faces(*m_pmesh)) pxw.err = FT(0);
sum_error += (*fit_error)(f, proxies[fproxy_map[f]].px);
return sum_error;
}
/*!
* @brief Computes fitting error of a current partition and proxies.
* @param px_error vector of error of each proxy
* @return total fitting error
*/
FT compute_fitting_error(std::vector<FT> &px_error) {
FT sum_error(0);
BOOST_FOREACH(face_descriptor f, faces(*m_pmesh)) { BOOST_FOREACH(face_descriptor f, faces(*m_pmesh)) {
const std::size_t px_idx = fproxy_map[f]; std::size_t pxidx = fproxy_map[f];
FT err = (*fit_error)(f, proxies[px_idx].px); proxies[pxidx].err += (*fit_error)(f, proxies[pxidx].px);
px_error[px_idx] += err;
sum_error += err;
} }
FT sum_error(0);
BOOST_FOREACH(const ProxyWrapper &pxw, proxies)
sum_error += pxw.err;
return sum_error; return sum_error;
} }