Template morphology glialcell #256
Open
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
Some tests are passing.
-add src/ttree.cpp cleans code by moving functions that do not relate to Morphology immutable from morphology.cpp to ttree.cpp
and most tests
- All enable tests success
…ection Type: GlialSectionType
jacquemi-bbp
force-pushed
the
template_morphology_glialcell
branch
from
4e286b4 to
f300d9f
Compare
wizmer
reviewed
Mar 19, 2021
include/morphio/mut/morphology.h
Outdated
| @@ -152,7 +154,8 @@ class Morphology | |||
|
|
|||
| If recursive == true, all descendent will be appended as well | |||
| **/ | |||
| std::shared_ptr<Section> appendRootSection(const morphio::Section&, bool recursive = false); | |||
| std::shared_ptr<Section> appendRootSection(const morphio::Node<CellFamily::NEURON>&, | |||
There was a problem hiding this comment.
Suggested change
| std::shared_ptr<Section> appendRootSection(const morphio::Node<CellFamily::NEURON>&, | |
| std::shared_ptr<Section> appendRootSection(const morphio::NeuronalSection&, |
is equivalent.
I think it would be good to take the habit of no longer using the old alias Section or even Node<CellFamily::NEURON but the new NeuronalSection.
This will make MorphIO less neuron centric.
include/morphio/ttree.tpp
Outdated
Comment on lines
279
to
284
| /* | ||
| template <typename Node, typename CRTP, typename Mut> | ||
| const CellFamily& TTree<Node, CRTP, Mut>::cellFamily() const { | ||
| return _properties->cellFamily(); | ||
| } | ||
| */ |
| struct CellFamily { | ||
| struct NEURON { | ||
| using Type = SectionType; | ||
| static constexpr int value = 0; |
There was a problem hiding this comment.
Those values must correspond to the values of the cell family in the spec.
https://bbpteam.epfl.ch/documentation/projects/Morphology%20Documentation/latest/h5v1.html
Maybe you can add a comment about it in the code.
setup.py
Outdated
Comment on lines
78
to
79
| cfg = 'Debug' if self.debug else 'Release' | ||
| # cfg = 'Debug' if self.debug else 'Release' | ||
| cfg = 'Debug' |
- Remove dead code - Use alias NeuralSection instead of Node<CellFamily::NEURON> - Use alias GlialSection instead of Node<CellFamily::GLIA>
…bp/MorphIO into template_morphology_glialcell
This was referenced May 10, 2021
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.
This PR is the first one of a series that will implement Dendritic spine Specifications for morphio h5 format. We (@wizmer and @jacquemi-bbp ) decided to not produce too large PULL REQUEST to facilitate the work of reviewers
This PR templatizes immutable Morphology.
The mutable Morphology will be templatized in a next PR
Spine Class will be only implemented in a next next PR
Immutable Morphology becomes a TTree template class:
Two TTree instantiation are created:
Immutable Section becomes Node template class:
Two Node instantiation are created:
enum CellFamily replaced by struct CellFamily (that contains static constexpr to identify Cell type)