Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajreynol
ajreynol committed Dec 19, 2024
1 parent 9914b82 commit ff8fecf
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 28 deletions.
89 changes: 68 additions & 21 deletions src/theory/arith/arith_proof_rcons.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,37 @@
#include "proof/proof.h"
#include "theory/arith/arith_msum.h"
#include "theory/arith/arith_subs.h"
#include "proof/conv_proof_generator.h"
#include "expr/term_context.h"

namespace cvc5::internal {
namespace theory {
namespace arith {

/**
* Arithmetic substitution term context.
*/
class ArithSubsTermContext : public TermContext
{
public:
ArithSubsTermContext() {}
/** The initial value: valid. */
uint32_t initialValue() const override { return 0; }
/** Compute the value of the index^th child of t whose hash is tval */
uint32_t computeValue(TNode t, uint32_t tval, size_t index) const override
{
if (tval==0)
{
// if we should not traverse, return 1
if (!ArithSubs::shouldTraverse(t))
{
return 1;
}
return 0;
}
return tval;
}
};

ArithProofRCons::ArithProofRCons(Env& env, TrustId id) : EnvObj(env), d_id(id)
{
Expand Down Expand Up @@ -50,7 +77,9 @@ std::shared_ptr<ProofNode> ArithProofRCons::getProofFor(Node fact)
}
ArithSubs asubs;
std::vector<Node> assumpsNoSolve;
std::vector<Node> assumpsSolve;
ArithSubsTermContext astc;
TConvProofGenerator tcnv(d_env, nullptr, TConvPolicy::FIXPOINT, TConvCachePolicy::NEVER,
"ArithRConsTConv", &astc);
Node tgtAssump;
// prove false
for (const Node& a : assumps)
Expand All @@ -63,17 +92,21 @@ std::shared_ptr<ProofNode> ArithProofRCons::getProofFor(Node fact)
continue;
}
Node as = asubs.applyArith(a);
as = rewrite(as);
Node asr = rewrite(as);
Trace("arith-proof-rcons")
<< "...under subs+rewrite: " << as << std::endl;
if (as == d_false)
<< "...under subs+rewrite: " << asr << std::endl;
if (asr == d_false)
{
Trace("arith-proof-rcons") << "...success!" << std::endl;
std::vector<Node> pargs;
pargs.push_back(a);
pargs.insert(pargs.end(), assumpsSolve.begin(), assumpsSolve.end());
if (a!=as)
{
std::shared_ptr<ProofNode> pfn = tcnv.getProofForRewriting(a);
Assert (pfn.getResult()[1]==as);
cdp.addProof(pfn);
cdp.addStep(as, ProofRule::EQ_RESOLVE, {a, a.eqNode(as)}, {});
}
cdp.addStep(
d_false, ProofRule::MACRO_SR_PRED_TRANSFORM, pargs, {d_false});
d_false, ProofRule::MACRO_SR_PRED_TRANSFORM, {as}, {d_false});
success = true;
break;
}
Expand All @@ -96,12 +129,19 @@ std::shared_ptr<ProofNode> ArithProofRCons::getProofFor(Node fact)
Trace("arith-proof-rcons")
<< "...solved " << m.first << " = " << val << std::endl;
Node eq = m.first.eqNode(val);
std::vector<Node> pargs;
pargs.push_back(a);
pargs.insert(pargs.end(), assumpsSolve.begin(), assumpsSolve.end());
cdp.addStep(eq, ProofRule::MACRO_SR_PRED_TRANSFORM, pargs, {eq});
assumpsSolve.push_back(eq);
if (a!=as)
{
std::shared_ptr<ProofNode> pfn = tcnv.getProofForRewriting(a);
Assert (pfn.getResult()[1]==as);
cdp.addProof(pfn);
cdp.addStep(as, ProofRule::EQ_RESOLVE, {a, a.eqNode(as)}, {});
}
if (as!=eq)
{
cdp.addStep(eq, ProofRule::MACRO_SR_PRED_TRANSFORM, {as}, {eq});
}
asubs.add(m.first, val);
tcnv.addRewriteStep(m.first, val, &cdp);
break;
}
}
Expand All @@ -123,14 +163,21 @@ std::shared_ptr<ProofNode> ArithProofRCons::getProofFor(Node fact)
for (const Node& a : assumpsNoSolve)
{
Node as = asubs.applyArith(a);
as = rewrite(as);
Trace("arith-proof-rcons") << "...have " << as << std::endl;
std::vector<Node> pargs;
pargs.push_back(a);
pargs.insert(pargs.end(), assumpsSolve.begin(), assumpsSolve.end());
cdp.addStep(as, ProofRule::MACRO_SR_PRED_TRANSFORM, pargs, {as});
bool pol = as.getKind() != Kind::NOT;
Node aslit = pol ? as : as[0];
Node asr = rewrite(as);
Trace("arith-proof-rcons") << "...have " << asr << std::endl;
if (a!=as)
{
std::shared_ptr<ProofNode> pfn = tcnv.getProofForRewriting(a);
Assert (pfn.getResult()[1]==as);
cdp.addProof(pfn);
cdp.addStep(as, ProofRule::EQ_RESOLVE, {a, a.eqNode(as)}, {});
}
if (as!=asr)
{
cdp.addStep(asr, ProofRule::MACRO_SR_PRED_TRANSFORM, {as}, {asr});
}
bool pol = asr.getKind() != Kind::NOT;
Node aslit = pol ? asr : asr[0];
itp = pols.find(aslit);
if (itp != pols.end())
{
Expand Down
23 changes: 16 additions & 7 deletions src/theory/arith/arith_subs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ Node ArithSubs::applyArith(const Node& n, bool traverseNlMult) const
if (it == visited.end())
{
visited[cur] = Node::null();
Kind ck = cur.getKind();
auto s = find(cur);
if (s)
{
Expand All @@ -60,12 +59,7 @@ Node ArithSubs::applyArith(const Node& n, bool traverseNlMult) const
}
else
{
TheoryId ctid = theory::kindToTheoryId(ck);
if ((ctid != THEORY_ARITH && ctid != THEORY_BOOL
&& ctid != THEORY_BUILTIN)
|| isTranscendentalKind(ck)
|| (!traverseNlMult
&& (ck == Kind::NONLINEAR_MULT || ck == Kind::IAND)))
if (!shouldTraverse(cur))
{
// Do not traverse beneath applications that belong to another theory
// besides (core) arithmetic. Notice that transcendental function
Expand Down Expand Up @@ -111,6 +105,21 @@ Node ArithSubs::applyArith(const Node& n, bool traverseNlMult) const
return visited[n];
}

bool ArithSubs::shouldTraverse(const Node& n, bool traverseNlMult)
{
Kind k = n.getKind();
TheoryId ctid = theory::kindToTheoryId(k);
if ((ctid != THEORY_ARITH && ctid != THEORY_BOOL
&& ctid != THEORY_BUILTIN)
|| isTranscendentalKind(k)
|| (!traverseNlMult
&& (k == Kind::NONLINEAR_MULT || k == Kind::IAND)))
{
return false;
}
return true;
}

} // namespace arith
} // namespace theory
} // namespace cvc5::internal
4 changes: 4 additions & 0 deletions src/theory/arith/arith_subs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ class ArithSubs : public Subs
* @param traverseNlMult Whether to traverse applications of NONLINEAR_MULT.
*/
Node applyArith(const Node& n, bool traverseNlMult = true) const;
/**
* Should traverse, returns true if the above method traverses n.
*/
static bool shouldTraverse(const Node& n, bool traverseNlMult = true);
};

} // namespace arith
Expand Down

0 comments on commit ff8fecf

Please sign in to comment.