--- a/testing1/drumb_test6.scala	Tue Oct 29 11:11:44 2019 +0000
+++ b/testing1/drumb_test6.scala	Tue Oct 29 14:12:24 2019 +0000
@@ -1,9 +1,18 @@
 //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.03573992567129673), Some(0.539975124774038)), 
-                    List(Some(0.10103412653643493), Some(0.24777709700099845)))
+val ds_urban = List(List(Some(-0.03573991804411003), Some(0.539974575389325)), 
+                    List(Some(0.10103414222249969), Some(0.24777764141006836)))
 
 
 
-assert(yearly_yield(ds_urban, 100, 0) == 125)
-assert(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)