diff -r 9e0216756771 -r e43f7e92ba26 marking1/drumb_test.sh --- a/marking1/drumb_test.sh Wed Jul 24 15:18:44 2019 +0100 +++ b/marking1/drumb_test.sh Thu Aug 01 09:48:34 2019 +0100 @@ -98,7 +98,7 @@ if [ $tsts -eq 0 ] then echo " get_first_price(\"GOOG\", 1980) == None" | tee -a $out - echo " get_first_price(\"GOOG\", 2010) == Some(311.349976)" | tee -a $out + echo " get_first_price(\"GOOG\", 2010) == Some(312.204773)" | tee -a $out if (scala_assert "drumb.scala" "drumb_test2.scala") then @@ -118,9 +118,9 @@ echo " List(Some(12.241)), List(Some(38.188)))" | tee -a $out echo " " | tee -a $out echo " get_prices(List(\"GOOG\", \"AAPL\"), 2010 to 2012) ==" | tee -a $out - echo " List(List(Some(311.349976), Some(20.544939))," | tee -a $out - echo " List(Some(300.222351), Some(31.638695))," | tee -a $out - echo " List(Some(330.555054), Some(39.478039)))" | tee -a $out + echo " List(List(Some(312.204773), Some(26.782711))," | tee -a $out + echo " List(Some(301.0466), Some(41.244694))," | tee -a $out + echo " List(Some(331.462585), Some(51.464207)))" | tee -a $out if (scala_assert "drumb.scala" "drumb_test3.scala") then @@ -155,8 +155,8 @@ if [ $tsts -eq 0 ] then echo -e " get_deltas(get_prices(List(\"GOOG\", \"AAPL\"), 2010 to 2012)) == " | tee -a $out - echo -e " List(List(Some(-0.03573992567129673), Some(0.539975124774038)), " | tee -a $out - echo -e " List(Some(0.10103412653643493), Some(0.24777709700099845)))" | tee -a $out + echo -e " List(List(Some(-0.03573991804411003), Some(0.539974575389325)), " | tee -a $out + echo -e " List(Some(0.10103414222249969), Some(0.24777764141006836)))" | tee -a $out echo -e "" | tee -a $out echo -e " get_deltas(get_prices(List(\"BIDU\"), 2004 to 2008)) == " | tee -a $out echo -e " List(List(None), List(None), " | tee -a $out @@ -203,7 +203,7 @@ echo -e " investment(List(\"GOOG\", \"AAPL\", \"BIDU\"), 2000 to 2005, 100) == 113" | tee -a $out echo -e " investment(List(\"GOOG\", \"AAPL\", \"BIDU\"), 2000 to 2006, 100) == 254" | tee -a $out echo -e " investment(List(\"GOOG\", \"AAPL\", \"BIDU\"), 2000 to 2007, 100) == 349" | tee -a $out - echo -e " investment(List(\"GOOG\", \"AAPL\", \"BIDU\"), 1990 to 2017, 100) == 83061" | tee -a $out + echo -e " investment(List(\"GOOG\", \"AAPL\", \"BIDU\"), 1990 to 2017, 100) == 11504" | tee -a $out if (scala_assert "drumb.scala" "drumb_test7.scala")