Skip to content

Rewrite reals #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Rewrite reals #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d4dad03
attempt to fix reals
Almazis Oct 15, 2022
fd5355c
fix
Almazis Oct 17, 2022
011a5d6
Still not fixed
Almazis Oct 17, 2022
6ef5ccb
some fixes for div rewriting
Almazis Nov 30, 2022
78b49b8
fixed cmp construction in RewriteDivs
Almazis Nov 30, 2022
8e4a2ea
some real div fixes
Almazis Dec 1, 2022
cfd4df4
Fixed rewriting, some MBP issue is still present
Almazis Dec 3, 2022
261a4cb
debugging commit
Almazis Dec 5, 2022
6bf6b11
minor changes
Almazis Dec 5, 2022
872618a
Bring back convert ints to reals for DIV
Almazis Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/ae/AeValSolver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,15 @@ namespace ufo
{
ExprSet lits;
u.getTrueLiterals(pr, m, lits, true);
pr = simplifyArithm(mixQE(conjoin(lits, efac), exp, m, u, debug));
outs() << "Lits with var : { \n";
for (auto a: lits)
if (contains(a, exp))
outs() << a << "\n";
outs() << "}\n" << std::endl;
pr = mixQE(conjoin(lits, efac), exp, m, u, debug);
if(m.eval(exp) != exp)
modelMap[exp] = mk<EQ>(exp, m.eval(exp));

if(debug)
MBPSanityCheck(m, pr);

if(debug >= 2)
{
outs() << "\nmodel " << partitioning_size << ":\n";
Expand All @@ -198,8 +200,12 @@ namespace ufo
}
outs() << "projection:\n";
pprint(pr, 2);
outs() << std::endl;
}

if(debug)
MBPSanityCheck(m, pr);

for(auto it = lits.begin(); it != lits.end();)
{
if(contains(*it, exp))
Expand All @@ -223,10 +229,14 @@ namespace ufo
{
assert(isOpX<TRUE>(m.eval(pr)));
ExprVector args;
for(auto temp : v)
ExprVector argsPr;
for(auto temp : v) {
args.push_back(temp->last());
argsPr.push_back(temp->last());
}
args.push_back(t);
boost::tribool impl = u.implies(pr, mknary<EXISTS>(args));
argsPr.push_back(pr);
boost::tribool impl = u.implies(mknary<EXISTS>(argsPr), mknary<EXISTS>(args));
tribool_assert(impl);
};

Expand Down Expand Up @@ -1267,8 +1277,8 @@ namespace ufo
minusSets(ex_qvars, fa_qvars);
}

s = convertIntsToReals<DIV>(s);
t = convertIntsToReals<DIV>(t);
s = convertIdivToDiv<DIV>(s);
t = convertIdivToDiv<DIV>(t);

if(debug >= 3)
{
Expand Down
Loading