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

fix compilation error

Browse source
This commit is contained in:
Simon Cruanes 2021-09-27 12:18:37 -04:00
parent c2b1bd038d
commit c7511b2934
No known key found for this signature in database
GPG key ID: 4AC01D0849AA62B6
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/sat/Solver.ml
View file

@ -1169,18 +1169,18 @@ module Make(Plugin : PLUGIN)
(* minimize conflict by removing atoms whose propagation history
is ultimately self-subsuming with [lits] *)
let minimize_conflict (self:t) (_c_level:int)
(learnt: atom Vec.t) : unit =
(learnt: AVec.t) : unit =
let store = self.store in
(* abstraction of the levels involved in the conflict at all,
as logical "or" of each literal's approximate level *)
let abstract_levels =
Vec.fold (fun lvl a -> lvl lor abstract_level_ self (Atom.var a)) 0 learnt
AVec.fold_left (fun lvl a -> lvl lor abstract_level_ self (Atom.var a)) 0 learnt
in
let j = ref 1 in
for i=1 to Vec.size learnt - 1 do
let a = Vec.get learnt i in
for i=1 to AVec.size learnt - 1 do
let a = AVec.get learnt i in
let keep =
begin match Atom.reason store a with
| Some Decision -> true (* always keep decisions *)
@ -1190,13 +1190,13 @@ module Make(Plugin : PLUGIN)
end
in
if keep then (
Vec.set learnt !j a;
AVec.set learnt !j a;
incr j
) else (
Stat.incr self.n_minimized_away;
)
done;
Vec.shrink learnt !j;
AVec.shrink learnt !j;
()
(* result of conflict analysis, containing the learnt clause and some

7
src/util/Vec_sig.ml
View file

@ -44,6 +44,8 @@ module type EXTENSIONS = sig
val to_array : t -> elt array
val fold_left : ('a -> elt -> 'a) -> 'a -> t -> 'a
val pp : elt CCFormat.printer -> t CCFormat.printer
end
@ -69,6 +71,11 @@ module Make_extensions(B: BASE_RO)
a
)
let fold_left f acc self =
let r = ref acc in
iter self ~f:(fun x -> r := f !r x);
!r
let pp ppx out self =
Format.fprintf out "[@[";
iteri self