diff -r 59779ce322a6 -r ca48ac1d3c3e templates1/collatz.scala --- a/templates1/collatz.scala Sat Jun 22 08:39:52 2019 +0100 +++ b/templates1/collatz.scala Wed Jul 24 14:22:06 2019 +0100 @@ -1,5 +1,5 @@ -// Part 1 about the 3n+1 conjecture -//================================= +// Basic Part about the 3n+1 conjecture +//====================================== //(1) Complete the collatz function below. It should @@ -12,14 +12,14 @@ //def collatz(n: Long) : Long = ... -//(2) Complete the collatz_max function below. It should -// calculate how many steps are needed for each number -// from 1 up to a bound and then calculate the maximum number of -// steps and the corresponding number that needs that many -// steps. Again, you should expect bounds in the range of 1 -// up to 1 Million. The first component of the pair is -// the maximum number of steps and the second is the -// corresponding number. +//(2) Complete the collatz_max function below. It should +// calculate how many steps are needed for each number +// from 1 up to a bound and then calculate the maximum number of +// steps and the corresponding number that needs that many +// steps. Again, you should expect bounds in the range of 1 +// up to 1 Million. The first component of the pair is +// the maximum number of steps and the second is the +// corresponding number. //def collatz_max(bnd: Long) : (Long, Long) = ...