--- a/marking/mark01b	Fri Dec 02 23:32:28 2016 +0000
+++ b/marking/mark01b	Sat Dec 03 13:49:11 2016 +0000
@@ -103,5 +103,5 @@
 fi
 
 ## final marks
-echo "Overall mark for CW 6, Part 3:" | tee -a $out
+echo "Overall mark for CW 1, Part 3:" | tee -a $out
 echo "$marks" | tee -a $out

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/marking/mark02	Sat Dec 03 13:49:11 2016 +0000
@@ -0,0 +1,121 @@
+#!/bin/bash
+set -e
+
+out=${1:-output}
+
+echo "" > $out
+
+echo "Below is the feedback and provisional mark for your submission" >> $out
+echo "for CW 7.  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
+
+function scala_vars {
+   (egrep 'var|return|ListBuffer|mutable' "$1" 2> /dev/null 1> /dev/null)
+}
+
+
+# compilation tests
+
+function scala_compile {
+  (scala -nc "$1" 2> /dev/null 1> /dev/null) 
+}
+
+
+# functional tests
+
+function scala_assert {
+  (scala -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null)
+}
+
+
+# marks for CW2
+marks=$(( 0 ))
+
+# var, comments test
+echo "knight1.scala contains any vars, returns etc?" | tee -a $out
+
+if (scala_vars knight1.scala)
+then
+  echo "  --> fail" | tee -a $out
+  tsts0=$(( 0 ))
+else
+  echo "  --> success" | tee -a $out
+  tsts0=$(( 1 )) 
+fi
+
+
+# compilation test
+#if  [ $tsts0 -eq 0 ]
+#then    
+#  echo "knight1.scala runs?" | tee -a $out
+#
+#  if (scala_compile knight1.scala)
+#  then
+#    echo "  --> success" | tee -a $out
+#    tsts1=$(( 0 ))
+#  else
+#    echo "  --> scala did not run knight1.scala" | tee -a $out
+#    tsts1=$(( 1 )) 
+#  fi
+#fi
+
+### knight1 test
+
+#if [ $tsts1 -eq 0 ]
+#then
+#  echo "  get_prices(List(\"BIDU\"), 2004 to 2008) =" | tee -a $out
+#  echo "  List(List(None), List(None), List(Some(6.35))," | tee -a $out
+#  echo "       List(Some(12.241)), List(Some(38.188)))" | tee -a $out
+#
+#  if (scala_assert "drumb.scala" "../drumb_test1.scala")
+#  then
+#    echo "  --> success" | tee -a $out
+#    marks=$(( marks + 1 ))
+#  else
+#    echo "  --> test failed" | tee -a $out
+#  fi
+#fi
+
+### knight2 test
+
+#if [ $tsts -eq 0 ]
+#then
+#  echo "  get_deltas(get_prices(List(\"IBM\", \"BIDU\"), 2004 to 2008)) = " | tee -a $out
+#  echo "  List(List(Some(0.07596697626574789), None), " | tee -a $out
+#  echo "       List(Some(-0.152620823795232), None)," | tee -a $out
+#  echo "       List(Some(0.20126676681483952), Some(0.9277165354330709))," | tee -a $out
+#  echo "       List(Some(0.09141762603007778), Some(2.119679764725104)))" | tee -a $out
+#  
+#  if (scala_assert "drumb.scala" "../drumb_test2.scala") 
+#  then
+#    echo "  --> success" | tee -a $out
+#    marks=$(( marks + 1 ))
+#  else
+#    echo "  --> test failed" | tee -a $out
+#  fi
+#fi
+
+### knight3 test
+
+#if [ $tsts -eq 0 ]
+#then
+#  echo "  yearly_yield(IBM + BIDU, 04 - 08, 100, 0) - 107).abs <= 2 " | tee -a $out
+#  echo "  yearly_yield(IBM + BIDU, 04 - 08, 100, 1) -  85).abs <= 2 " | tee -a $out
+#  echo "  yearly_yield(IBM + BIDU, 04 - 08, 100, 2) - 156).abs <= 2 " | tee -a $out
+#  echo "  yearly_yield(IBM + BIDU, 04 - 08, 100, 3) - 210).abs <= 2 " | tee -a $out
+#  echo "  investment(List(\"IBM\", \"BIDU\"), 2004 to 2008, 100) - 298).abs <= 10" | tee -a $out
+#  
+#  if (scala_assert "drumb.scala" "../drumb_test3.scala") 
+#  then
+#    echo "  --> success" | tee -a $out
+#    marks=$(( marks + 1 ))
+#  else
+#    echo "  --> test failed" | tee -a $out
+#  fi
+#fi
+
+## final marks
+echo "Overall mark for CW 2" | tee -a $out
+echo "$marks" | tee -a $out