diff -r e9d14d58be3c -r daf561a83ba6 main_marking1/drumb_test7.scala --- a/main_marking1/drumb_test7.scala Thu Jan 13 12:55:03 2022 +0000 +++ b/main_marking1/drumb_test7.scala Mon Apr 11 23:55:27 2022 +0100 @@ -1,24 +1,16 @@ -/* -def myassert(cond : => Boolean) = { - try { - assert(cond) - } catch { - case _ : Throwable => System.exit(1) - } -} -*/ + -assert(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2000, 100) == 100) -assert(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2001, 100) == 27) -assert(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2002, 100) == 42) -assert(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2003, 100) == 27) -assert(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2004, 100) == 38) +assert(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2000, 100) == 100) +assert(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2001, 100) == 27) +assert(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2002, 100) == 42) +assert(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2003, 100) == 27) +assert(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2004, 100) == 38) // 113 -assert((112 to 114).contains(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2005, 100))) +assert((112 to 114).contains(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2005, 100))) // 254 -assert((252 to 256).contains(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2006, 100))) +assert((252 to 256).contains(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2006, 100))) // 349 -assert((346 to 352).contains(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2007, 100))) +assert((346 to 352).contains(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2007, 100))) //11504 -assert((11389 to 11619).contains(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 1990 to 2017, 100))) +assert((11389 to 11619).contains(M1.investment(List("GOOG", "AAPL", "BIDU"), 1990 to 2017, 100)))