diff --git a/.idea/misc.xml b/.idea/misc.xml index e5d6295..97e327a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/pom.xml b/pom.xml index a391a84..e9e175b 100644 --- a/pom.xml +++ b/pom.xml @@ -17,12 +17,12 @@ org.openjfx javafx-controls - 18.0.2 + 21-ea+24 org.openjfx javafx-fxml - 18.0.2 + 21-ea+24 diff --git a/src/main/java/Assignments/A1/resources/Parameters.java b/src/main/java/Assignments/A1/resources/Parameters.java index aca21ea..b6b79eb 100644 --- a/src/main/java/Assignments/A1/resources/Parameters.java +++ b/src/main/java/Assignments/A1/resources/Parameters.java @@ -9,6 +9,6 @@ package Assignments.A1.resources; public class Parameters { /* Used to prevent DFS from going down only 1 branch */ - public static final int MAX_DEPTH = 100; // Max number of moves in 8-Puzzle's are 31 moves if solvable. + public static final int MAX_DEPTH = 150; // Max number of moves in 8-Puzzle's are 31 moves if solvable. } \ No newline at end of file diff --git a/src/main/java/Assignments/A1/solving_algorithms/DFS.java b/src/main/java/Assignments/A1/solving_algorithms/DFS.java index 0f52e8a..dd46c33 100644 --- a/src/main/java/Assignments/A1/solving_algorithms/DFS.java +++ b/src/main/java/Assignments/A1/solving_algorithms/DFS.java @@ -42,7 +42,7 @@ public class DFS implements Solver { return current; } - if (current.depth > Parameters.MAX_DEPTH || tried.contains(current.toString())) { + if (current.depth > Parameters.MAX_DEPTH || tried.contains(current.board.toString())) { continue; } tried.add(current.toString()); diff --git a/src/main/resources/A1/submission_files/AStar Performance.png b/src/main/resources/A1/submission_files/AStar Performance.png new file mode 100644 index 0000000..d0b2aec Binary files /dev/null and b/src/main/resources/A1/submission_files/AStar Performance.png differ diff --git a/src/main/resources/A1/submission_files/BFS Performance.png b/src/main/resources/A1/submission_files/BFS Performance.png new file mode 100644 index 0000000..3cd3cbc Binary files /dev/null and b/src/main/resources/A1/submission_files/BFS Performance.png differ diff --git a/src/main/resources/A1/submission_files/DFS Spanning Tree.png b/src/main/resources/A1/submission_files/DFS Spanning Tree.png new file mode 100644 index 0000000..5e2cfd8 Binary files /dev/null and b/src/main/resources/A1/submission_files/DFS Spanning Tree.png differ diff --git a/src/main/resources/A1/submission_files/UCS Performance.png b/src/main/resources/A1/submission_files/UCS Performance.png new file mode 100644 index 0000000..cbf6bf5 Binary files /dev/null and b/src/main/resources/A1/submission_files/UCS Performance.png differ