Fix fast cofaces for insert_batch_vertices #971
Merged
Conversation
This file contains 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
mglisse
reviewed
Sep 22, 2023
Comment on lines
1322
to
1325
| std::vector<Vertex_handle> old_members(root_.members().size()); | ||
| if constexpr (Options::link_nodes_by_label) { | ||
| for (auto sh = root_.members().begin(); sh != root_.members().end(); sh++) | ||
| old_members.emplace_back(sh->first); |
There was a problem hiding this comment.
You create old_members that contains n copies of 0 then append the rest to it? Did you mean to use reserve instead?
| root_.members_.insert(boost::begin(verts), boost::end(verts)); | ||
| if (dimension_ < 0 && !root_.members_.empty()) dimension_ = 0; | ||
| for (auto sh = root_.members().begin(); sh != root_.members().end(); sh++) { | ||
| if constexpr (Options::link_nodes_by_label) { | ||
| if (std::find(old_members.begin(), old_members.end(), sh->first) == std::end(old_members)) |
There was a problem hiding this comment.
No, using std::find yields a quadratic cost, whereas both vectors are sorted so it would be possible to walk on both at the same time in linear time.
| if (std::find(old_members.begin(), old_members.end(), sh->first) == std::end(old_members)) | ||
| update_simplex_tree_after_node_insertion(sh); | ||
| } else { | ||
| update_simplex_tree_after_node_insertion(sh); |
There was a problem hiding this comment.
I don't understand why this appears in both branches, but with a test in one branch?
mglisse
reviewed
Sep 25, 2023
| @@ -1321,6 +1321,12 @@ class Simplex_tree { | |||
| return Dit_value_t(v, Node(&root_, filt)); }); | |||
| root_.members_.insert(boost::begin(verts), boost::end(verts)); | |||
| if (dimension_ < 0 && !root_.members_.empty()) dimension_ = 0; | |||
| if constexpr (Options::link_nodes_by_label) { | |||
| for (auto sh = root_.members().begin(); sh != root_.members().end(); sh++) { | |||
| if (nodes_label_to_list_.find(sh->first) == nodes_label_to_list_.end()) | |||
There was a problem hiding this comment.
Or something like
Suggested change
| if (nodes_label_to_list_.find(sh->first) == nodes_label_to_list_.end()) | |
| if (!sh->second.list_max_vertex_hook_.is_linked()) |
?
mglisse
approved these changes
Sep 26, 2023
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.
Fix #970
To be discussed if storing information in a
std::vector<Vertex_handle>is a good idea or not.