diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9a2add533d6866e36cb7c336a97401def9eec370..024578bf7d5c97c789f2ab1e29d674a9c53cf5e6 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/lab07-dfs.iml" filepath="$PROJECT_DIR$/lab07-dfs.iml" />
+ <module fileurl="file://$PROJECT_DIR$/lab05-dfs.iml" filepath="$PROJECT_DIR$/lab05-dfs.iml" />
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/A_Tests.xml b/.idea/runConfigurations/A_Tests.xml
index 3c55ef0032aadb5e650eb1f1e82ca43662ab566d..e22d34aeec2ab1ee1e160556ad26d9b5e23cc58d 100644
--- a/.idea/runConfigurations/A_Tests.xml
+++ b/.idea/runConfigurations/A_Tests.xml
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="A Tests" type="JUnit" factoryName="JUnit">
- <module name="lab07-dfs" />
+ <module name="lab05-dfs" />
<option name="MAIN_CLASS_NAME" value="A" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="tags" />
diff --git a/.idea/runConfigurations/B_Tests.xml b/.idea/runConfigurations/B_Tests.xml
index 95f057c80b88cd1b9c7fb5724d138708db69c5bf..84b14b4e0831c15eeb60ae73d5e1b8f41c840a53 100644
--- a/.idea/runConfigurations/B_Tests.xml
+++ b/.idea/runConfigurations/B_Tests.xml
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="B Tests" type="JUnit" factoryName="JUnit">
- <module name="lab07-dfs" />
+ <module name="lab05-dfs" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="tags" />
diff --git a/.idea/runConfigurations/C_Tests.xml b/.idea/runConfigurations/C_Tests.xml
index ff975d290be938698887546e74156e806424e3e3..bd911ebebf13ff0e4c4104b01393527421d58adf 100644
--- a/.idea/runConfigurations/C_Tests.xml
+++ b/.idea/runConfigurations/C_Tests.xml
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="C Tests" type="JUnit" factoryName="JUnit">
- <module name="lab07-dfs" />
+ <module name="lab05-dfs" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="tags" />
diff --git a/lab07-dfs.iml b/lab05-dfs.iml
similarity index 100%
rename from lab07-dfs.iml
rename to lab05-dfs.iml
diff --git a/src/edu/caltech/cs2/lab07/Maze.java b/src/edu/caltech/cs2/lab05/Maze.java
similarity index 99%
rename from src/edu/caltech/cs2/lab07/Maze.java
rename to src/edu/caltech/cs2/lab05/Maze.java
index 06ed5e0228d59b14e9a5088994b1b3b300941d8c..343e6241f52ce8f04c6e2e0732388721910dbf02 100644
--- a/src/edu/caltech/cs2/lab07/Maze.java
+++ b/src/edu/caltech/cs2/lab05/Maze.java
@@ -1,4 +1,4 @@
-package edu.caltech.cs2.lab07;
+package edu.caltech.cs2.lab05;
import edu.caltech.cs2.libraries.StdDraw;
diff --git a/src/edu/caltech/cs2/lab07/Point.java b/src/edu/caltech/cs2/lab05/Point.java
similarity index 95%
rename from src/edu/caltech/cs2/lab07/Point.java
rename to src/edu/caltech/cs2/lab05/Point.java
index 7efaa714067a0d6145e5011c252fbe8f361cfefe..30752d6ee00d16868adae0c3ff77fcf581789caf 100644
--- a/src/edu/caltech/cs2/lab07/Point.java
+++ b/src/edu/caltech/cs2/lab05/Point.java
@@ -1,4 +1,4 @@
-package edu.caltech.cs2.lab07;
+package edu.caltech.cs2.lab05;
public class Point {
public int x; // x coordinate of point
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out1.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out1.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out1.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out1.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out10.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out10.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out10.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out10.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out11.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out11.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out11.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out11.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out12.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out12.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out12.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out12.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out13.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out13.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out13.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out13.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out14.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out14.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out14.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out14.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out15.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out15.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out15.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out15.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out16.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out16.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out16.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out16.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out17.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out17.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out17.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out17.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out18.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out18.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out18.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out18.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out19.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out19.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out19.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out19.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out2.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out2.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out2.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out2.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out20.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out20.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out20.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out20.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out21.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out21.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out21.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out21.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out22.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out22.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out22.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out22.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out23.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out23.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out23.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out23.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out24.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out24.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out24.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out24.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out3.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out3.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out3.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out3.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out4.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out4.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out4.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out4.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out5.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out5.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out5.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out5.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out6.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out6.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out6.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out6.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out7.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out7.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out7.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out7.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out8.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out8.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out8.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out8.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out9.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out9.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut1/out9.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut1/out9.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out1.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out1.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out1.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out1.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out10.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out10.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out10.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out10.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out11.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out11.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out11.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out11.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out12.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out12.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out12.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out12.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out13.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out13.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out13.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out13.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out14.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out14.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out14.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out14.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out15.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out15.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out15.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out15.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out16.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out16.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out16.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out16.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out17.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out17.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out17.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out17.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out18.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out18.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out18.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out18.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out19.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out19.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out19.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out19.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out2.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out2.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out2.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out2.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out20.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out20.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out20.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out20.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out21.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out21.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out21.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out21.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out22.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out22.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out22.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out22.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out23.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out23.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out23.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out23.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out24.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out24.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out24.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out24.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out3.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out3.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out3.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out3.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out4.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out4.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out4.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out4.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out5.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out5.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out5.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out5.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out6.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out6.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out6.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out6.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out7.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out7.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out7.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out7.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out8.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out8.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out8.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out8.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out9.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out9.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut2/out9.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut2/out9.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out1.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out1.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out1.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out1.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out10.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out10.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out10.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out10.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out11.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out11.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out11.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out11.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out12.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out12.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out12.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out12.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out13.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out13.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out13.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out13.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out14.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out14.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out14.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out14.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out15.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out15.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out15.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out15.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out16.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out16.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out16.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out16.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out17.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out17.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out17.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out17.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out18.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out18.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out18.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out18.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out19.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out19.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out19.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out19.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out2.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out2.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out2.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out2.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out20.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out20.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out20.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out20.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out21.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out21.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out21.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out21.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out22.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out22.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out22.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out22.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out23.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out23.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out23.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out23.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out24.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out24.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out24.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out24.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out3.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out3.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out3.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out3.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out4.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out4.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out4.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out4.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out5.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out5.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out5.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out5.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out6.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out6.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out6.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out6.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out7.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out7.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out7.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out7.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out8.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out8.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out8.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out8.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out9.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out9.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut3/out9.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut3/out9.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out1.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out1.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out1.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out1.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out10.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out10.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out10.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out10.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out11.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out11.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out11.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out11.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out12.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out12.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out12.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out12.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out13.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out13.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out13.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out13.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out14.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out14.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out14.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out14.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out15.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out15.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out15.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out15.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out16.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out16.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out16.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out16.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out17.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out17.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out17.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out17.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out18.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out18.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out18.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out18.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out19.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out19.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out19.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out19.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out2.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out2.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out2.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out2.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out20.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out20.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out20.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out20.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out21.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out21.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out21.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out21.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out22.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out22.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out22.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out22.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out23.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out23.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out23.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out23.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out24.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out24.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out24.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out24.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out3.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out3.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out3.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out3.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out4.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out4.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out4.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out4.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out5.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out5.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out5.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out5.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out6.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out6.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out6.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out6.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out7.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out7.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out7.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out7.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out8.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out8.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out8.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out8.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out9.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out9.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut4/out9.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut4/out9.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out1.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out1.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out1.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out1.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out10.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out10.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out10.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out10.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out11.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out11.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out11.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out11.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out12.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out12.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out12.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out12.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out13.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out13.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out13.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out13.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out14.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out14.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out14.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out14.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out15.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out15.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out15.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out15.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out16.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out16.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out16.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out16.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out17.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out17.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out17.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out17.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out18.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out18.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out18.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out18.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out19.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out19.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out19.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out19.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out2.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out2.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out2.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out2.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out20.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out20.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out20.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out20.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out21.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out21.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out21.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out21.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out22.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out22.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out22.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out22.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out23.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out23.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out23.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out23.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out24.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out24.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out24.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out24.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out3.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out3.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out3.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out3.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out4.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out4.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out4.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out4.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out5.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out5.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out5.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out5.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out6.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out6.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out6.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out6.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out7.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out7.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out7.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out7.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out8.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out8.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out8.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out8.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out9.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out9.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut5/out9.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut5/out9.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out1.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out1.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out1.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out1.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out10.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out10.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out10.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out10.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out11.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out11.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out11.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out11.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out12.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out12.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out12.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out12.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out13.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out13.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out13.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out13.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out14.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out14.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out14.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out14.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out15.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out15.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out15.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out15.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out16.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out16.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out16.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out16.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out17.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out17.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out17.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out17.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out18.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out18.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out18.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out18.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out19.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out19.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out19.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out19.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out2.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out2.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out2.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out2.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out20.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out20.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out20.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out20.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out21.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out21.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out21.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out21.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out22.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out22.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out22.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out22.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out23.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out23.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out23.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out23.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out24.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out24.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out24.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out24.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out3.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out3.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out3.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out3.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out4.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out4.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out4.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out4.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out5.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out5.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out5.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out5.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out6.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out6.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out6.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out6.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out7.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out7.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out7.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out7.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out8.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out8.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out8.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out8.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out9.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out9.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut6/out9.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut6/out9.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out1.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out1.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out1.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out1.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out10.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out10.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out10.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out10.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out11.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out11.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out11.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out11.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out12.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out12.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out12.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out12.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out13.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out13.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out13.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out13.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out14.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out14.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out14.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out14.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out15.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out15.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out15.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out15.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out16.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out16.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out16.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out16.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out17.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out17.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out17.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out17.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out18.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out18.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out18.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out18.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out19.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out19.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out19.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out19.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out2.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out2.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out2.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out2.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out20.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out20.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out20.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out20.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out21.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out21.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out21.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out21.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out22.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out22.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out22.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out22.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out23.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out23.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out23.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out23.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out24.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out24.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out24.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out24.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out3.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out3.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out3.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out3.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out4.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out4.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out4.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out4.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out5.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out5.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out5.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out5.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out6.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out6.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out6.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out6.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out7.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out7.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out7.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out7.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out8.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out8.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out8.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out8.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out9.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out9.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut7/out9.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut7/out9.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out1.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out1.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out1.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out1.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out10.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out10.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out10.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out10.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out11.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out11.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out11.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out11.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out12.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out12.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out12.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out12.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out13.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out13.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out13.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out13.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out14.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out14.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out14.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out14.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out15.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out15.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out15.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out15.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out16.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out16.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out16.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out16.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out17.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out17.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out17.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out17.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out18.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out18.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out18.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out18.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out19.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out19.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out19.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out19.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out2.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out2.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out2.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out2.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out20.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out20.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out20.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out20.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out21.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out21.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out21.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out21.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out22.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out22.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out22.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out22.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out23.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out23.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out23.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out23.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out24.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out24.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out24.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out24.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out3.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out3.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out3.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out3.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out4.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out4.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out4.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out4.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out5.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out5.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out5.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out5.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out6.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out6.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out6.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out6.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out7.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out7.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out7.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out7.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out8.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out8.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out8.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out8.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out9.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out9.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut8/out9.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut8/out9.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out1.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out1.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out1.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out1.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out10.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out10.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out10.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out10.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out11.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out11.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out11.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out11.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out12.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out12.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out12.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out12.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out13.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out13.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out13.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out13.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out14.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out14.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out14.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out14.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out15.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out15.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out15.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out15.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out16.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out16.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out16.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out16.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out17.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out17.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out17.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out17.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out18.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out18.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out18.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out18.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out19.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out19.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out19.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out19.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out2.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out2.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out2.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out2.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out20.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out20.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out20.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out20.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out21.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out21.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out21.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out21.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out22.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out22.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out22.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out22.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out23.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out23.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out23.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out23.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out24.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out24.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out24.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out24.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out3.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out3.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out3.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out3.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out4.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out4.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out4.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out4.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out5.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out5.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out5.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out5.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out6.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out6.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out6.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out6.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out7.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out7.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out7.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out7.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out8.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out8.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out8.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out8.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out9.txt b/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out9.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/AcceptableOut9/out9.txt
rename to tests/edu/caltech/cs2/lab05/Data/AcceptableOut9/out9.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze1.txt b/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze1.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/Mazes/Maze1.txt
rename to tests/edu/caltech/cs2/lab05/Data/Mazes/Maze1.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze2.txt b/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze2.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/Mazes/Maze2.txt
rename to tests/edu/caltech/cs2/lab05/Data/Mazes/Maze2.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze3.txt b/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze3.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/Mazes/Maze3.txt
rename to tests/edu/caltech/cs2/lab05/Data/Mazes/Maze3.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze4.txt b/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze4.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/Mazes/Maze4.txt
rename to tests/edu/caltech/cs2/lab05/Data/Mazes/Maze4.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze5.txt b/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze5.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/Mazes/Maze5.txt
rename to tests/edu/caltech/cs2/lab05/Data/Mazes/Maze5.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze6.txt b/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze6.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/Mazes/Maze6.txt
rename to tests/edu/caltech/cs2/lab05/Data/Mazes/Maze6.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze7.txt b/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze7.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/Mazes/Maze7.txt
rename to tests/edu/caltech/cs2/lab05/Data/Mazes/Maze7.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze8.txt b/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze8.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/Mazes/Maze8.txt
rename to tests/edu/caltech/cs2/lab05/Data/Mazes/Maze8.txt
diff --git a/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze9.txt b/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze9.txt
similarity index 100%
rename from tests/edu/caltech/cs2/lab07/Data/Mazes/Maze9.txt
rename to tests/edu/caltech/cs2/lab05/Data/Mazes/Maze9.txt
diff --git a/tests/edu/caltech/cs2/lab05/Data/TestOut.txt b/tests/edu/caltech/cs2/lab05/Data/TestOut.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/edu/caltech/cs2/lab07/DfsTest.java b/tests/edu/caltech/cs2/lab05/DfsTest.java
similarity index 95%
rename from tests/edu/caltech/cs2/lab07/DfsTest.java
rename to tests/edu/caltech/cs2/lab05/DfsTest.java
index a0eb6deca9d3536496518aff7f0504c8c77b9da6..6bd5534bba402db5579ccebeeba50f7df5fe1571 100644
--- a/tests/edu/caltech/cs2/lab07/DfsTest.java
+++ b/tests/edu/caltech/cs2/lab05/DfsTest.java
@@ -1,4 +1,4 @@
-package edu.caltech.cs2.lab07;
+package edu.caltech.cs2.lab05;
import edu.caltech.cs2.helpers.Inspection;
import edu.caltech.cs2.libraries.StdDraw;
@@ -23,7 +23,7 @@ public class DfsTest {
int x = ThreadLocalRandom.current().nextInt(3, 28);
int y = ThreadLocalRandom.current().nextInt(3, 28);
String localDir = System.getProperty("user.dir");
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze1.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze1.txt";
Maze testMaze = new Maze(30, mazePath);
Point[] children;
Point test1 = new Point(x, y);
@@ -61,7 +61,7 @@ public class DfsTest {
int x = ThreadLocalRandom.current().nextInt(3, 28);
int y = ThreadLocalRandom.current().nextInt(3, 28);
String localDir = System.getProperty("user.dir");
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze1.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze1.txt";
Maze testMaze = new Maze(30, mazePath);
Point[] children;
Point test1 = new Point(x, y);
@@ -95,7 +95,7 @@ public class DfsTest {
int x = ThreadLocalRandom.current().nextInt(3, 28);
int y = ThreadLocalRandom.current().nextInt(3, 28);
String localDir = System.getProperty("user.dir");
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze1.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze1.txt";
Maze testMaze = new Maze(30, mazePath);
Point[] children;
Point test1 = new Point(x, y);
@@ -131,7 +131,7 @@ public class DfsTest {
int x = ThreadLocalRandom.current().nextInt(3, 28);
int y = ThreadLocalRandom.current().nextInt(3, 28);
String localDir = System.getProperty("user.dir");
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze1.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze1.txt";
Maze testMaze = new Maze(30, mazePath);
Point[] children;
Point test1 = new Point(x, y);
@@ -165,7 +165,7 @@ public class DfsTest {
int x = ThreadLocalRandom.current().nextInt(3, 28);
int y = ThreadLocalRandom.current().nextInt(3, 28);
String localDir = System.getProperty("user.dir");
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze1.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze1.txt";
Maze testMaze = new Maze(30, mazePath);
Point[] children;
Point test1 = new Point(x, y);
@@ -197,7 +197,7 @@ public class DfsTest {
@DisplayName("DFS Recursive Check")
public void RDfsCheck() {
String localDir = System.getProperty("user.dir");
- String srcPath = localDir + "/src/edu/caltech/cs2/lab07/Maze.java";
+ String srcPath = localDir + "/src/edu/caltech/cs2/lab05/Maze.java";
Method solveMethod = Reflection.getMethod(Maze.class, "solveDFSRecursive", Point.class);
Inspection.assertRecursive(srcPath, solveMethod);
}
@@ -207,9 +207,9 @@ public class DfsTest {
@DisplayName("DFS Recursive Solver Correctness Test 1")
public void RDfsCorrectnessTest1 () throws IOException {
String localDir = System.getProperty("user.dir");
- String outPath = localDir + "/tests/edu/caltech/cs2/lab07/Data/TestOut.txt";
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze1.txt";
- String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/AcceptableOut1";
+ String outPath = localDir + "/tests/edu/caltech/cs2/lab05/Data/TestOut.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze1.txt";
+ String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/AcceptableOut1";
System.setOut(new PrintStream(new File(outPath)));
Maze maze = new Maze(30, mazePath);
StdDraw.enableDoubleBuffering();
@@ -241,9 +241,9 @@ public class DfsTest {
@DisplayName("DFS Recursive Solver Correctness Test 2")
public void RDfsCorrectnessTest2 () throws IOException {
String localDir = System.getProperty("user.dir");
- String outPath = localDir + "/tests/edu/caltech/cs2/lab07/Data/TestOut.txt";
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze2.txt";
- String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/AcceptableOut2";
+ String outPath = localDir + "/tests/edu/caltech/cs2/lab05/Data/TestOut.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze2.txt";
+ String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/AcceptableOut2";
System.setOut(new PrintStream(new File(outPath)));
Maze maze = new Maze(30, mazePath);
StdDraw.enableDoubleBuffering();
@@ -276,9 +276,9 @@ public class DfsTest {
@DisplayName("DFS Recursive Solver Correctness Test 3")
public void RDfsCorrectnessTest3 () throws IOException {
String localDir = System.getProperty("user.dir");
- String outPath = localDir + "/tests/edu/caltech/cs2/lab07/Data/TestOut.txt";
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze3.txt";
- String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/AcceptableOut3";
+ String outPath = localDir + "/tests/edu/caltech/cs2/lab05/Data/TestOut.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze3.txt";
+ String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/AcceptableOut3";
System.setOut(new PrintStream(new File(outPath)));
Maze maze = new Maze(30, mazePath);
StdDraw.enableDoubleBuffering();
@@ -311,9 +311,9 @@ public class DfsTest {
@DisplayName("DFS Recursive Solver Correctness Test 4")
public void RDfsCorrectnessTest4 () throws IOException {
String localDir = System.getProperty("user.dir");
- String outPath = localDir + "/tests/edu/caltech/cs2/lab07/Data/TestOut.txt";
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze4.txt";
- String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/AcceptableOut4";
+ String outPath = localDir + "/tests/edu/caltech/cs2/lab05/Data/TestOut.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze4.txt";
+ String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/AcceptableOut4";
System.setOut(new PrintStream(new File(outPath)));
Maze maze = new Maze(30, mazePath);
StdDraw.enableDoubleBuffering();
@@ -346,9 +346,9 @@ public class DfsTest {
@DisplayName("DFS Recursive Solver Correctness Test 5")
public void RDfsCorrectnessTest5 () throws IOException {
String localDir = System.getProperty("user.dir");
- String outPath = localDir + "/tests/edu/caltech/cs2/lab07/Data/TestOut.txt";
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze5.txt";
- String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5";
+ String outPath = localDir + "/tests/edu/caltech/cs2/lab05/Data/TestOut.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze5.txt";
+ String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5";
System.setOut(new PrintStream(new File(outPath)));
Maze maze = new Maze(30, mazePath);
StdDraw.enableDoubleBuffering();
@@ -381,7 +381,7 @@ public class DfsTest {
@DisplayName("DFS Iterative Check")
public void IDfsCheck() {
String localDir = System.getProperty("user.dir");
- String srcPath = localDir + "/src/edu/caltech/cs2/lab07/Maze.java";
+ String srcPath = localDir + "/src/edu/caltech/cs2/lab05/Maze.java";
Method solveMethod = Reflection.getMethod(Maze.class, "solveDFSIterative");
Inspection.assertIterative(srcPath, solveMethod);
}
@@ -391,9 +391,9 @@ public class DfsTest {
@DisplayName("DFS Iterative Solver Correctness Test 1")
public void IDfsCorrectnessTest1 () throws IOException {
String localDir = System.getProperty("user.dir");
- String outPath = localDir + "/tests/edu/caltech/cs2/lab07/Data/TestOut.txt";
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze5.txt";
- String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/AcceptableOut5";
+ String outPath = localDir + "/tests/edu/caltech/cs2/lab05/Data/TestOut.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze5.txt";
+ String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/AcceptableOut5";
System.setOut(new PrintStream(new File(outPath)));
Maze maze = new Maze(30, mazePath);
StdDraw.enableDoubleBuffering();
@@ -425,9 +425,9 @@ public class DfsTest {
@DisplayName("DFS Iterative Solver Correctness Test 2")
public void IDfsCorrectnessTest2 () throws IOException {
String localDir = System.getProperty("user.dir");
- String outPath = localDir + "/tests/edu/caltech/cs2/lab07/Data/TestOut.txt";
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze6.txt";
- String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/AcceptableOut6";
+ String outPath = localDir + "/tests/edu/caltech/cs2/lab05/Data/TestOut.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze6.txt";
+ String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/AcceptableOut6";
System.setOut(new PrintStream(new File(outPath)));
Maze maze = new Maze(30, mazePath);
StdDraw.enableDoubleBuffering();
@@ -459,9 +459,9 @@ public class DfsTest {
@DisplayName("DFS Iterative Solver Correctness Test 3")
public void IDfsCorrectnessTest3 () throws IOException {
String localDir = System.getProperty("user.dir");
- String outPath = localDir + "/tests/edu/caltech/cs2/lab07/Data/TestOut.txt";
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze7.txt";
- String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/AcceptableOut7";
+ String outPath = localDir + "/tests/edu/caltech/cs2/lab05/Data/TestOut.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze7.txt";
+ String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/AcceptableOut7";
System.setOut(new PrintStream(new File(outPath)));
Maze maze = new Maze(30, mazePath);
StdDraw.enableDoubleBuffering();
@@ -493,9 +493,9 @@ public class DfsTest {
@DisplayName("DFS Iterative Solver Correctness Test 4")
public void IDfsCorrectnessTest4 () throws IOException {
String localDir = System.getProperty("user.dir");
- String outPath = localDir + "/tests/edu/caltech/cs2/lab07/Data/TestOut.txt";
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze8.txt";
- String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/AcceptableOut8";
+ String outPath = localDir + "/tests/edu/caltech/cs2/lab05/Data/TestOut.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze8.txt";
+ String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/AcceptableOut8";
System.setOut(new PrintStream(new File(outPath)));
Maze maze = new Maze(30, mazePath);
StdDraw.enableDoubleBuffering();
@@ -527,9 +527,9 @@ public class DfsTest {
@DisplayName("DFS Iterative Solver Correctness Test 5")
public void IDfsCorrectnessTest5 () throws IOException {
String localDir = System.getProperty("user.dir");
- String outPath = localDir + "/tests/edu/caltech/cs2/lab07/Data/TestOut.txt";
- String mazePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/Mazes/Maze9.txt";
- String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab07/Data/AcceptableOut9";
+ String outPath = localDir + "/tests/edu/caltech/cs2/lab05/Data/TestOut.txt";
+ String mazePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/Mazes/Maze9.txt";
+ String acceptablePath = localDir + "/tests/edu/caltech/cs2/lab05/Data/AcceptableOut9";
System.setOut(new PrintStream(new File(outPath)));
Maze maze = new Maze(30, mazePath);
StdDraw.enableDoubleBuffering();
diff --git a/tests/edu/caltech/cs2/lab07/Data/TestOut.txt b/tests/edu/caltech/cs2/lab07/Data/TestOut.txt
deleted file mode 100644
index 3c2da726950b41d21e2b6019a4921a81f56b8e7d..0000000000000000000000000000000000000000
--- a/tests/edu/caltech/cs2/lab07/Data/TestOut.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-Selected point: (1, 1)
-Selected point: (1, 2)
-Selected point: (2, 2)
-Selected point: (3, 2)
-Selected point: (4, 2)
-Selected point: (5, 2)
-Selected point: (5, 3)
-Selected point: (5, 4)
-Selected point: (5, 5)
-Selected point: (4, 5)
-Selected point: (3, 5)
-Selected point: (3, 4)
-Selected point: (3, 3)
-Selected point: (2, 3)
-Selected point: (2, 4)
-Selected point: (1, 4)
-Selected point: (1, 3)
-Selected point: (1, 5)
-Selected point: (2, 5)
-Selected point: (2, 6)
-Selected point: (3, 6)
-Selected point: (4, 6)
-Selected point: (4, 7)
-Selected point: (4, 8)
-Selected point: (3, 8)
-Selected point: (3, 9)
-Selected point: (3, 10)
-Selected point: (3, 11)
-Selected point: (4, 11)
-Selected point: (4, 10)
-Selected point: (4, 9)
-Selected point: (5, 9)
-Selected point: (5, 10)
-Selected point: (5, 11)
-Selected point: (6, 11)
-Selected point: (7, 11)
-Selected point: (8, 11)
-Selected point: (8, 12)
-Selected point: (8, 13)
-Selected point: (7, 13)
-Selected point: (6, 13)
-Selected point: (6, 12)
-Selected point: (5, 12)
-Selected point: (4, 12)
-Selected point: (3, 12)
-Selected point: (2, 12)
-Selected point: (2, 11)
-Selected point: (2, 10)
-Selected point: (1, 10)
-Selected point: (1, 9)
-Selected point: (2, 9)
-Selected point: (2, 8)
-Selected point: (2, 7)
-Selected point: (1, 7)
-Selected point: (1, 6)
-Selected point: (1, 8)
-Selected point: (3, 7)
-Selected point: (1, 11)
-Selected point: (1, 12)
-Selected point: (1, 13)
-Selected point: (2, 13)
-Selected point: (2, 14)
-Selected point: (1, 14)
-Selected point: (1, 15)
-Selected point: (2, 15)
-Selected point: (2, 16)
-Selected point: (3, 16)
-Selected point: (3, 15)
-Selected point: (4, 15)
-Selected point: (4, 14)
-Selected point: (5, 14)
-Selected point: (5, 13)
-Selected point: (4, 13)
-Selected point: (3, 13)
-Selected point: (3, 14)
-Selected point: (6, 14)
-Selected point: (7, 14)
-Selected point: (8, 14)
-Selected point: (8, 15)
-Selected point: (9, 15)
-Selected point: (9, 14)
-Selected point: (9, 13)
-Selected point: (9, 12)
-Selected point: (9, 11)
-Selected point: (10, 11)
-Selected point: (10, 12)
-Selected point: (10, 13)
-Selected point: (10, 14)
-Selected point: (10, 15)
-Selected point: (11, 15)
-Selected point: (12, 15)
-Selected point: (12, 14)
-Selected point: (13, 14)
-Selected point: (14, 14)
-Selected point: (15, 14)
-Selected point: (15, 15)