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

Fix proofs with local assumptions

Browse source
This commit is contained in:
Guillaume Bury 2016-07-29 13:35:05 +02:00
parent 51c76479b9
commit a32b35e994
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/core/internal.ml
View file

@ -321,14 +321,15 @@ module Make
Motivation: it is better to watch true literals, and then unassigned literals. Motivation: it is better to watch true literals, and then unassigned literals.
*) *)
let partition atoms : atom list * clause list = let partition root atoms : atom list * clause list =
let rec partition_aux trues unassigned falses history i = let rec partition_aux root trues unassigned falses history i =
if i >= Array.length atoms then if i >= Array.length atoms then
trues @ unassigned @ falses, history trues @ unassigned @ falses, history
else begin else begin
let a = atoms.(i) in let a = atoms.(i) in
if a.is_true then if a.is_true then
if a.var.v_level = 0 then let l = a.var.v_level in
if 0 <= l && l <= root then
raise Trivial raise Trivial
(* A var true at level 0 gives a trivially true clause *) (* A var true at level 0 gives a trivially true clause *)
else else
@ -337,25 +338,28 @@ module Make
(* A var true at level > 0 does not change anything, but is unlikely (* A var true at level > 0 does not change anything, but is unlikely
to be watched, so we put prefer to put them at the end. *) to be watched, so we put prefer to put them at the end. *)
else if a.neg.is_true then else if a.neg.is_true then
if a.var.v_level = 0 then begin let l = a.var.v_level in
if 0 <= l && l <= root then begin
match a.var.reason with match a.var.reason with
| Some (Bcp cl) -> | Some (Bcp cl) ->
partition_aux trues unassigned falses (cl :: history) (i + 1) partition_aux root trues unassigned falses (cl :: history) (i + 1)
(* Same as before, a var false at level 0 can be eliminated from the clause, (* Same as before, a var false at level 0 can be eliminated from the clause,
but we need to kepp in mind that we used another clause to simplify it. *) but we need to kepp in mind that we used another clause to simplify it. *)
| Some (Semantic 0) -> | Some (Semantic n) when 0 <= n && n <= root ->
partition_aux trues unassigned falses history (i + 1) partition_aux root trues unassigned falses history (i + 1)
(* TODO: get a proof of the propagation. *)
| _ -> assert false | _ -> assert false
end else end else
partition_aux trues unassigned (a::falses) history (i + 1) partition_aux root trues unassigned (a::falses) history (i + 1)
else else
partition_aux trues (a::unassigned) falses history (i + 1) partition_aux root trues (a::unassigned) falses history (i + 1)
end end
in in
assert (0 <= root);
if decision_level () = 0 then if decision_level () = 0 then
simplify_zero atoms simplify_zero atoms
else else
partition_aux [] [] [] [] 0 partition_aux root [] [] [] [] 0
(* Making a decision. (* Making a decision.
@ -470,7 +474,7 @@ module Make
be able to build a correct proof at the end of proof search. *) be able to build a correct proof at the end of proof search. *)
let simpl_reason : reason -> reason = function let simpl_reason : reason -> reason = function
| (Bcp cl) as r -> | (Bcp cl) as r ->
let l, history = partition cl.atoms in let l, history = partition env.base_level cl.atoms in
begin match l with begin match l with
| [ a ] -> | [ a ] ->
if history = [] then r if history = [] then r
@ -496,7 +500,7 @@ module Make
if not a.is_true then begin if not a.is_true then begin
assert (a.var.v_level < 0 && a.var.reason = None && lvl >= 0); assert (a.var.v_level < 0 && a.var.reason = None && lvl >= 0);
let reason = let reason =
if lvl > 0 then reason if lvl > env.base_level then reason
else simpl_reason reason else simpl_reason reason
in in
a.is_true <- true; a.is_true <- true;
@ -767,7 +771,7 @@ module Make
| History _ -> assert false | History _ -> assert false
in in
try try
let atoms, history = partition init.atoms in let atoms, history = partition 0 init.atoms in
let clause = let clause =
if history = [] then init if history = [] then init
else make_clause ?tag:init.tag (fresh_name ()) atoms (History (init :: history)) else make_clause ?tag:init.tag (fresh_name ()) atoms (History (init :: history))