equal
deleted
inserted
replaced
25 case x::Nil => true |
25 case x::Nil => true |
26 case x::y::p => |
26 case x::y::p => |
27 if (legal_moves_urban(dim, p, y).contains(x)) correct_urban(dim)(y::p) else false |
27 if (legal_moves_urban(dim, p, y).contains(x)) correct_urban(dim)(y::p) else false |
28 } |
28 } |
29 |
29 |
|
30 |
|
31 // !!!!!!! the futures need to be removed...otherwise funny results |
30 //lazy val f1 = Future { |
32 //lazy val f1 = Future { |
31 |
33 |
32 val ts8 = CW7c.first_tour_heuristic(8, List((0,0))).get |
34 val ts8 = CW7c.first_tour_heuristic(8, List((0,0))).get |
33 assert(correct_urban(8)(ts8) == true) |
35 assert(correct_urban(8)(ts8) == true) |
34 |
36 |