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

Added stack to delay adding of pushed clauses

Browse source
This commit is contained in:
Guillaume Bury 2016-07-08 17:54:29 +02:00
parent 291a9d9a7f
commit dcc410c8a0
2 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/core/internal.ml
View file

@ -36,9 +36,12 @@ module Make
type env = { type env = {
clauses_hyps : clause Vec.t; clauses_hyps : clause Vec.t;
(* all currently active clauses *) (* clauses assumed (subject to user levels) *)
clauses_learnt : clause Vec.t; clauses_learnt : clause Vec.t;
(* learnt clauses *) (* learnt clauses (true at anytime, whatever the user level) *)
clauses_pushed : clause Stack.t;
(* Clauses pushed, waiting to be added as learnt. *)
mutable unsat_conflict : clause option; mutable unsat_conflict : clause option;
(* conflict clause at decision level 0, if any *) (* conflict clause at decision level 0, if any *)
@ -116,6 +119,7 @@ module Make
clauses_hyps = Vec.make 0 dummy_clause; clauses_hyps = Vec.make 0 dummy_clause;
clauses_learnt = Vec.make 0 dummy_clause; clauses_learnt = Vec.make 0 dummy_clause;
clauses_pushed = Stack.create ();
th_head = 0; th_head = 0;
elt_head = 0; elt_head = 0;
@ -249,7 +253,7 @@ module Make
To be more general, the heap only stores the variable/litteral id (i.e an int). To be more general, the heap only stores the variable/litteral id (i.e an int).
When we add a variable (which wraps a formula), we also need to add all When we add a variable (which wraps a formula), we also need to add all
its subterms. its subterms.
*) *)
let insert_var_order = function let insert_var_order = function
| Either.Left l -> Iheap.insert f_weight env.order l.lid | Either.Left l -> Iheap.insert f_weight env.order l.lid
| Either.Right v -> | Either.Right v ->
@ -825,7 +829,8 @@ module Make
Iheap.grow_to_by_double env.order (St.nb_elt ()); Iheap.grow_to_by_double env.order (St.nb_elt ());
List.iter (fun a -> insert_var_order (elt_of_var a.var)) atoms; List.iter (fun a -> insert_var_order (elt_of_var a.var)) atoms;
let c = make_clause (fresh_tname ()) atoms (List.length atoms) true (Lemma lemma) base_level in let c = make_clause (fresh_tname ()) atoms (List.length atoms) true (Lemma lemma) base_level in
add_clause c Log.debugf 10 "Pushing clause %a" (fun k->k St.pp_clause c);
Stack.push c env.clauses_pushed
let slice_propagate f lvl = let slice_propagate f lvl =
let a = atom f in let a = atom f in
@ -833,20 +838,20 @@ module Make
enqueue_bool a lvl (Semantic lvl) enqueue_bool a lvl (Semantic lvl)
let current_slice () = { let current_slice () = {
Plugin_intf.start = env.th_head; Plugin_intf.start = env.th_head;
length = (Vec.size env.elt_queue) - env.th_head; length = (Vec.size env.elt_queue) - env.th_head;
get = slice_get; get = slice_get;
push = slice_push; push = slice_push;
propagate = slice_propagate; propagate = slice_propagate;
} }
let full_slice () = { let full_slice () = {
Plugin_intf.start = 0; Plugin_intf.start = 0;
length = Vec.size env.elt_queue; length = Vec.size env.elt_queue;
get = slice_get; get = slice_get;
push = slice_push; push = slice_push;
propagate = (fun _ -> assert false); propagate = (fun _ -> assert false);
} }
let rec theory_propagate () = let rec theory_propagate () =
assert (env.elt_head = Vec.size env.elt_queue); assert (env.elt_head = Vec.size env.elt_queue);
@ -867,6 +872,11 @@ module Make
end end
and propagate () = and propagate () =
(* First, treat the pushed clause stack *)
while not (Stack.is_empty env.clauses_pushed) do
add_clause (Stack.pop env.clauses_pushed)
done;
(* Now, check that the situation is sane *)
if env.elt_head > Vec.size env.elt_queue then if env.elt_head > Vec.size env.elt_queue then
assert false assert false
else if env.elt_head = Vec.size env.elt_queue then else if env.elt_head = Vec.size env.elt_queue then

9
src/core/solver_types.ml
View file

@ -139,10 +139,11 @@ module McMake (E : Expr_intf.S)(Dummy : sig end) = struct
Vec.push vars (Either.mk_left res); Vec.push vars (Either.mk_left res);
res res
let make_boolean_var : formula -> var * Formula_intf.negated = let make_boolean_var : formula -> var * Expr_intf.negated =
fun lit -> fun t ->
let lit, negated = E.norm lit in let lit, negated = E.norm t in
try MF.find f_map lit, negated try
MF.find f_map lit, negated
with Not_found -> with Not_found ->
let cpt_fois_2 = !cpt_mk_var lsl 1 in let cpt_fois_2 = !cpt_mk_var lsl 1 in
let rec var = let rec var =