Open
Conversation
Owner
|
Cherry picked code beautification/simplification to #315 |
Owner
|
I wonder if we could keep the children sorted but work around the bottleneck something like this? std::vector<u64> to_reattach;
// drop children and attach grandchildren
while (!node_stack.empty()) {
const u64 popped_node = node_stack.back();
node_stack.pop_back();
detach_search_parent(records, popped_node);
std::vector<u64> grandchildren;
const auto grandchildren_range = ChildrenView(records, popped_node);
std::ranges::copy(grandchildren_range, std::back_inserter(grandchildren));
for (const u64 grandchild : grandchildren) {
if (records.rank[grandchild] >= rank) {
detach_search_parent(records, grandchild);
to_reattach.push_back(grandchild);
} else {
node_stack.push_back(grandchild);
}
}
}
# not sure if this part is a good idea?
# if (to_reattach.size() > 0) {
# for (const u64 child : ChildrenView(records, node)) {
# detach_search_parent(records, child);
# to_reattach.push_back(child);
# }
# }
std::sort(
to_reattach.begin(), to_reattach.end(),
[&records](const u64 lhs, const u64 rhs) {
return (
std::tuple{records.rank[lhs], lhs} < std::tuple{records.rank[rhs], rhs}
);
}
);
for (const u64 reattached : std::ranges::reverse_view(to_reattach)) {
attach_search_parent(records, reattached, node);
}
collapse_indistinguishable_nodes(records, node);
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes the second part of #271