Merge branch 'master' of ssh://bitbucket.org/czan/honours

Conflicts:
	tex/thesis/contribution/contribution.tex

8 files changed, 21 insertions, 13 deletions

diff --git a/impl/test/1.eqns b/impl/test/1.eqns
index 0cdfd24..34c51de 100644
--- a/impl/test/1.eqns
+++ b/impl/test/1.eqns
@@ -1,3 +1,3 @@
-x = max(0, min(-1 + x, y))
 y = max(0, 5 + x, x)
 z = max(0, 1 + z, 0 + x)
+x = max(0, min(-1 + x, y))
diff --git a/impl/test/10.soln b/impl/test/10.soln
index 20a47ca..238b7d5 100644
--- a/impl/test/10.soln
+++ b/impl/test/10.soln
@@ -1,9 +1,9 @@
-x = 0
-w = 0
-y = 0
-z = 0
-u = 0
 a = 0
 b = 0
 c = 0
 d = 0
+u = 0
+w = 0
+x = 0
+y = 0
+z = 0
diff --git a/impl/test/14.eqns b/impl/test/14.eqns
new file mode 100644
index 0000000..6c28481
--- /dev/null
+++ b/impl/test/14.eqns
@@ -0,0 +1,3 @@
+x = 0
+y = max(x, z)
+z = y + 1
diff --git a/impl/test/14.soln b/impl/test/14.soln
new file mode 100644
index 0000000..c0301bb
--- /dev/null
+++ b/impl/test/14.soln
@@ -0,0 +1,3 @@
+x = 0
+y = inf
+z = inf
diff --git a/impl/test/7.soln b/impl/test/7.soln
index 0d85468..2c9b183 100644
--- a/impl/test/7.soln
+++ b/impl/test/7.soln
@@ -1,8 +1,8 @@
-x = 0
-y = 0
 a = 0
 b = 0
 c = 0
 d = 0
 e = 0
 f = 0
+x = 0
+y = 0
diff --git a/impl/test/8.soln b/impl/test/8.soln
index 1945057..73d26df 100644
--- a/impl/test/8.soln
+++ b/impl/test/8.soln
@@ -1,4 +1,4 @@
-x = 0
 w = 0
+x = 0
 y = 0
 z = 0
diff --git a/impl/test/9.soln b/impl/test/9.soln
index 616c5e5..7116cf4 100644
--- a/impl/test/9.soln
+++ b/impl/test/9.soln
@@ -1,5 +1,5 @@
-x = 0
+u = 0
 w = 0
+x = 0
 y = 0
 z = 0
-u = 0
diff --git a/impl/test/run b/impl/test/run
index 169edda..d15fb68 100644
--- a/impl/test/run
+++ b/impl/test/run
@@ -7,15 +7,17 @@ FAILED=0
 echo "Testing binary: $1 in directory $DIR"
 while [ -f "$DIR/$NUM.eqns" ]
 do
+  cat "$DIR/$NUM.soln" | sort > "/tmp/$NUM.soln.tmp"
+  mv "/tmp/$NUM.soln.tmp" "$DIR/$NUM.soln" 2> /dev/null
   OUTPUT=$(timeout 5s $1 "$DIR/$NUM.eqns" 2> /dev/null)
   if [ $? -eq 124 ]; then
     OUTPUT="did not terminate"
   fi
-  DIFF=$(echo "$OUTPUT" | diff - "$DIR/$NUM.soln")
+  DIFF=$(echo "$OUTPUT" | sort | diff - "$DIR/$NUM.soln")
   if [ ! -z "$DIFF" ]; then
     echo "=================="
     echo "Test #$NUM failed:"
-    echo "$OUTPUT" | sdiff - "$DIR/$NUM.soln"
+    echo "$OUTPUT" | sort | sdiff - "$DIR/$NUM.soln"
     echo
     FAILED=$(($FAILED + 1))
   fi