diff -r a56a6c28b700 -r 32dfd2ca577b marking1/drumb_test3.scala --- a/marking1/drumb_test3.scala Tue Oct 29 11:11:44 2019 +0000 +++ b/marking1/drumb_test3.scala Tue Oct 29 14:12:24 2019 +0000 @@ -1,17 +1,17 @@ -def myassert(cond : => Boolean) = { +/*def myassert(cond : => Boolean) = { try { assert(cond) } catch { case _ : Throwable => System.exit(1) } } - -myassert(get_prices(List("BIDU"), 2004 to 2008) == +*/ +assert(CW6b.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) == +assert(CW6b.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))))