linly/Icing-On-Graph
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing stuff :D

Browse Source
This commit is contained in:
Libkyy
2022-06-02 20:33:39 +02:00
parent 5d6a7b3fa9
commit 2f05b41eb2
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

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

24
src/RecipeInstructions.java
View File

@@ -12,16 +12,17 @@ public class RecipeInstructions
ArrayList<RecipeNode> ingredients = new ArrayList<>(); ArrayList<RecipeNode> ingredients = new ArrayList<>();
RecipeTree fullInstructions = new RecipeTree(); RecipeTree fullInstructions = new RecipeTree();
Scanner userInput = new Scanner(System.in);
do do
{ {
System.out.println("Enter instruction: "); System.out.println("Enter instruction: ");
Scanner userInput = new Scanner(System.in);
userInstruction = userInput.nextLine(); userInstruction = userInput.nextLine();
RecipeCreation(userInstruction); RecipeCreation(userInstruction,fullInstructions);
fullInstructions.printTree();
} while (userInstruction.equalsIgnoreCase("done")); } while(!userInstruction.equalsIgnoreCase("done"));
} }
//Magical Regex //Magical Regex
@@ -32,24 +33,11 @@ public class RecipeInstructions
} }
// This creates an action + children // This creates an action + children
public static void RecipeCreation(String instructionIn) public static void RecipeCreation(String instructionIn, RecipeTree fullInstructions)
{ {
//New tree who dis
RecipeTree fullInstructions = new RecipeTree();
//Stinky Scanner please remove or something idk
//Maybe make the method take a string in or somethiong :D
// Scanner input = new Scanner(System.in); <-- Commented remove for testing
String userInput;
//Need to not hardcode verbs maybe a global variable for it? etc etc //Need to not hardcode verbs maybe a global variable for it? etc etc
String[] verbs = {"add", "mix", "stir", "wait", "bake", "heat", "sift", "boil", "melt", "fry", "cool", String[] verbs = {"add", "mix", "stir", "wait", "bake", "heat", "sift", "boil", "melt", "fry", "cool",
"remove", "eat", "cut"}; "remove", "eat", "cut"};
//init this shit
int currentNumber = 0;
String currentIngredient = null;
//Useless sout lol <deleted dw lmao>
// userInput = input.nextLine();
//this was simulating user input for the tests below
// userInput = "mix 3 eggs and 2 milk"; <-- Commented remove for testing
//this is where it gets juicy //this is where it gets juicy
//FIRST WE FIND A VERB FOR THE ACTION //FIRST WE FIND A VERB FOR THE ACTION
for (String verb : verbs) for (String verb : verbs)
@@ -68,7 +56,6 @@ public class RecipeInstructions
//we add the thing to the tree (this also needs to be checked for WHERE it gets added) //we add the thing to the tree (this also needs to be checked for WHERE it gets added)
fullInstructions.addNode((RecipeNode) null, newAction); fullInstructions.addNode((RecipeNode) null, newAction);
} }
fullInstructions.printTree();
} }
} }
@@ -105,7 +92,6 @@ public class RecipeInstructions
@Test @Test
void testRecipeCreation() void testRecipeCreation()
{ {
RecipeCreation("disNotRealOnlyToAvoidErrorTrustDuud");
} }
@Test @Test
void testconstruct_children() void testconstruct_children()