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

refactor a bit

Browse source
This commit is contained in:
Simon Cruanes 2022-08-27 23:09:29 -04:00
parent 01d0668fc6
commit 4c90405391
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
2 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/smt/solver_internal.ml
View file

@ -392,15 +392,6 @@ let mk_model_ (self : t) (lits : lit Iter.t) : Model.t =
compute_fixpoint (); compute_fixpoint ();
MB.to_model model MB.to_model model
(* do theory combination using the congruence closure. Each theory
can merge classes, *)
let check_th_combination_ (self : t) (acts : theory_actions) _lits : unit =
let lits_to_decide = Th_combination.pop_new_lits self.th_comb in
if lits_to_decide <> [] then (
let (module A) = acts in
List.iter (fun lit -> A.add_lit ~default_pol:false lit) lits_to_decide
)
(* call congruence closure, perform the actions it scheduled *) (* call congruence closure, perform the actions it scheduled *)
let check_cc_with_acts_ (self : t) (acts : theory_actions) = let check_cc_with_acts_ (self : t) (acts : theory_actions) =
let (module A) = acts in let (module A) = acts in
@ -447,7 +438,11 @@ let assert_lits_ ~final (self : t) (acts : theory_actions) (lits : Lit.t Iter.t)
(* do actual theory combination if nothing changed by pure "final check" *) (* do actual theory combination if nothing changed by pure "final check" *)
if not new_work then ( if not new_work then (
check_th_combination_ self acts lits; let new_intf_eqns = Th_combination.pop_new_lits self.th_comb in
if new_intf_eqns <> [] then (
let (module A) = acts in
List.iter (fun lit -> A.add_lit ~default_pol:false lit) new_intf_eqns
);
(* if theory combination didn't add new clauses, compute a model *) (* if theory combination didn't add new clauses, compute a model *)
if not (has_delayed_actions self) then ( if not (has_delayed_actions self) then (

12
src/smt/th_combination.ml
View file

@ -5,7 +5,6 @@ type t = {
tst: Term.store; tst: Term.store;
processed: T.Set.t T.Tbl.t; (** type -> set of terms *) processed: T.Set.t T.Tbl.t; (** type -> set of terms *)
unprocessed: T.t Vec.t; unprocessed: T.t Vec.t;
new_lits: Lit.t Vec.t;
claims: Theory_id.Set.t T.Tbl.t; (** term -> theories claiming it *) claims: Theory_id.Set.t T.Tbl.t; (** term -> theories claiming it *)
n_terms: int Stat.counter; n_terms: int Stat.counter;
n_lits: int Stat.counter; n_lits: int Stat.counter;
@ -17,7 +16,6 @@ let create ?(stat = Stat.global) tst : t =
processed = T.Tbl.create 8; processed = T.Tbl.create 8;
unprocessed = Vec.create (); unprocessed = Vec.create ();
claims = T.Tbl.create 8; claims = T.Tbl.create 8;
new_lits = Vec.create ();
n_terms = Stat.mk_int stat "smt.thcomb.terms"; n_terms = Stat.mk_int stat "smt.thcomb.terms";
n_lits = Stat.mk_int stat "smt.thcomb.intf-lits"; n_lits = Stat.mk_int stat "smt.thcomb.intf-lits";
} }
@ -56,6 +54,8 @@ let claim_term (self : t) ~th_id (t : T.t) : unit =
) )
let pop_new_lits (self : t) : Lit.t list = let pop_new_lits (self : t) : Lit.t list =
let lits = ref [] in
(* first, process new terms, if any *) (* first, process new terms, if any *)
while not (Vec.is_empty self.unprocessed) do while not (Vec.is_empty self.unprocessed) do
let t = Vec.pop_exn self.unprocessed in let t = Vec.pop_exn self.unprocessed in
@ -66,12 +66,12 @@ let pop_new_lits (self : t) : Lit.t list =
if not (T.Set.mem t set_for_ty) then ( if not (T.Set.mem t set_for_ty) then (
Stat.incr self.n_terms; Stat.incr self.n_terms;
(* now create [t=u] for each [u] in [set_for_ty] *) (* now create [t=u] for each [u] in [set_for_ty], and add it to [lits] *)
T.Set.iter T.Set.iter
(fun u -> (fun u ->
let lit = Lit.make_eq self.tst t u in let lit = Lit.make_eq self.tst t u in
Stat.incr self.n_lits; Stat.incr self.n_lits;
Vec.push self.new_lits lit) lits := lit :: !lits)
set_for_ty; set_for_ty;
(* add [t] to the set of processed terms *) (* add [t] to the set of processed terms *)
@ -80,6 +80,4 @@ let pop_new_lits (self : t) : Lit.t list =
) )
done; done;
let lits = Vec.to_list self.new_lits in !lits
Vec.clear self.new_lits;
lits