diff --git a/src/Assignment7/Ex2.sc b/src/Assignment7/Ex2.sc index 6dda8d6..68e7fcd 100644 --- a/src/Assignment7/Ex2.sc +++ b/src/Assignment7/Ex2.sc @@ -3,7 +3,7 @@ def intsFrom(n: Int): LazyList[Int] = { } def primeNumbers(list: LazyList[Int]): LazyList[Int] = { - list.head #:: primeNumbers(list.filter(n => n % list.head != 0)) + list.head #:: primeNumbers(list.tail.filter(n => n % list.head != 0)) } val ints: LazyList[Int] = intsFrom(2) primeNumbers(ints).take(10).toList \ No newline at end of file diff --git a/src/Assignment7/Ex3.sc b/src/Assignment7/Ex3.sc index 7b73a63..f7553ea 100644 --- a/src/Assignment7/Ex3.sc +++ b/src/Assignment7/Ex3.sc @@ -3,9 +3,9 @@ def addStream(s1: LazyList[Int], s2: LazyList[Int]): LazyList[Int] = { } def fibonacci(): LazyList[Int] = { - 0 #:: addStream( - 1 #:: fibonacci(), - fibonacci() + 0 #:: 1 #:: addStream( + fibonacci(), + fibonacci().tail ) }