Skip to content

Heat_method_3: fix multi-source distance normalization (value_at_source_set) #9565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jf--- wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Heat_method_3: fix multi-source distance normalization (value_at_source_set) #9565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Heat_method_3/include/CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,21 +400,21 @@ class Surface_mesh_geodesic_distances_3
}
source_set_val = phi-source_set_val;
} else {
// phi is determined only up to an additive constant: anchor it by
// subtracting the mean of phi over the source set (the least-squares
// choice; for a single source this is the exact shift). phi is in
// general NOT constant across a multi-vertex source set, so taking a
// per-vertex minimum over |phi(i) - phi(s)| -- the distance from the
// VALUE phi(i) to the SET of source values -- folds every vertex whose
// value lies inside the source-value spread toward 0 and shifts the
// far field by the maximum source value instead of a constant.
double mean_source_phi = 0.;
for(vertex_descriptor vd : sources()) {
mean_source_phi += phi.coeff(get(vertex_id_map, vd), 0);
}
mean_source_phi /= static_cast<double>(sources().size());
for(int i = 0; i<dimension; i++) {
double min_val = (std::numeric_limits<double>::max)();
Index vd_index;
//go through the distances to the sources and leave the minimum distance;
for(vertex_descriptor vd : sources()){
vd_index = get(vertex_id_map, vd);
double new_d = CGAL::abs(-phi.coeff(vd_index,0)+phi.coeff(i,0));
if(phi.coeff(vd_index,0)==phi.coeff(i,0)) {
min_val = 0.;
}
if(new_d < min_val) {
min_val = new_d;
}
}
source_set_val(i,0) = min_val;
source_set_val(i,0) = phi.coeff(i,0) - mean_source_phi;
}
}
m_solved_phi.swap(source_set_val);
Expand Down
2 changes: 2 additions & 0 deletions Heat_method_3/test/Heat_method_3/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ create_single_source_cgal_program("heat_method_surface_mesh_direct_test.cpp")
target_link_libraries(heat_method_surface_mesh_direct_test PRIVATE CGAL::Eigen3_support)
create_single_source_cgal_program("heat_method_surface_mesh_intrinsic_test.cpp")
target_link_libraries(heat_method_surface_mesh_intrinsic_test PRIVATE CGAL::Eigen3_support)
create_single_source_cgal_program("heat_method_surface_mesh_multisource_test.cpp")
target_link_libraries(heat_method_surface_mesh_multisource_test PRIVATE CGAL::Eigen3_support)
Loading