From 71ba470de369e42fc935e4101aedc066c9e0c4d6 Mon Sep 17 00:00:00 2001
From: michelou <michelou@epfl.ch>
Date: Thu, 30 Aug 2007 14:43:41 +0000
Subject: updated syntax in pos/sudoku.scala (and on sygn...

updated syntax in pos/sudoku.scala (and on sygneca)
---
 test/files/pos/sudoku.scala | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'test')

diff --git a/test/files/pos/sudoku.scala b/test/files/pos/sudoku.scala
index b9348a8001..8f42e56264 100644
--- a/test/files/pos/sudoku.scala
+++ b/test/files/pos/sudoku.scala
@@ -2,21 +2,21 @@ object SudokuSolver extends Application {
   // The board is represented by an array of strings (arrays of chars),
   // held in a global variable m. The program begins by reading 9 lines
   // of input to fill the board
-  var m: Array[Array[char]] = List.tabulate( 9, (x:int) => Console.readLine.toArray).toArray;
+  var m: Array[Array[Char]] = List.tabulate(9, (x: Int) => readLine.toArray).toArray
 
   // For printing m, a method print is defined
-  def print = {Console.println(""); m map (carr=>Console.println(new String(carr)))}
+  def print = { println(""); m map (carr => println(new String(carr))) }
 
   // The test for validity is performed by looping over i=0..8 and
   // testing the row, column and 3x3 square containing the given
   // coordinate
-  def invalid(i:int, x:int, y:int, n:char): boolean =
+  def invalid(i: Int, x: Int, y: Int, n: Char): Boolean =
     i<9 && (m(y)(i) == n || m(i)(x) == n ||
       m(y/3*3 + i/3)(x/3*3 + i % 3) == n || invalid(i+1, x, y, n))
 
   // Looping over a half-closed range of consecutive integers [l..u)
   // is factored out into a higher-order function
-  def fold(f: (int,int)=>int, accu:int, l:int, u:int):int =
+  def fold(f: (Int, Int) => Int, accu: Int, l: Int, u: Int): Int =
     if(l==u) accu else fold(f, f(accu, l), l+1, u)
 
   // The search function examines each position on the board in turn,
@@ -24,12 +24,12 @@ object SudokuSolver extends Application {
   // The function is itself a higher-order fold, accumulating the value
   // accu by applying the given function f to it whenever a solution m
   // is found
-  def search(x:int, y:int, f:(int)=>int, accu:int):int = Pair(x, y) match {
-    case Pair(9, y) => search(0, y+1, f, accu) // next row
-    case Pair(0, 9) => f(accu)                 // found a solution
-    case Pair(x, y) => if(m(y)(x) != '0') search(x+1, y, f, accu) else
-      fold((accu:int, n:int) =>
-           if(invalid(0, x, y, (n + 48).toChar)) accu else {
+  def search(x:Int, y:Int, f: (Int) => Int, accu: Int): Int = (x, y) match {
+    case (9, y) => search(0, y+1, f, accu) // next row
+    case (0, 9) => f(accu)                 // found a solution
+    case (x, y) => if (m(y)(x) != '0') search(x+1, y, f, accu) else
+      fold((accu: Int, n: Int) =>
+           if (invalid(0, x, y, (n + 48).toChar)) accu else {
              m(y)(x) = (n + 48).toChar;
              val newaccu = search(x+1, y, f, accu);
              m(y)(x) = '0';
@@ -37,5 +37,5 @@ object SudokuSolver extends Application {
 
   // The main part of the program uses the search function to accumulate
   // the total number of solutions
-  Console.println("\n"+search(0,0,i => {print; i+1},0)+" solution(s)")
+  println("\n"+search(0,0,i => {print; i+1},0)+" solution(s)")
 }
-- 
cgit v1.2.3