--- a/main_marking1/drumb_test6.scala	Thu Jan 13 12:55:03 2022 +0000
+++ b/main_marking1/drumb_test6.scala	Mon Apr 11 23:55:27 2022 +0100
@@ -1,18 +1,9 @@
-//val urban_deltas = get_deltas(get_prices(List("GOOG", "AAPL"), 2010 to 2012))
-/*
-def myassert(cond : => Boolean) = {
-  try {
-    assert(cond)
-  } catch { 
-    case _ : Throwable => System.exit(1)
-  }
-}
-*/
+
 
 val ds_urban = List(List(Some(-0.03573991804411003), Some(0.539974575389325)), 
                     List(Some(0.10103414222249969), Some(0.24777764141006836)))
 
 
 
-assert(CW6b.yearly_yield(ds_urban, 100, 0) == 125)
-assert(CW6b.yearly_yield(ds_urban, 100, 1) == 117)
+assert(M1.yearly_yield(ds_urban, 100, 0) == 125)
+assert(M1.yearly_yield(ds_urban, 100, 1) == 117)