[Simplex tree] Additional copy constructor for Simplex_tree #1121
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
Aug 21, 2024
src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h
Outdated
Show resolved
Hide resolved
| for (auto& p : root_source.members()){ | ||
| auto it = root_.members().try_emplace(root_.members().end(), p.first); | ||
| it->second.assign_children(&root_); | ||
| it->second.assign_filtration(translate_filtration_value(p.second.filtration())); |
There was a problem hiding this comment.
For multi, do we have that emplace creates a vector of size 1 containing +inf, then translate creates a vector of size 2 (for instance), then assign_filtration copies that vector, for a total of 3 allocations?
There was a problem hiding this comment.
Deleted old answer, as I just realized I remembered it all wrong... And I don't remember why I made this choice. I will try the constructor version, that should avoid at least one allocation.
…explicit_storage.h Co-authored-by: Marc Glisse <[email protected]>
mglisse
reviewed
Aug 30, 2024
…hreiber/gudhi-devel into simplex_tree_custom_copy_constructor
mglisse
reviewed
Sep 9, 2024
src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h
Outdated
Show resolved
Hide resolved
| void assign_key(Simplex_key k) { key_ = k; } | ||
| Simplex_key key() const { return key_; } | ||
| private: | ||
| Simplex_key key_; | ||
| }; | ||
| struct Key_simplex_base_dummy { | ||
| Key_simplex_base_dummy() {} | ||
| Key_simplex_base_dummy(Simplex_key k) { |
There was a problem hiding this comment.
I think the conclusion was to remove this constructor?
There was a problem hiding this comment.
Yes, it should be done now.
mglisse
approved these changes
Sep 12, 2024
VincentRouvreau
approved these changes
Sep 12, 2024
Co-authored-by: Marc Glisse <[email protected]>
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.
Another copy constructor for the simplex tree copying from a simplex tree with eventually different options as template parameter. Takes also a method converting the filtration values. Will be used to replace the methods
multifyandflattenin PR #976.I also changed the default copy constructor such that it copies all the keys. For now, it copied the keys of the vertices (with the default copy constructors of the node), but not for the other faces (the nodes were reconstructed from scratch). Copying the keys is not adding to the complexity, so I think that it is worth correcting the inconsistency. Also, I can imagine scenarios where having the keys can be useful when flatten a multi simplex tree (to keep the correspondences of the boundaries in the boundary matrix used for most of the computations).
Edit: we should also think about the attribute 'data' in the nodes to be copied or not.