marking1/drumb_test5.scala
changeset 268 e43f7e92ba26
parent 260 b4812c877b05
child 281 87b9e3e2c1a7
--- a/marking1/drumb_test5.scala	Wed Jul 24 15:18:44 2019 +0100
+++ b/marking1/drumb_test5.scala	Thu Aug 01 09:48:34 2019 +0100
@@ -1,12 +1,19 @@
+def myassert(cond : => Boolean) = {
+  try {
+    assert(cond)
+  } catch { 
+    case _ : Throwable => System.exit(1)
+  }
+}
 
 // get_prices(List("GOOG", "AAPL"), 2010 to 2012)
-val urban_prices = List(List(Some(311.349976), Some(20.544939)), 
-                        List(Some(300.222351), Some(31.638695)), 
-                        List(Some(330.555054), Some(39.478039)))
+val urban_prices = List(List(Some(312.204773), Some(26.782711)), 
+                        List(Some(301.0466), Some(41.244694)), 
+                        List(Some(331.462585), Some(51.464207)))
 
 
-assert(get_deltas(urban_prices) == List(List(Some(-0.03573992567129673), Some(0.539975124774038)), 
-                                        List(Some(0.10103412653643493), Some(0.24777709700099845))))
+myassert(get_deltas(urban_prices) == List(List(Some(-0.03573991804411003), Some(0.539974575389325)), 
+                                          List(Some(0.10103414222249969), Some(0.24777764141006836))))
 
 
 //get_prices(List("BIDU"), 2004 to 2008)
@@ -15,6 +22,6 @@
                          List(Some(38.188)))
 
 
-assert(get_deltas(urban_prices2) == List(List(None), List(None), 
+myassert(get_deltas(urban_prices2) == List(List(None), List(None), 
                                         List(Some(0.9277165354330709)), 
                                         List(Some(2.119679764725104))))