equal
deleted
inserted
replaced
62 } |
62 } |
63 |
63 |
64 def first_closed_tour_heuristics(dim: Int, path: Path) = |
64 def first_closed_tour_heuristics(dim: Int, path: Path) = |
65 time_needed(tfirst_closed_tour_heuristics(dim: Int, path: Path)) |
65 time_needed(tfirst_closed_tour_heuristics(dim: Int, path: Path)) |
66 |
66 |
|
67 def first_closed_tour_heuristic(dim: Int, path: Path) = |
|
68 time_needed(tfirst_closed_tour_heuristics(dim: Int, path: Path)) |
|
69 |
67 |
70 |
68 // heuristic cannot be used to search for closed tours on 7 x 7 an beyond |
71 // heuristic cannot be used to search for closed tours on 7 x 7 an beyond |
69 //for (dim <- 1 to 6) { |
72 //for (dim <- 1 to 6) { |
70 // val t = time_needed(0, first_closed_tour_heuristics(dim, List((dim / 2, dim / 2)))) |
73 // val t = time_needed(0, first_closed_tour_heuristics(dim, List((dim / 2, dim / 2)))) |
71 // println(s"${dim} x ${dim} closed: " + (if (t == None) "" else { print_board(dim, t.get) ; "" })) |
74 // println(s"${dim} x ${dim} closed: " + (if (t == None) "" else { print_board(dim, t.get) ; "" })) |
80 |
83 |
81 |
84 |
82 def first_tour_heuristics(dim: Int, path: Path) = |
85 def first_tour_heuristics(dim: Int, path: Path) = |
83 time_needed(tfirst_tour_heuristics(dim: Int, path: Path)) |
86 time_needed(tfirst_tour_heuristics(dim: Int, path: Path)) |
84 |
87 |
|
88 def first_tour_heuristic(dim: Int, path: Path) = |
|
89 time_needed(tfirst_tour_heuristics(dim: Int, path: Path)) |
85 |
90 |
86 // will be called with boards up to 30 x 30 |
91 // will be called with boards up to 30 x 30 |
87 |
92 |
88 |
93 |
89 //} |
94 //} |