--- a/marking1/collatz_test2.scala	Tue Oct 29 11:11:44 2019 +0000
+++ b/marking1/collatz_test2.scala	Tue Oct 29 14:12:24 2019 +0000
@@ -1,23 +1,16 @@
-def myassert(cond : => Boolean) = {
-  try {
-    assert(cond)
-  } catch { 
-    case _ : Throwable => System.exit(1)
-  }
-}
-
-myassert(collatz_max(10) == (19, 9))
-
-myassert(collatz_max(100) == (118, 97))
+//def myassert(cond : => Boolean) = {
+//  try {
+//    assert(cond)
+//  } catch { 
+//    case _ : Throwable => System.exit(1)
+//  }
+//}
 
-myassert(collatz_max(1000) == (178, 871))
-
-myassert(collatz_max(10000) == (261, 6171))
-
-myassert(collatz_max(100000) == (350, 77031))
-
-myassert(collatz_max(1000000) == (524, 837799))
-
-myassert(collatz_max(2) == (1, 2))
-
-myassert(collatz_max(77000) == (339, 52527))
+assert(CW6a.collatz_max(10) == (19, 9))
+assert(CW6a.collatz_max(100) == (118, 97))
+assert(CW6a.collatz_max(1000) == (178, 871))
+assert(CW6a.collatz_max(10000) == (261, 6171))
+assert(CW6a.collatz_max(100000) == (350, 77031))
+assert(CW6a.collatz_max(1000000) == (524, 837799))
+assert(CW6a.collatz_max(2) == (1, 2))
+assert(CW6a.collatz_max(77000) == (339, 52527))