diff -r 40bdf9064e13 -r 63a1376cbebd marking1/drumb_test2.scala --- a/marking1/drumb_test2.scala Sat Nov 17 15:35:50 2018 +0000 +++ b/marking1/drumb_test2.scala Sat Nov 17 22:39:02 2018 +0000 @@ -1,14 +1,5 @@ -// paste in the actual values - -val urban_prices1 = CW6c.get_prices(List("BIDU"), 2004 to 2008) -val urban_prices2 = CW6c.get_prices(List("GOOG", "AAPL"), 2010 to 2012) - +assert(get_first_price("GOOG", 1980) == None) -assert(CW6c.get_deltas(urban_prices1) == - List(List(None), List(None), - List(Some(0.9277165354330709)), List(Some(2.119679764725104)))) +assert(get_first_price("GOOG", 2010) == Some(311.349976)) -assert(CW6c.get_deltas(urban_prices2) == - List(List(Some(-0.03573992567129673), Some(0.5399749442411563)), - List(Some(0.10103412653643493), Some(0.2477771728154912))))