summaryrefslogtreecommitdiff
path: root/test-nsc/files/run/Course-2002-05.scala
diff options
context:
space:
mode:
Diffstat (limited to 'test-nsc/files/run/Course-2002-05.scala')
-rwxr-xr-xtest-nsc/files/run/Course-2002-05.scala16
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);