diff -r e2170c91a9f2 -r 6282b88511d8 pre_marking4/knight1_test3b.scala --- a/pre_marking4/knight1_test3b.scala Mon Jan 18 22:12:39 2021 +0000 +++ b/pre_marking4/knight1_test3b.scala Fri Jan 22 10:35:50 2021 +0000 @@ -2,11 +2,18 @@ //type Pos = (Int, Int) // a position on a chessboard //type Path = List[Pos] // a path...a list of positions +/* def count_all_tours_urban(dim: Int) = { for (i <- (0 until dim).toList; j <- (0 until dim).toList) yield count_tours(dim, List((i, j))) } +*/ + +def count_all_tours_urban(dim: Int) = { + for (i <- (0 until 3).toList; + j <- (0 until dim).toList) yield count_tours(dim, List((i, j))) +} -assert(count_all_tours_urban(5) == List(304, 0, 56, 0, 304, 0, 56, 0, 56, 0, 56, 0, 64, 0, 56, 0, 56, 0, 56, 0, 304, 0, 56, 0, 304)) +assert(count_all_tours_urban(5) == List(304, 0, 56, 0, 304, 0, 56, 0, 56, 0, 56, 0, 64, 0, 56))