--- a/testing3/knight2_test.sh	Sat Dec 15 13:46:54 2018 +0000
+++ b/testing3/knight2_test.sh	Sat Dec 15 23:58:12 2018 +0000
@@ -8,14 +8,10 @@
 
 echo "" > $out
 
-echo "Below is the feedback and provisional marks for your submission" >> $out
-echo "for assignment 8 Part 2.  Please note all marks are provisional until" >> $out
-echo "ratified by the assessment board -- this is not an official" >> $out
-echo "results transcript." >> $out
-echo "" >> $out
+echo -e "Below is the feedback for your submission of CW 8, Advanced Part 2." >> $out
+echo -e "" >> $out
 
-# marks for CW8 part 2
-marks=$(( 0 ))
+
 
 # compilation tests
 
@@ -30,10 +26,6 @@
   (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -nc -i "$1" "$2" -e "") #2> /dev/null 1> /dev/null)
 }
 
-function scala_assert_slow {
-  (ulimit -t 120; JAVA_OPTS="-Xmx1g" scala -nc -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null)
-}
-
 
 
 # purity test
@@ -45,15 +37,15 @@
 
 # knights2: purity test
 #
-echo -e "knight2.scala does not contain vars, returns, Arrays, ListBuffers etc?" | tee -a $out
+echo -e "knight2.scala does not contain vars, returns, Arrays, ListBuffers etc?" >> $out
 
 
 if (scala_vars knight2.scala)
 then
-  echo -e "  --> test failed" | tee -a $out
+  echo -e "  --> fail (make triple-sure your program conforms to the required format)" >> $out    
   tsts0=$(( 0 ))
 else
-  echo -e "  --> success" | tee -a $out
+  echo -e "  --> success" >> $out
   tsts0=$(( 0 )) 
 fi
 
@@ -61,11 +53,11 @@
 # compilation test
 if  [ $tsts0 -eq 0 ]
 then    
-  echo -e "knight2.scala runs?" | tee -a $out
+  echo -e "knight2.scala runs?" >> $out
 
   if (scala_compile knight2.scala)
   then
-    echo -e "  --> success" | tee -a $out
+    echo -e "  --> success" >> $out
     tsts1=$(( 0 ))
   else
     echo -e "  --> SCALA DID NOT RUN KNIGHT2.SCALA\n" >> $out  
@@ -79,14 +71,13 @@
 
 if [ $tsts1 -eq 0 ]
 then
-  echo -e " ordered_moves(8, List((3,4), (3,2)), (1,3)) == List((0,1), (0,5), (2,1), (2,5))" | tee -a $out
-  echo -e " ordered_moves(8, List((4,0)), (0,0)) == List((2,1), (1,2))" | tee -a $out
-  echo -e " ordered_moves(8, List((0,4)), (0,0)) == List((1,2), (2,1))" | tee -a $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 "knight2.scala" "knight_test6.scala")
   then
-      echo -e "  --> success" | tee -a $out
-      marks=$(( marks + 1 ))
+      echo -e "  --> success" >> $out
   else
       echo -e "  --> \n ONE TEST FAILED\n" >> $out  
   fi
@@ -97,12 +88,11 @@
 
 if [ $tsts1 -eq 0 ]
 then
-  echo -e " first_closed_tour_heuristic(6, List((3,3))) found and correct?" | tee -a $out
+  echo -e " first_closed_tour_heuristic(6, List((3,3))) found and correct?" >> $out
   
   if (scala_assert "knight2.scala" "knight_test7.scala")
   then
-      echo -e "  --> success" | tee -a $out
-      marks=$(( marks + 1 ))
+      echo -e "  --> success" >> $out
   else
       echo -e "  --> \n ONE TEST FAILED\n" >> $out  
   fi
@@ -112,13 +102,12 @@
 
 if [ $tsts1 -eq 0 ]
 then
-  echo -e " first_tour_heuristic(8, List((0,0))) found and correct?" | tee -a $out
-  echo -e " first_tour_heuristic(30, List((0,0))) found and correct?" | tee -a $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 "knight2.scala" "knight_test8.scala")
   then
-      echo -e "  --> success" | tee -a $out
-      marks=$(( marks + 1 ))
+      echo -e "  --> success" >> $out
   else
       echo -e "  --> \n ONE TEST FAILED\n" >> $out 
   fi
@@ -127,15 +116,15 @@
 
 # knights3: purity test
 #
-echo -e "knight3.scala does not contain vars, returns, Arrays, ListBuffers etc?" | tee -a $out
+echo -e "knight3.scala does not contain vars, returns, Arrays, ListBuffers etc?" >> $out
 
 
 if (scala_vars knight3.scala)
 then
-  echo "  --> test failed" | tee -a $out
+  echo "  --> test failed" >> $out
   tsts0=$(( 0 ))
 else
-  echo "  --> success" | tee -a $out
+  echo "  --> success" >> $out
   tsts0=$(( 0 )) 
 fi
 
@@ -143,11 +132,11 @@
 # compilation test
 if  [ $tsts0 -eq 0 ]
 then    
-  echo "knight3.scala runs?" | tee -a $out
+  echo "knight3.scala runs?" >> $out
 
   if (scala_compile knight3.scala)
   then
-    echo "  --> success" | tee -a $out
+    echo "  --> success" >> $out
     tsts1=$(( 0 ))
   else
     echo -e "  --> SCALA DID NOT RUN KNIGHT3.SCALA\n" >> $out  
@@ -160,18 +149,13 @@
 
 if [ $tsts1 -eq 0 ]
 then
-  echo -e " tour_on_mega_board(70, List((0,0))) found and correct?" | tee -a $out
+  echo -e " tour_on_mega_board(70, List((0,0))) found and correct?" >> $out
   
   if (scala_assert "knight3.scala" "knight_test9.scala")
   then
-      echo -e "  --> success" | tee -a $out
-      marks=$(( marks + 1 ))
+      echo -e "  --> success" >> $out
   else
       echo -e "  --> \n ONE TEST FAILED\n" >> $out 
   fi
 fi
 
-
-## final marks
-echo "Overall mark for CW 8, Part 2" | tee -a $out
-echo "$marks" | tee -a $out