diff -r a56a6c28b700 -r 32dfd2ca577b marking1/drumb_test4.scala --- a/marking1/drumb_test4.scala Tue Oct 29 11:11:44 2019 +0000 +++ b/marking1/drumb_test4.scala Tue Oct 29 14:12:24 2019 +0000 @@ -1,12 +1,6 @@ -def myassert(cond : => Boolean) = { - try { - assert(cond) - } catch { - case _ : Throwable => System.exit(1) - } -} + -myassert(get_delta(None, None) == None) -myassert(get_delta(Some(50.0), None) == None) -myassert(get_delta(None, Some(100.0)) == None) -myassert(get_delta(Some(50.0), Some(100.0)) == Some(1.0)) +assert(CW6b.get_delta(None, None) == None) +assert(CW6b.get_delta(Some(50.0), None) == None) +assert(CW6b.get_delta(None, Some(100.0)) == None) +assert(CW6b.get_delta(Some(50.0), Some(100.0)) == Some(1.0))