Resolve #47 #48
Resolve #47 #48
Conversation
- ensure parentStructure attribute is initialized by calling AllenCompartment.getTreePath() - fix bug in AllenCompartment.getChildren() - set pre-computed volume for mouse brain root OBJMesh - AllenUtils.getOntologies() returns List instead of Collection - create tests for AllenCompartment and AllenUtils - misc code cleanup
| @@ -340,7 +336,7 @@ public OBJMesh getMesh() { | |||
| */ | |||
| @Override | |||
| public boolean isParentOf(final BrainAnnotation childCompartment) { | |||
| if (childCompartment == null || !(childCompartment instanceof AllenCompartment)) | |||
There was a problem hiding this comment.
@carshadi , won't you get a NPE here if the childCompartment being tested is null? nodes in a reconstruction can be associated with a null compartment, e.g., isParentOf((AllenCompartment)null); Why remove the null check?
There was a problem hiding this comment.
IntelliJ suggested that the null check was not necessary, apparently instanceof returns false if the operand is null
https://stackoverflow.com/questions/2950319/is-null-check-needed-before-calling-instanceof
There was a problem hiding this comment.
I did not know that! good to know. Oh boy. I should adopt IntelliJ. I have never be warned in Eclipse, and have been doing null checks from day one!
| @@ -258,33 +259,29 @@ public AllenCompartment getAncestor(final int level) { | |||
| final ArrayList<AllenCompartment> children = new ArrayList<>(); | |||
| final Collection<AllenCompartment> allCompartments = AllenUtils.getOntologies(); | |||
| for (AllenCompartment c : allCompartments) { | |||
| if (isChildOf(c) && c.getTreePath().size() <= maxLevel) | |||
| if (c.isChildOf(this) && c.getTreePath().size() <= maxLevel) | |||
There was a problem hiding this comment.
nice! quite embarrassing how this war wrong
Resolve #47
parentStructureattribute is initialized by callingAllenCompartment.getTreePath()AllenCompartment.getChildren(final int level)OBJMeshAllenUtils.getOntologies()returnsListinstead ofCollectionAllenCompartmentandAllenUtilspinging @tferr