simon/sidekick
1
0
Fork 0
mirror of https://github.com/c-cube/sidekick.git synced 2025-12-10 05:03:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: add another check to the sudoku solver

Browse source
This commit is contained in:
Simon Cruanes 2019-01-25 22:15:04 -06:00 • committed by Guillaume Bury
parent 1c188afb6b
commit a6d74898ff
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sudoku/sudoku_solve.ml
View file

@ -47,6 +47,7 @@ module Grid : sig
val parse : string -> t val parse : string -> t
val is_full : t -> bool val is_full : t -> bool
val is_valid : t -> bool val is_valid : t -> bool
val matches : pat:t -> t -> bool
val pp : t Fmt.printer val pp : t Fmt.printer
end = struct end = struct
type t = Cell.t array type t = Cell.t array
@ -96,6 +97,11 @@ end = struct
Sequence.for_all all_distinct @@ cols g && Sequence.for_all all_distinct @@ cols g &&
Sequence.for_all all_distinct @@ squares g Sequence.for_all all_distinct @@ squares g
let matches ~pat:g1 g2 : bool =
all_cells g1
|> Sequence.filter (fun (_,_,c) -> Cell.is_full c)
|> Sequence.for_all (fun (x,y,c) -> Cell.equal c @@ get g2 x y)
let pp out g = let pp out g =
Fmt.fprintf out "@[<v>"; Fmt.fprintf out "@[<v>";
Array.iteri Array.iteri
@ -323,6 +329,8 @@ let solve_file file =
errorf "grid %a@ is not full" Grid.pp g' errorf "grid %a@ is not full" Grid.pp g'
| Some g' when not @@ Grid.is_valid g' -> | Some g' when not @@ Grid.is_valid g' ->
errorf "grid %a@ is not valid" Grid.pp g' errorf "grid %a@ is not valid" Grid.pp g'
| Some g' when not @@ Grid.matches ~pat:g g' ->
errorf "grid %a@ @[<2>does not match original@ %a@]" Grid.pp g' Grid.pp g
| Some g' -> | Some g' ->
Format.printf "@[<v>@[<2>solution (in %.3fs):@ %a@]@,###################@]@." Format.printf "@[<v>@[<2>solution (in %.3fs):@ %a@]@,###################@]@."
(Sys.time()-.start) Grid.pp g') (Sys.time()-.start) Grid.pp g')