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

fix(sat): bug with re-internalization of terms upon backtracking

Browse source
This commit is contained in:
Simon Cruanes 2018-08-18 17:20:20 -05:00
parent 162b6fad98
commit 46ff8c3ba6
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sat/Internal.ml
View file

@ -769,12 +769,13 @@ module Make (Th : Theory_intf.S) = struct
if not (Var.in_heap v) && Var.level v < 0 then ( if not (Var.in_heap v) && Var.level v < 0 then (
(* new variable that is not assigned, add to heap and to theory. *) (* new variable that is not assigned, add to heap and to theory. *)
H.insert st.order v; H.insert st.order v;
Th.add_formula (Lazy.force st.th) v.v_pa.lit;
Th.add_formula (Lazy.force st.th) v.v_na.lit;
) )
(* attach an atom by deciding on its variable, if needed *) (* attach an atom by deciding on its variable, if needed *)
let[@inline] attach_atom (st:t) (a:atom) : unit = insert_var_order st a.var let attach_atom (st:t) (a:atom) : unit =
insert_var_order st a.var;
Th.add_formula (Lazy.force st.th) a.lit;
Th.add_formula (Lazy.force st.th) a.neg.lit
(* Rather than iterate over all the heap when we want to decrease all the (* Rather than iterate over all the heap when we want to decrease all the
variables/literals activity, we instead increase the value by which variables/literals activity, we instead increase the value by which
@ -1557,6 +1558,7 @@ module Make (Th : Theory_intf.S) = struct
call_solve() call_solve()
| exception Sat -> | exception Sat ->
assert (st.elt_head = Vec.size st.trail); assert (st.elt_head = Vec.size st.trail);
check_invariants st;
begin match Th.if_sat (theory st) (full_slice st) with begin match Th.if_sat (theory st) (full_slice st) with
| Theory_intf.Sat -> | Theory_intf.Sat ->
(* if no propagation is to be done, exit; (* if no propagation is to be done, exit;