Fully removed recursion, updated graphs, implemented depth test

jah12014 · Mar 6, 2018 · 0db4ee8 · 0db4ee8
1 parent 3d4bc06
commit 0db4ee8
Show file tree

Hide file tree

Showing 13 changed files with 3,300 additions and 3,164 deletions.
diff --git a/...entalMinimization/results/compare_BFS.png → ...tion/results/Improvements/compare_BFS.png b/...entalMinimization/results/compare_BFS.png → ...tion/results/Improvements/compare_BFS.png
diff --git a/IncrementalMinimization/results/budget_graph.png b/IncrementalMinimization/results/budget_graph.png
diff --git a/IncrementalMinimization/results/budget_test.txt b/IncrementalMinimization/results/budget_test.txt
diff --git a/IncrementalMinimization/results/compare_graph_1.png b/IncrementalMinimization/results/compare_graph_1.png
diff --git a/IncrementalMinimization/results/compare_graph_2.png b/IncrementalMinimization/results/compare_graph_2.png
diff --git a/IncrementalMinimization/results/compare_test.txt b/IncrementalMinimization/results/compare_test.txt
diff --git a/IncrementalMinimization/results/heatmap.png b/IncrementalMinimization/results/heatmap.png
diff --git a/IncrementalMinimization/results/record_test.txt b/IncrementalMinimization/results/record_test.txt
diff --git a/IncrementalMinimization/results/second_record_test.txt b/IncrementalMinimization/results/second_record_test.txt
diff --git a/IncrementalMinimization/scripts/record_graph.py b/IncrementalMinimization/scripts/record_graph.py
@@ -29,10 +29,11 @@ def toNum(s):
 for row in fStrings[1:]:
     if row:
         row = row.split(",")
-        print(row)
         states = toNum(row[0])
-        for percent in row[1:-1]:
-            z.append(toNum(percent))
+	maxTime = toNum(row[-2])
+        for time in row[1:-1]:
+            percent = toNum(time)/maxTime*100
+            z.append(percent)
             y.append(states)
 
 
@@ -41,9 +42,7 @@ def toNum(s):
 X,Y = numpy.meshgrid(x,y)
 z = abs(numpy.array(z))
 Z = z.reshape(len(y),len(x))
-print(y)
-print(x)
-print(Z.min())
+print(Z)
 pyplot.pcolormesh(X,Y,Z)
 bar = pyplot.colorbar()
 bar.set_label("Percentage of Time Passed")

diff --git a/IncrementalMinimization/src/DebugException.java b/IncrementalMinimization/src/DebugException.java
@@ -0,0 +1,21 @@
+
+class DebugException extends Exception
+{
+	private final Integer maxDepth;
+
+	public DebugException (String message, Integer maxDepth)
+	{
+		super(message);
+		this.maxDepth = maxDepth;
+	}
+
+	public DebugException (String message)
+	{
+		this(message, null);
+	}
+
+	public int getDepth()
+	{
+		return maxDepth;
+	}
+}