diff -r 9e0216756771 -r e43f7e92ba26 marking1/drumb_test3.scala --- a/marking1/drumb_test3.scala Wed Jul 24 15:18:44 2019 +0100 +++ b/marking1/drumb_test3.scala Thu Aug 01 09:48:34 2019 +0100 @@ -1,4 +1,17 @@ -assert(get_prices(List("GOOG", "AAPL"), 2010 to 2012) == - List(List(Some(311.349976), Some(20.544939)), - List(Some(300.222351), Some(31.638695)), - List(Some(330.555054), Some(39.478039)))) +def myassert(cond : => Boolean) = { + try { + assert(cond) + } catch { + case _ : Throwable => System.exit(1) + } +} + +myassert(get_prices(List("BIDU"), 2004 to 2008) == + List(List(None), List(None), List(Some(6.35)), + List(Some(12.241)), List(Some(38.188)))) + + +myassert(get_prices(List("GOOG", "AAPL"), 2010 to 2012) == + List(List(Some(312.204773), Some(26.782711)), + List(Some(301.0466), Some(41.244694)), + List(Some(331.462585), Some(51.464207))))