--- a/main_marking1/drumb_test3.scala	Thu Jan 13 12:55:03 2022 +0000
+++ b/main_marking1/drumb_test3.scala	Mon Apr 11 23:55:27 2022 +0100
@@ -1,17 +1,11 @@
-/*def myassert(cond : => Boolean) = {
-  try {
-    assert(cond)
-  } catch { 
-    case _ : Throwable => System.exit(1)
-  }
-}
-*/
-assert(CW6b.get_prices(List("BIDU"), 2004 to 2008) ==
+import M1._
+
+assert(get_prices(List("BIDU"), 2004 to 2008) ==
    List(List(None), List(None), List(Some(6.35)), 
         List(Some(12.241)), List(Some(38.188))))
 
 
-assert(CW6b.get_prices(List("GOOG", "AAPL"), 2010 to 2012) ==
+assert(get_prices(List("GOOG", "AAPL"), 2010 to 2012) ==
    List(List(Some(312.204773), Some(26.782711)), 
         List(Some(301.0466), Some(41.244694)), 
         List(Some(331.462585), Some(51.464207))))