diff -r 10a2ef26a92c -r d20583497c5b marking1/drumb_test6.scala --- a/marking1/drumb_test6.scala Wed Jul 24 15:18:44 2019 +0100 +++ b/marking1/drumb_test6.scala Thu Aug 01 09:48:34 2019 +0100 @@ -1,9 +1,18 @@ //val urban_deltas = get_deltas(get_prices(List("GOOG", "AAPL"), 2010 to 2012)) -val ds_urban = List(List(Some(-0.03573992567129673), Some(0.539975124774038)), - List(Some(0.10103412653643493), Some(0.24777709700099845))) +def myassert(cond : => Boolean) = { + try { + assert(cond) + } catch { + case _ : Throwable => System.exit(1) + } +} + + +val ds_urban = List(List(Some(-0.03573991804411003), Some(0.539974575389325)), + List(Some(0.10103414222249969), Some(0.24777764141006836))) -assert(yearly_yield(ds_urban, 100, 0) == 125) -assert(yearly_yield(ds_urban, 100, 1) == 117) +myassert(yearly_yield(ds_urban, 100, 0) == 125) +myassert(yearly_yield(ds_urban, 100, 1) == 117)