--- a/marking1/collatz_test.sh	Sat Jun 22 08:39:52 2019 +0100
+++ b/marking1/collatz_test.sh	Wed Jul 24 14:22:06 2019 +0100
@@ -8,28 +8,30 @@
 
 echo "" > $out
 
+echo `date` >> $out
+echo >> $out
 echo "Below is the feedback and provisional marks for your submission" >> $out
-echo "for assignment 6 Part 1 + 2.  Please note all marks are provisional until" >> $out
+echo "for the Basic Part of Assignment 6.  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 "Below is the feedback for your submission for collatz.scala" >> $out
+echo "The feedback for your submission for collatz.scala" >> $out
 echo "" >> $out
 
-# marks for CW6 parts 1 + 2
+# marks for CW6 part 1
 marks=$(( 0 ))
 
 # compilation tests
 
 function scala_compile {
-  (ulimit -t 60; JAVA_OPTS="-Xmx1g" scala -nc "$1" 2> /dev/null 1> /dev/null)
+  (ulimit -t 60; JAVA_OPTS="-Xmx1g" scala "$1" 2> /dev/null 1> /dev/null)
 }
 
 # functional tests
 
 function scala_assert {
-  (ulimit -t 60; JAVA_OPTS="-Xmx1g" scala -nc -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null)
+  (ulimit -t 60; JAVA_OPTS="-Xmx1g" scala -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null)
 }
 
 # purity test
@@ -71,6 +73,8 @@
   tsts=$(( 1 ))     
 fi
 
+echo >> $out
+
 ### collatz tests
 
 if [ $tsts -eq 0 ]
@@ -116,7 +120,8 @@
 
 
 ## final marks
-echo "Overall mark for Part 1" | tee -a $out
+echo >> $out
+echo "Overall mark for Basic Part" | tee -a $out
 echo " $marks" | tee -a $out