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

Fixed typos in clause simplification

Browse source
This commit is contained in:
Guillaume Bury 2015-10-20 16:48:43 +02:00
parent ac5e8a9766
commit e2cac78d39
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
solver/internal.ml
View file

@ -508,12 +508,12 @@ module Make (L : Log_intf.S)(St : Solver_types.S)
if a.is_true then raise Trivial; if a.is_true then raise Trivial;
if a.neg.is_true then begin if a.neg.is_true then begin
match a.var.reason with match a.var.reason with
| Bcp (Some cl) -> atoms, true, max lvl cl.c_level | Bcp (Some cl) -> atoms, false, max lvl cl.c_level
| _ -> assert false | _ -> assert false
end else end else
a::atoms, init, lvl a::atoms, init, lvl
in in
let atoms, init, lvl = List.fold_left aux ([], false, level0) atoms in let atoms, init, lvl = List.fold_left aux ([], true, level0) atoms in
List.fast_sort (fun a b -> a.var.vid - b.var.vid) atoms, init, lvl List.fast_sort (fun a b -> a.var.vid - b.var.vid) atoms, init, lvl
let partition atoms init0 = let partition atoms init0 =
@ -527,7 +527,7 @@ module Make (L : Log_intf.S)(St : Solver_types.S)
if a.var.level = 0 then begin if a.var.level = 0 then begin
match a.var.reason with match a.var.reason with
| Bcp (Some cl) -> | Bcp (Some cl) ->
partition_aux trues unassigned falses true (max lvl cl.c_level) r partition_aux trues unassigned falses false (max lvl cl.c_level) r
| _ -> assert false | _ -> assert false
end else end else
partition_aux trues unassigned (a::falses) init lvl r partition_aux trues unassigned (a::falses) init lvl r
@ -542,7 +542,7 @@ module Make (L : Log_intf.S)(St : Solver_types.S)
let add_clause ?tag name atoms history = let add_clause ?tag name atoms history =
if env.is_unsat then raise Unsat; (* is it necessary ? *) if env.is_unsat then raise Unsat; (* is it necessary ? *)
let init_name = name in let init_name = name in
let c_level = current_level () in let c_level = current_level () in
let init0 = make_clause ?tag init_name atoms (List.length atoms) (history <> History []) history c_level in let init0 = make_clause ?tag init_name atoms (List.length atoms) (history <> History []) history c_level in
L.debug 10 "Adding clause : %a" St.pp_clause init0; L.debug 10 "Adding clause : %a" St.pp_clause init0;
try try