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

feat(main): fix initial time; better display (smtlib-friendly)

Browse source
This commit is contained in:
Simon Cruanes 2022-08-14 23:21:02 -04:00
parent 6fca21bd33
commit 2ab93aee04
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/smtlib/Process.ml
View file

@ -114,9 +114,9 @@ end
*) *)
let reset_line = "\x1b[2K\r" let reset_line = "\x1b[2K\r"
let start = Sys.time ()
let mk_progress (_s : Solver.t) : _ -> unit = let mk_progress (_s : Solver.t) : _ -> unit =
let start = Sys.time () in
let n = ref 0 in let n = ref 0 in
let syms = "|\\-/" in let syms = "|\\-/" in
fun _s -> fun _s ->
@ -146,7 +146,7 @@ let with_file_out (file : string) (f : out_channel -> 'a) : 'a =
(* call the solver to check-sat *) (* call the solver to check-sat *)
let solve ?gc:_ ?restarts:_ ?proof_file ?(pp_model = false) ?(check = false) let solve ?gc:_ ?restarts:_ ?proof_file ?(pp_model = false) ?(check = false)
?time ?memory ?(progress = false) ~assumptions s : Solver.res = ?time ?memory ?(progress = false) ~assumptions s : Solver.res =
let t1 = Sys.time () in let t1 = Sys.time () -. start in
let on_progress = let on_progress =
if progress then if progress then
Some (mk_progress s) Some (mk_progress s)
@ -189,7 +189,8 @@ let solve ?gc:_ ?restarts:_ ?proof_file ?(pp_model = false) ?(check = false)
); );
*) *)
let t3 = Sys.time () -. t2 in let t3 = Sys.time () -. t2 in
Format.printf "Sat (%.3f/%.3f/%.3f)@." t1 (t2 -. t1) t3 Fmt.printf "sat@.";
Fmt.printf "; (%.3f/%.3f/%.3f)@." t1 (t2 -. t1) t3
| Solver.Unsat { unsat_step_id; unsat_core = _ } -> | Solver.Unsat { unsat_step_id; unsat_core = _ } ->
if check then if check then
() ()
@ -221,9 +222,11 @@ let solve ?gc:_ ?restarts:_ ?proof_file ?(pp_model = false) ?(check = false)
| _ -> ()); | _ -> ());
let t3 = Sys.time () -. t2 in let t3 = Sys.time () -. t2 in
Format.printf "Unsat (%.3f/%.3f/%.3f)@." t1 (t2 -. t1) t3 Fmt.printf "unsat@.";
Fmt.printf "; (%.3f/%.3f/%.3f)@." t1 (t2 -. t1) t3
| Solver.Unknown reas -> | Solver.Unknown reas ->
Format.printf "Unknown (:reason %a)@." Solver.Unknown.pp reas Fmt.printf "unknown@.";
Fmt.printf "; @[<h>:reason %a@]@." Solver.Unknown.pp reas
| exception exn -> | exception exn ->
Printf.printf "%s%!" reset_line; Printf.printf "%s%!" reset_line;
raise exn); raise exn);