diff -r 11396c17cd8b -r 716042628398 testing/drumb_test3.scala --- a/testing/drumb_test3.scala Fri Nov 10 09:23:23 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ - -val urban_prices = List(List(Some(311.349976), Some(27.505054)), - List(Some(300.222351), Some(42.357094)), - List(Some(330.555054), Some(52.852215))) - - -assert(CW6c.yearly_yield(CW6c.get_deltas(urban_prices), 100, 0) == 125) - - -val urban_blchip_portfolio = List("GOOG", "AAPL", "MSFT", "IBM", "FB", "AMZN", "BIDU") -val urban_rstate_portfolio = List("PLD", "PSA", "AMT", "AIV", "AVB", "BXP", "CCI", - "DLR", "EQIX", "EQR", "ESS", "EXR", "FRT", "GGP", "HCP") - -val urban_rstate_res = CW6c.investment(urban_rstate_portfolio, 1978 to 2017, 100) -val urban_blchip_res = CW6c.investment(urban_blchip_portfolio, 1978 to 2017, 100) - -// the rstate value is 30895 because of a faulty ESS.cvs file - -assert(urban_rstate_res > 30885 && urban_rstate_res < 30905) -assert(urban_blchip_res > 349587 && urban_blchip_res < 349607)