diff -r 90dd9c6162b3 -r 556cd74cbba9 progs/collatz_sol.scala --- a/progs/collatz_sol.scala Wed May 31 09:26:08 2017 +0100 +++ b/progs/collatz_sol.scala Thu Nov 02 14:47:55 2017 +0000 @@ -1,6 +1,8 @@ // Part 1 about the 3n+1 conceture //================================= + + //(1) Complete the collatz function below. It should // recursively calculate the number of steps needed // until the collatz series reaches the number 1. @@ -36,7 +38,7 @@ // some testing harness -val bnds = List(2, 10, 100, 1000, 10000, 100000, 77000, 90000, 1000000) +val bnds = List(2, 10, 100, 1000, 10000, 100000, 77000, 90000, 1000000, 5000000) for (bnd <- bnds) { val (max, steps) = collatz_max(bnd) @@ -46,3 +48,6 @@ //val all = for (i <- (1 to 100000).toList) yield collatz1(i) //println(all.sorted.reverse.take(10)) + + +