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

fix(LRA): track explanations properly when rewriting with an equality

Browse source
This commit is contained in:
Simon Cruanes 2020-11-13 23:58:14 -05:00
parent df25e84a01
commit b2ab465cff
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/arith/lra/fourier_motzkin.ml
View file

@ -315,8 +315,13 @@ module Make(A : ARG)
let le = LE.remove x le in let le = LE.remove x le in
LE.( le + q * le1 ) LE.( le + q * le1 )
let subst_constr x c ~by : Constr.t = let subst_constr ~tag x c ~by : Constr.t =
let c = {c with Constr.le=subst_le x ~by c.Constr.le} in let open Constr in
let c = {
c with
le=subst_le x ~by c.le;
tag=tag @ c.tag;
} in
Constr.normalize c Constr.normalize c
let rec solve_ (self:system) : res = let rec solve_ (self:system) : res =
@ -338,9 +343,9 @@ module Make(A : ARG)
(* substitute using [c0] in the other constraints containing [v] *) (* substitute using [c0] in the other constraints containing [v] *)
assert (c0.pred = Eq); assert (c0.pred = Eq);
let c0 = LE.normalize_wrt v c0.le in let l0 = LE.normalize_wrt v c0.le in
(* turn equation [c0] into [v = rhs] *) (* turn equation [c0] into [v = rhs] *)
let rhs = LE.neg @@ LE.remove v c0 in let rhs = LE.neg @@ LE.remove v l0 in
Log.debugf 50 Log.debugf 50
(fun k->k "(@[FM.subst-from-eq@ :v %a@ :rhs %a@])" (fun k->k "(@[FM.subst-from-eq@ :v %a@ :rhs %a@])"
T.pp v LE.pp rhs); T.pp v LE.pp rhs);
@ -354,7 +359,7 @@ module Make(A : ARG)
[Iter.of_list ceq'; Iter.of_list occ_pos; Iter.of_list occ_neg] [Iter.of_list ceq'; Iter.of_list occ_pos; Iter.of_list occ_neg]
|> Iter.of_list |> Iter.of_list
|> Iter.flatten |> Iter.flatten
|> Iter.map (subst_constr v ~by:rhs) |> Iter.map (subst_constr v ~tag:c0.Constr.tag ~by:rhs)
|> Iter.fold add_sys sys |> Iter.fold add_sys sys
in in
solve_ new_sys solve_ new_sys