Failed action adder

This commit is contained in:
2022-06-02 21:09:59 +02:00
parent 2f05b41eb2
commit 5e0ad7d9ff
3 changed files with 16 additions and 2 deletions

2
.idea/misc.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_13" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

View File

@@ -54,7 +54,7 @@ public class RecipeInstructions
String[] words = split[1].split(" ");
construct_children(newAction, words);
//we add the thing to the tree (this also needs to be checked for WHERE it gets added)
fullInstructions.addNode((RecipeNode) null, newAction);
fullInstructions.actionAdd(newAction);
}
}

View File

@@ -130,5 +130,19 @@ public class RecipeTree
}
}
public void actionAdd(RecipeNode actionNchild) {
if(root == null) {
root = actionNchild;
} else {
for(RecipeNode node : root.children) {
if(node.getPortion() != 0 || !actionNchild.getIngredient().equals(node.getIngredient())) {
actionAdd(actionNchild);
} else if(node.getPortion() == 0 && actionNchild.getIngredient().equals(node.getIngredient())) {
actionNchild.parent = node.parent;
node.parent = actionNchild;
}
}
}
}
}