diff -r 7acbef680bef -r f5c0749858fd main_marking1/drumb_test7.scala --- a/main_marking1/drumb_test7.scala Sun Jan 15 10:58:13 2023 +0000 +++ b/main_marking1/drumb_test7.scala Sat Mar 11 22:01:53 2023 +0000 @@ -1,16 +1,19 @@ +import scala.concurrent._ +import scala.concurrent.duration._ +import ExecutionContext.Implicits.global +import scala.language.postfixOps +lazy val f = Future { 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) +assert((112 to 114).contains(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2005, 100))) // 113 +assert((252 to 256).contains(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2006, 100))) // 254 +assert((346 to 352).contains(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2007, 100))) // 349 +assert((11389 to 11619).contains(M1.investment(List("GOOG", "AAPL", "BIDU"), 1990 to 2017, 100))) //11504 +} -// 113 -assert((112 to 114).contains(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2005, 100))) -// 254 -assert((252 to 256).contains(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2006, 100))) -// 349 -assert((346 to 352).contains(M1.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2007, 100))) -//11504 -assert((11389 to 11619).contains(M1.investment(List("GOOG", "AAPL", "BIDU"), 1990 to 2017, 100))) +Await.result(f, 32 second)