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

refactor: a bit of cleanup in analyze

Browse source
This commit is contained in:
Simon Cruanes 2019-01-25 20:05:56 -06:00 • committed by Guillaume Bury
parent a5ec88f2a7
commit 14319f959f
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/Internal.ml
View file

@ -1303,12 +1303,12 @@ module Make(Plugin : PLUGIN)
let learnt = ref [] in let learnt = ref [] in
let cond = ref true in let cond = ref true in
let blevel = ref 0 in let blevel = ref 0 in
let seen = st.to_clear in (* for cleanup *) let to_unmark = st.to_clear in (* for cleanup *)
let c = ref (Some c_clause) in let c = ref (Some c_clause) in
let tr_ind = ref (Vec.size st.trail - 1) in let tr_ind = ref (Vec.size st.trail - 1) in
let history = ref [] in let history = ref [] in
assert (decision_level st > 0); assert (decision_level st > 0);
Vec.clear seen; Vec.clear to_unmark;
let conflict_level = let conflict_level =
Array.fold_left (fun acc p -> max acc p.var.v_level) 0 c_clause.atoms Array.fold_left (fun acc p -> max acc p.var.v_level) 0 c_clause.atoms
in in
@ -1337,7 +1337,7 @@ module Make(Plugin : PLUGIN)
); );
if not (Var.marked q.var) then ( if not (Var.marked q.var) then (
Var.mark q.var; Var.mark q.var;
Vec.push seen q.var; Vec.push to_unmark q.var;
if q.var.v_level > 0 then ( if q.var.v_level > 0 then (
var_bump_activity st q.var; var_bump_activity st q.var;
if q.var.v_level >= conflict_level then ( if q.var.v_level >= conflict_level then (
@ -1369,7 +1369,7 @@ module Make(Plugin : PLUGIN)
match !pathC, p.var.reason with match !pathC, p.var.reason with
| 0, _ -> | 0, _ ->
cond := false; cond := false;
learnt := p.neg :: (List.rev !learnt) learnt := p.neg :: List.rev !learnt
| n, Some Semantic -> | n, Some Semantic ->
assert (n > 0); assert (n > 0);
learnt := p.neg :: !learnt; learnt := p.neg :: !learnt;
@ -1380,7 +1380,8 @@ module Make(Plugin : PLUGIN)
c := Some cl c := Some cl
| _ -> assert false | _ -> assert false
done; done;
Vec.iter Var.clear seen; Vec.iter Var.clear to_unmark;
Vec.clear to_unmark;
(* put high-level literals first, so that: (* put high-level literals first, so that:
- they make adequate watch lits - they make adequate watch lits
- the first literal is the UIP, if any *) - the first literal is the UIP, if any *)