diff -r a057dc4457fc -r 87b9e3e2c1a7 marking1/drumb_test6.scala
--- a/marking1/drumb_test6.scala	Tue Oct 29 11:11:44 2019 +0000
+++ b/marking1/drumb_test6.scala	Tue Oct 29 14:12:24 2019 +0000
@@ -1,5 +1,5 @@
 //val urban_deltas = get_deltas(get_prices(List("GOOG", "AAPL"), 2010 to 2012))
-
+/*
 def myassert(cond : => Boolean) = {
   try {
     assert(cond)
@@ -7,12 +7,12 @@
     case _ : Throwable => System.exit(1)
   }
 }
-
+*/
 
 val ds_urban = List(List(Some(-0.03573991804411003), Some(0.539974575389325)), 
                     List(Some(0.10103414222249969), Some(0.24777764141006836)))
 
 
 
-myassert(yearly_yield(ds_urban, 100, 0) == 125)
-myassert(yearly_yield(ds_urban, 100, 1) == 117)
+assert(CW6b.yearly_yield(ds_urban, 100, 0) == 125)
+assert(CW6b.yearly_yield(ds_urban, 100, 1) == 117)