Skip to content

enh: enhance labelisation_seeded_watershed performance with shortcut (#260) #296

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
lapertor wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −12
Open

enh: enhance labelisation_seeded_watershed performance with shortcut (#260) #296

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
36 changes: 24 additions & 12 deletions include/higra/algo/watershed.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,22 +144,34 @@ namespace hg {
union_find uf(num_nodes);

array_1d<label_type> labels = vertex_seeds;
index_t num_background_components = 0;
for (index_t i = 0; i < num_nodes; i++) {
if (labels(i) == background_label) {
num_background_components++;
}
}

for (index_t i = 0; i < num_edges; i++) {
auto ei = sorted_edges_indices[i];
auto e = edge_from_index(ei, graph);
auto c1 = uf.find(source(e, graph));
auto c2 = uf.find(target(e, graph));
if (num_background_components > 0) {
for (index_t i = 0; i < num_edges; i++) {
auto ei = sorted_edges_indices[i];
auto e = edge_from_index(ei, graph);
auto c1 = uf.find(source(e, graph));
auto c2 = uf.find(target(e, graph));

if (c1 != c2 && (labels(c1) == background_label || labels(c2) == background_label)) {
if (labels(c1) == background_label) {
labels(c1) = labels(c2);
} else {
labels(c2) = labels(c1);
}
uf.link(c1, c2);

if (c1 != c2 && (labels(c1) == background_label || labels(c2) == background_label)) {
if (labels(c1) == background_label) {
labels(c1) = labels(c2);
} else {
labels(c2) = labels(c1);
num_background_components--;
if (num_background_components == 0) {
break;
}
}
uf.link(c1, c2);
}

}

for (index_t i = 0; i < num_nodes; i++) {
Expand Down