improve the backend tree validator #2832
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
jstriebel
suggested changes
Jul 2, 2018
| @@ -9,6 +9,14 @@ import scala.collection.mutable | |||
|
|
|||
| object TreeValidator { | |||
|
|
|||
| def validateAdditionalInformation(trees: Seq[Tree], branchPoints: Seq[BranchPoint], comments: Seq[Comment], treeGroups: Seq[TreeGroup]): Box[Unit] = | |||
There was a problem hiding this comment.
Tbh I think this function is a layer of indirection to much, as this is called exactly once. Please move those calls directly to the parse function.
| } | ||
| } | ||
|
|
||
| private def checkAllNodesUsedInBranchPointsExist(trees: Seq[Tree], branchPoints: Seq[BranchPoint]): Box[Unit] = { |
There was a problem hiding this comment.
Please make this and similar functions a bit more DRY. There are multiple functions checking that some nodes exist in the trees.
jstriebel
suggested changes
Jul 5, 2018
| } | ||
| } | ||
|
|
||
| private def checkAllNodesUsedExist(trees: Seq[Tree], usedNodes: Seq[Int]) = { |
There was a problem hiding this comment.
As this is called check…, please include the actual check with the Failure message here. It justs needs the name of the nodes for the message.
youri-k
added a commit
that referenced
this pull request
Jul 9, 2018
* [WIP] backend unit test for nml parser * [WIP] Unit Tests for Backend * [WIP] backend unit test now work for serializing and parsing #2826 * nml tests now work similar to the frontend tests * fix imports * mark test as working to enable ci build #2829 * fix compiler errors and add some tests #2829 * enhance the backend tree validator with some functions the frontend already uses #2830 * add docker-compose service backend-tests * CI: add backend tests * e2e tests: move invariant config to End2EndSpec.scala * implement pr advice #2829 * implement some of the pr advice #2832 * implement pr feedback #2832 * implement pr advice #2829 * fix merge errors and make code DRYer #2832 * Update CHANGELOG.md
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.
namely:
invalid comments
invalid branchPoints
invalid and duplicated groupIds
measured performance impact: + 1,2 - 1,8 sec for this 200.000 node tracing (https://webknossos.brain.mpg.de/annotations/Explorational/5a2987f066000063056b88d1/readOnly#2632,1514,1387,0,2.23,14)
whole parsing process takes ca. 20 sec
old validation alone takes ca. 2,8 sec
all times measured locally with my machine (not the strongest)
URL of deployed dev instance (used for testing):
Steps to test:
Issues: