diff options
author | Iulian Dragos <jaguarul@gmail.com> | 2005-12-13 16:19:05 +0000 |
---|---|---|
committer | Iulian Dragos <jaguarul@gmail.com> | 2005-12-13 16:19:05 +0000 |
commit | 58375d932adab9889cbf373b08051f520ff46b69 (patch) | |
tree | 6a81a868c706bebf70f23a63ca10b4637262db7b /test-nsc/files/run/Course-2002-05.scala | |
parent | 354a2566de85e6e5993616a1843c024e4a2f98cf (diff) | |
download | scala-58375d932adab9889cbf373b08051f520ff46b69.tar.gz scala-58375d932adab9889cbf373b08051f520ff46b69.tar.bz2 scala-58375d932adab9889cbf373b08051f520ff46b69.zip |
Updated to new syntax.
Diffstat (limited to 'test-nsc/files/run/Course-2002-05.scala')
-rwxr-xr-x | test-nsc/files/run/Course-2002-05.scala | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test-nsc/files/run/Course-2002-05.scala b/test-nsc/files/run/Course-2002-05.scala index 6f40f7f99e..c761f88f5d 100755 --- a/test-nsc/files/run/Course-2002-05.scala +++ b/test-nsc/files/run/Course-2002-05.scala @@ -130,14 +130,14 @@ object M3 { else { def isSafe(column: int, placement: Placement): boolean = placement forall { - pos => pos._2 != column - && abs(pos._2 - column) != row - pos._1 + pos => (pos._2 != column && + abs(pos._2 - column) != row - pos._1) } def adjoinRow(placement: Placement): List[Placement] = range(1, n) - filter (column => isSafe(column, placement)) - map (column => Pair(row, column) :: placement); + .filter (column => isSafe(column, placement)) + .map (column => Pair(row, column) :: placement); placeQueens(row - 1) flatMap adjoinRow } @@ -173,10 +173,10 @@ object M4 { List(List()) else { def isSafe(col: Int, p: Placement, delta: Int): Boolean = - p.isEmpty || - (col != p.head && - abs(col - p.head) != delta && - isSafe(col, p.tail, delta + 1)); + (p.isEmpty || + (col != p.head && + abs(col - p.head) != delta && + isSafe(col, p.tail, delta + 1))); for ( val placement <- placeQueens(row - 1); |