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

Merge branch 'master' into wip-produce-smtlib-models

Browse source
This commit is contained in:
Simon Cruanes 2023-04-20 22:10:03 -04:00
commit 7fbfb8439b
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
5 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.ocamlformat
View file

@ -1,4 +1,4 @@
version = 0.20.1 version = 0.24.1
profile=conventional profile=conventional
margin=80 margin=80
if-then-else=k-r if-then-else=k-r

3
dune-project
View file

@ -33,7 +33,8 @@
(alcotest :with-test) (alcotest :with-test)
(odoc :with-doc)) (odoc :with-doc))
(depopts (depopts
mtime ; for profiling stuff (mtime
(>= 2.0)) ; for profiling stuff
memtrace ; memory profiling memtrace ; memory profiling
zarith ; for arith zarith ; for arith
) )

6
sidekick.opam
View file

@ -16,7 +16,11 @@ depends: [
"alcotest" {with-test} "alcotest" {with-test}
"odoc" {with-doc} "odoc" {with-doc}
] ]
depopts: ["mtime" "memtrace" "zarith"] depopts: [
"mtime" {>= "2.0"}
"memtrace"
"zarith"
]
conflicts: [ conflicts: [
"zarith" {< "1.8"} "zarith" {< "1.8"}
] ]

5
src/smtlib/Driver.ml
View file

@ -69,7 +69,10 @@ let decl_fun (self : t) f args ret const : unit =
let build_model (self : t) (sat : Solver.sat_result) : Model.t = let build_model (self : t) (sat : Solver.sat_result) : Model.t =
Build_model.build self.build_model sat Build_model.build self.build_model sat
let check_model (self : t) (m : Model.t) : unit = assert false (* FIXME *)
let check_model (_self : t) (_m : Model.t) : unit =
Log.debugf 0 (fun k -> k "; TODO: check model");
()
(* call the solver to check satisfiability *) (* call the solver to check satisfiability *)
let solve (self : t) ~assumptions () : Solver.res = let solve (self : t) ~assumptions () : Solver.res =

2
src/tef/Sidekick_tef.real.ml
View file

@ -31,7 +31,7 @@ module Make () : P.BACKEND = struct
let get_ts () : float = let get_ts () : float =
let now = Mtime_clock.now () in let now = Mtime_clock.now () in
Mtime.Span.to_us (Mtime.span program_start now) Mtime.Span.to_float_ns (Mtime.span program_start now) /. 1e3
let emit_sep_ () = let emit_sep_ () =
if !first_ then if !first_ then