--- a/testing3/knight_test.sh	Thu Oct 31 09:49:33 2019 +0000
+++ b/testing3/knight_test.sh	Thu Oct 31 10:44:10 2019 +0000
@@ -7,7 +7,13 @@
 
 echo -e "Below is the feedback for your submission of CW 8" >> $out
 echo -e "" >> $out
-
+echo -e "!! Important: !!" >> $out
+echo -e "Because of limitations with our testing infrastructure, we can only" >> $out
+echo -e "let code run for 10 seconds and then have to kill it. This might" >> $out
+echo -e "mean your code is correct, but still marked as Fail. Remember" >> $out
+echo -e "you can test your code on your own machine and benchmark it" >> $out
+echo -e "against the reference implementation." >> $out
+echo -e "" >> $out
 
 # compilation tests
 
@@ -26,7 +32,7 @@
 }
 
 function scala_assert_quick {
-  (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -i "$1" -- "$2"  2> /dev/null 1> /dev/null)
+  (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -i "$1" -- "$2" 2> /dev/null 1> /dev/null)
 }
 
 # purity test
@@ -134,7 +140,7 @@
 
 if [ $tsts1 -eq 0 ]
 then
-  echo -e "Takes 10 seconds or less to execute: " >> $out
+  echo -e "For testing needs to take 10 seconds or less to execute: " >> $out
   echo -e " Let f = (x:(Int, Int)) => if (x._1 > 3) Some(List(x)) else None " >> $out
   echo -e "   first(List((1,0),(2,0),(3,0),(4,0)), f) == Some(List((4,0)))" >> $out
   echo -e "   first(List((1,0),(2,0),(3,0)), f) == None" >> $out
@@ -152,7 +158,7 @@
 
 if [ $tsts1 -eq 0 ]
 then
-  echo -e "Takes 10 seconds or less to execute: " >> $out
+  echo -e "For testing needs to take 10 seconds or less to execute: " >> $out
   echo -e " is first_tour(6, List((0, 0))) ok? " >> $out
   echo -e " is first_tour(4, List((0, 0))) == None " >> $out
 
@@ -164,3 +170,139 @@
   fi
 fi
 
+
+echo -e "" >> $out
+echo -e "" >> $out
+
+
+# knights2: purity test
+#
+echo -e "knight2.scala does not contain vars, returns, Arrays, ListBuffers etc?" >> $out
+
+if (scala_vars knight2.scala)
+then
+  echo -e "  --> Fail (make triple-sure your program conforms to the required format)" >> $out    
+  tsts0=$(( 0 ))
+else
+  echo -e "  --> success" >> $out
+  tsts0=$(( 0 )) 
+fi
+
+
+# compilation test
+if  [ $tsts0 -eq 0 ]
+then    
+  echo -e "knight2.scala runs?" >> $out
+
+  if (scala_compile knight2.scala)
+  then
+    echo -e "  --> success" >> $out
+    tsts1=$(( 0 ))
+  else
+    echo -e "  --> SCALA DID NOT RUN KNIGHT2.SCALA\n" >> $out  
+    tsts1=$(( 1 )) 
+  fi
+else
+  tsts1=$(( 1 ))     
+fi
+
+
+# ordered move test
+
+if [ $tsts1 -eq 0 ]
+then
+  echo -e "For testing needs to take 10 seconds or less to execute: " >> $out  
+  echo -e " ordered_moves(8, List((3,4), (3,2)), (1,3)) == List((0,1), (0,5), (2,1), (2,5))" >> $out
+  echo -e " ordered_moves(8, List((4,0)), (0,0)) == List((2,1), (1,2))" >> $out
+  echo -e " ordered_moves(8, List((0,4)), (0,0)) == List((1,2), (2,1))" >> $out
+  
+  if (scala_assert_quick "knight2.scala" "knight_test6.scala")
+  then
+      echo -e "  --> success" >> $out
+  else
+      echo -e "  --> \n ONE TEST FAILED\n" >> $out  
+  fi
+fi
+
+
+# first-closed-tour test
+
+if [ $tsts1 -eq 0 ]
+then
+  echo -e "For testing needs to take 10 seconds or less to execute: " >> $out  
+  echo -e " first_closed_tour_heuristic(6, List((3,3))) found and correct?" >> $out
+  
+  if (scala_assert_quick "knight2.scala" "knight_test7.scala")
+  then
+      echo -e "  --> success" >> $out
+  else
+      echo -e "  --> \n ONE TEST FAILED\n" >> $out  
+  fi
+fi
+
+
+
+if [ $tsts1 -eq 0 ]
+then
+  echo -e "For testing needs to take 10 seconds or less to execute: " >> $out   
+  echo -e " first_tour_heuristic(8, List((0,0))) found and correct?" >> $out
+  echo -e " first_tour_heuristic(30, List((0,0))) found and correct?" >> $out
+  
+  if (scala_assert_quick "knight2.scala" "knight_test8.scala")
+  then
+      echo -e "  --> success" >> $out
+  else
+      echo -e "  --> \n ONE TEST FAILED\n" >> $out 
+  fi
+fi
+
+
+echo -e "" >> $out
+echo -e "" >> $out
+
+# knights3: purity test
+#
+echo -e "knight3.scala does not contain vars, returns, Arrays, ListBuffers etc?" >> $out
+
+
+if (scala_vars knight3.scala)
+then
+  echo "  --> Fail (make triple-sure your program conforms to the required format)xsxs" >> $out
+  tsts0=$(( 0 ))
+else
+  echo "  --> success" >> $out
+  tsts0=$(( 0 )) 
+fi
+
+
+# compilation test
+if  [ $tsts0 -eq 0 ]
+then    
+  echo "knight3.scala runs?" >> $out
+
+  if (scala_compile knight3.scala)
+  then
+    echo "  --> success" >> $out
+    tsts1=$(( 0 ))
+  else
+    echo -e "  --> SCALA DID NOT RUN KNIGHT3.SCALA\n" >> $out  
+    tsts1=$(( 1 )) 
+  fi
+else
+  tsts1=$(( 1 ))     
+fi
+
+
+if [ $tsts1 -eq 0 ]
+then
+  echo -e "For testing needs to take 10 seconds or less to execute: " >> $out  
+  echo -e " tour_on_mega_board(70, List((0,0))) found and correct?" >> $out
+  
+  if (scala_assert_quick "knight3.scala" "knight_test9.scala")
+  then
+      echo -e "  --> success" >> $out
+  else
+      echo -e "  --> \n ONE TEST FAILED\n" >> $out 
+  fi
+fi
+