Mercurial Mercurial > hg > pep-material / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
marking1/drumb_test7.scala
changeset 281 87b9e3e2c1a7
parent 268 e43f7e92ba26
child 331 e3878cdd38bc 
--- a/marking1/drumb_test7.scala	Tue Oct 29 11:11:44 2019 +0000
+++ b/marking1/drumb_test7.scala	Tue Oct 29 14:12:24 2019 +0000
@@ -1,3 +1,4 @@
+/*
 def myassert(cond : => Boolean) = {
   try {
     assert(cond)
@@ -5,14 +6,14 @@
     case _ : Throwable => System.exit(1)
   }
 }
-
+*/
 
-myassert(investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2000, 100) == 100)
-myassert(investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2001, 100) == 27)
-myassert(investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2002, 100) == 42)
-myassert(investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2003, 100) == 27)
-myassert(investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2004, 100) == 38)
-myassert(investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2005, 100) == 113)
-myassert(investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2006, 100) == 254)
-myassert(investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2007, 100) == 349)
-myassert(investment(List("GOOG", "AAPL", "BIDU"), 1990 to 2017, 100) == 11504)
+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(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2005, 100) == 113)
+assert(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2006, 100) == 254)
+assert(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 2000 to 2007, 100) == 349)
+assert(CW6b.investment(List("GOOG", "AAPL", "BIDU"), 1990 to 2017, 100) == 11504)
pep-material