From: Alex Ozdemir Date: Mon, 16 Mar 2020 19:17:43 +0000 (-0700) Subject: Only save farkas+tightening proofs. Error on holes X-Git-Tag: cvc5-1.0.0~3486 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=905d77664cdedb5d1f3fec91c32c5033a0618e67;p=cvc5.git Only save farkas+tightening proofs. Error on holes I'll remove the error later --- diff --git a/src/proof/arith_proof.cpp b/src/proof/arith_proof.cpp index 7deb22d48..2660f723f 100644 --- a/src/proof/arith_proof.cpp +++ b/src/proof/arith_proof.cpp @@ -1156,8 +1156,10 @@ void LFSCArithProof::printTheoryLemmaProof(std::vector& lemma, } else { + AlwaysAssert(false) << "arith hole!"; os << "\n; Arithmetic proofs which use reasoning more complex than Farkas " - "proofs are currently unsupported\n(clausify_false trust)\n"; + "proofs and bound tightening are currently unsupported\n" + "(clausify_false trust)\n"; } } diff --git a/src/theory/arith/theory_arith_private.cpp b/src/theory/arith/theory_arith_private.cpp index 6c226bb61..fb71bb1b1 100644 --- a/src/theory/arith/theory_arith_private.cpp +++ b/src/theory/arith/theory_arith_private.cpp @@ -2188,8 +2188,11 @@ void TheoryArithPrivate::outputConflicts(){ } Assert(conflict.getNumChildren() == pf.d_farkasCoefficients->size()); - d_containing.d_proofRecorder->saveFarkasCoefficients( - conflictInFarkasCoefficientOrder, pf.d_farkasCoefficients); + if (confConstraint->hasSimpleFarkasProof()) + { + d_containing.d_proofRecorder->saveFarkasCoefficients( + conflictInFarkasCoefficientOrder, pf.d_farkasCoefficients); + } }) if(Debug.isOn("arith::normalize::external")){ conflict = flattenAndSort(conflict); @@ -4951,8 +4954,11 @@ bool TheoryArithPrivate::rowImplicationCanBeApplied(RowIndex ridx, bool rowUp, C Assert(coeffs != RationalVectorPSentinel); Assert(conflictInFarkasCoefficientOrder.getNumChildren() == coeffs->size()); - d_containing.d_proofRecorder->saveFarkasCoefficients( - conflictInFarkasCoefficientOrder, coeffs); + if (implied->hasSimpleFarkasProof()) + { + d_containing.d_proofRecorder->saveFarkasCoefficients( + conflictInFarkasCoefficientOrder, coeffs); + } }) outputLemma(clause); }else{