diff -r a359976a6f3e -r 975d34506e88 testing3-bak/knight3c_test.scala --- a/testing3-bak/knight3c_test.scala Mon Dec 10 02:23:30 2018 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ - -//import scala.concurrent._ -//import scala.concurrent.duration._ -//import ExecutionContext.Implicits.global -//import scala.language.postfixOps - -type Pos = (Int, Int) -type Path = List[Pos] - -def add_pair_urban(x: Pos)(y: Pos): Pos = - (x._1 + y._1, x._2 + y._2) - -def is_legal_urban(dim: Int, path: Path)(x: Pos): Boolean = - 0 <= x._1 && 0 <= x._2 && x._1 < dim && x._2 < dim && !path.contains(x) - -def moves_urban(x: Pos): List[Pos] = - List(( 1, 2),( 2, 1),( 2, -1),( 1, -2), - (-1, -2),(-2, -1),(-2, 1),(-1, 2)).map(add_pair_urban(x)) - -def legal_moves_urban(dim: Int, path: Path, x: Pos): List[Pos] = - moves_urban(x).filter(is_legal_urban(dim, path)) - -def correct_urban(dim: Int)(p: Path): Boolean = p match { - case Nil => true - case x::Nil => true - case x::y::p => - if (legal_moves_urban(dim, p, y).contains(x)) correct_urban(dim)(y::p) else false -} - - -// !!!!!!! the futures need to be removed...otherwise funny results -//lazy val f1 = Future { - - val ts8 = CW7c.first_tour_heuristic(8, List((0,0))).get - assert(correct_urban(8)(ts8) == true) - -//} - -//Await.result(f1, 360 second) - - -//lazy val f2 = Future { - - val ts40 = CW7c.first_tour_heuristic(40, List((0,0))).get - assert(correct_urban(40)(ts40) == true) - -//} - -//Await.result(f2, 360 second)