diff -r 8f03f0dc3065 -r e10a9b2fd35a marking/mark01b --- a/marking/mark01b Wed Jan 11 14:42:46 2017 +0000 +++ b/marking/mark01b Sat Jan 21 00:43:35 2017 +0000 @@ -1,7 +1,7 @@ #!/bin/bash set -e -out=${1:-output} +out=${1:-output2} echo "" > $out @@ -55,7 +55,7 @@ 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") + if (scala_assert "drumb.scala" "../../../marking/drumb_test1.scala") then echo " --> success" | tee -a $out marks=$(( marks + 1 )) @@ -74,7 +74,7 @@ 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") + if (scala_assert "drumb.scala" "../../../marking/drumb_test2.scala") then echo " --> success" | tee -a $out marks=$(( marks + 1 )) @@ -93,7 +93,7 @@ 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") + if (scala_assert "drumb.scala" "../../../marking/drumb_test3.scala") then echo " --> success" | tee -a $out marks=$(( marks + 1 ))