From: ajreynol Date: Wed, 31 May 2017 18:06:35 +0000 (-0500) Subject: Change to-int, div, int-div skolems from CDAttribute to stored in CDHashMap. Minor... X-Git-Tag: cvc5-1.0.0~5785 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=97f67691287a001412dbb2ddb4a372f204b27498;p=cvc5.git Change to-int, div, int-div skolems from CDAttribute to stored in CDHashMap. Minor changes to smt comp script. --- diff --git a/contrib/run-script-smtcomp2017 b/contrib/run-script-smtcomp2017 index 8a0ff92ea..9af6fffd0 100644 --- a/contrib/run-script-smtcomp2017 +++ b/contrib/run-script-smtcomp2017 @@ -42,7 +42,7 @@ QF_NIA) finishwith --solve-int-as-bv=32 --bitblast=eager --bv-sat-solver=cryptominisat ;; QF_NRA) - trywith 300 --nl-ext --nl-ext-tplanes + finishwith --nl-ext --nl-ext-tplanes ;; ALIA|AUFLIA|AUFLIRA|AUFNIRA|UF|UFIDL|UFLIA|UFLRA|UFNIA) # the following is designed for a run time of 2400s (40 min). @@ -83,8 +83,8 @@ ALIA|AUFLIA|AUFLIRA|AUFNIRA|UF|UFIDL|UFLIA|UFLRA|UFNIA) ;; BV|UFBV) # many problems in UFBV are essentially BV - trywith 30 --full-saturate-quant - trywith 30 --finite-model-find + trywith 300 --full-saturate-quant + trywith 300 --finite-model-find finishwith --full-saturate-quant --decision=internal ;; LIA|LRA) diff --git a/src/theory/arith/theory_arith_private.cpp b/src/theory/arith/theory_arith_private.cpp index 1b97dceb2..23b846946 100644 --- a/src/theory/arith/theory_arith_private.cpp +++ b/src/theory/arith/theory_arith_private.cpp @@ -80,25 +80,6 @@ namespace CVC4 { namespace theory { namespace arith { -namespace attr { - struct ToIntegerTag { }; - struct LinearIntDivTag { }; - struct LinearDivTag { }; -}/* CVC4::theory::arith::attr namespace */ - -/** - * This attribute maps the child of a to_int / is_int to the - * corresponding integer skolem. - */ -typedef expr::CDAttribute ToIntegerAttr; - -/** - * This attribute maps division-by-constant-k terms to a variable - * used to eliminate them. - */ -typedef expr::CDAttribute LinearIntDivAttr; -typedef expr::CDAttribute LinearDivAttr; - static Node toSumNode(const ArithVariables& vars, const DenseMap& sum); static double fRand(double fMin, double fMax); static bool complexityBelow(const DenseMap& row, uint32_t cap); @@ -160,7 +141,10 @@ TheoryArithPrivate::TheoryArithPrivate(TheoryArith& containing, context::Context d_dioSolveResources(0), d_solveIntMaybeHelp(0u), d_solveIntAttempts(0u), - d_statistics() + d_statistics(), + d_to_int_skolem(u), + d_div_skolem(u), + d_int_div_skolem(u) { srand(79); @@ -230,27 +214,6 @@ static void resolve(ConstraintCPVec& buf, ConstraintP c, const ConstraintCPVec& // return safeConstructNary(nb); } -// Returns a skolem variable that is constrained to equal -// division_total(num, den) in the current context. May add lemmas to out. -static Node getSkolemConstrainedToDivisionTotal( - Node num, Node den, OutputChannel* out) { - NodeManager* nm = NodeManager::currentNM(); - Node total_div_node = nm->mkNode(kind::DIVISION_TOTAL, num, den); - Node total_div_skolem; - if(total_div_node.getAttribute(LinearDivAttr(), total_div_skolem)) { - return total_div_skolem; - } - total_div_skolem = nm->mkSkolem("DivisionTotalSkolem", nm->realType(), - "the result of a div term"); - total_div_node.setAttribute(LinearDivAttr(), total_div_skolem); - Node zero = mkRationalNode(0); - Node lemma = den.eqNode(zero).iteNode( - total_div_skolem.eqNode(zero), num.eqNode(mkMult(total_div_skolem, den))); - out->lemma(lemma); - return total_div_skolem; -} - - // Integer division axioms: // These concenrate the high level constructs needed to constrain the functions: // div, mod, div_total and mod_total. @@ -345,24 +308,6 @@ Node mkAxiomForTotalIntMod(Node m, Node n, Node q, Node r) { // when_den_is_zero); // } -// Returns a skolem variable that is constrained to equal -// integer_division_total(num, den) in the current context. May add lemmas to -// out. -static Node getSkolemConstrainedToIntegerDivisionTotal( - Node num, Node den, OutputChannel* out) { - NodeManager* nm = NodeManager::currentNM(); - Node total_div_node = nm->mkNode(kind::INTS_DIVISION_TOTAL, num, den); - Node total_div_skolem; - if(total_div_node.getAttribute(LinearIntDivAttr(), total_div_skolem)) { - return total_div_skolem; - } - total_div_skolem = nm->mkSkolem("linearIntDiv", nm->integerType(), - "the result of an intdiv term"); - total_div_node.setAttribute(LinearIntDivAttr(), total_div_skolem); - out->lemma(mkAxiomForTotalIntDivision(num, den, total_div_skolem)); - return total_div_skolem; -} - void TheoryArithPrivate::setMasterEqualityEngine(eq::EqualityEngine* eq) { d_congruenceManager.setMasterEqualityEngine(eq); } @@ -1230,16 +1175,19 @@ Node TheoryArithPrivate::ppRewriteTerms(TNode n) { case kind::TO_INTEGER: case kind::IS_INTEGER: { Node toIntSkolem; - if(!n[0].getAttribute(ToIntegerAttr(), toIntSkolem)) { + NodeMap::const_iterator it = d_to_int_skolem.find( n[0] ); + if( it==d_to_int_skolem.end() ){ toIntSkolem = nm->mkSkolem("toInt", nm->integerType(), "a conversion of a Real term to its Integer part"); - n[0].setAttribute(ToIntegerAttr(), toIntSkolem); + d_to_int_skolem[n[0]] = toIntSkolem; // n[0] - 1 < toIntSkolem <= n[0] // -1 < toIntSkolem - n[0] <= 0 // 0 <= n[0] - toIntSkolem < 1 Node one = mkRationalNode(1); Node lem = mkAxiomForTotalIntDivision(n[0], one, toIntSkolem); d_containing.d_out->lemma(lem); + }else{ + toIntSkolem = (*it).second; } if(k == kind::IS_INTEGER) { return nm->mkNode(kind::EQUAL, n[0], toIntSkolem); @@ -1253,32 +1201,6 @@ Node TheoryArithPrivate::ppRewriteTerms(TNode n) { // these should be removed during expand definitions Assert( false ); break; -/*//AJR : This version seems to cause memory corruption, see bugs 803-805 - // The only difference w.r.t the code below is that the integer division skolem is shared between MOD AND DIV terms. - // There may be an issue related to garbage collection on attributes, TODO : revisit this. - case kind::INTS_MODULUS_TOTAL: - case kind::INTS_DIVISION_TOTAL: { - Node den = Rewriter::rewrite(n[1]); - if (!options::rewriteDivk() && den.isConst()) { - return n; - } - Node num = Rewriter::rewrite(n[0]); - if( k == kind::INTS_MODULUS_TOTAL ){ - Node dk = getSkolemConstrainedToIntegerDivisionTotal(num, den, d_containing.d_out); - return node = nm->mkNode(kind::MINUS, num, nm->mkNode(kind::MULT, den, dk)); - } else{ - - Assert(k == kind::INTS_DIVISION_TOTAL); - return getSkolemConstrainedToIntegerDivisionTotal(num, den, d_containing.d_out); - } - } - case kind::DIVISION_TOTAL: { - Node num = Rewriter::rewrite(n[0]); - Node den = Rewriter::rewrite(n[1]); - Assert(!den.isConst()); - return getSkolemConstrainedToDivisionTotal(num, den, d_containing.d_out); - } - */ case kind::INTS_DIVISION_TOTAL: case kind::INTS_MODULUS_TOTAL: { @@ -1289,9 +1211,10 @@ Node TheoryArithPrivate::ppRewriteTerms(TNode n) { Node num = Rewriter::rewrite(n[0]); Node intVar; Node rw = nm->mkNode(k, num, den); - if(!rw.getAttribute(LinearIntDivAttr(), intVar)) { + NodeMap::const_iterator it = d_int_div_skolem.find( rw ); + if( it==d_int_div_skolem.end() ){ intVar = nm->mkSkolem("linearIntDiv", nm->integerType(), "the result of an intdiv-by-k term"); - rw.setAttribute(LinearIntDivAttr(), intVar); + d_div_skolem[rw] = intVar; Node lem; if (den.isConst()) { const Rational& rat = den.getConst(); @@ -1317,6 +1240,8 @@ Node TheoryArithPrivate::ppRewriteTerms(TNode n) { if( !lem.isNull() ){ d_containing.d_out->lemma(lem); } + }else{ + intVar = (*it).second; } if( k==kind::INTS_MODULUS_TOTAL ){ Node node = nm->mkNode(kind::MINUS, num, nm->mkNode(kind::MULT, den, intVar)); @@ -1332,10 +1257,13 @@ Node TheoryArithPrivate::ppRewriteTerms(TNode n) { Assert(!den.isConst()); Node var; Node rw = nm->mkNode(k, num, den); - if(!rw.getAttribute(LinearDivAttr(), var)) { + NodeMap::const_iterator it = d_div_skolem.find( rw ); + if( it==d_div_skolem.end() ){ var = nm->mkSkolem("nonlinearDiv", nm->realType(), "the result of a non-linear div term"); - rw.setAttribute(LinearDivAttr(), var); + d_div_skolem[rw] = var; d_containing.d_out->lemma(nm->mkNode(kind::IMPLIES, den.eqNode(nm->mkConst(Rational(0))).negate(), nm->mkNode(kind::MULT, den, var).eqNode(num))); + }else{ + var = (*it).second; } return var; break; diff --git a/src/theory/arith/theory_arith_private.h b/src/theory/arith/theory_arith_private.h index b73877dc1..a56028f32 100644 --- a/src/theory/arith/theory_arith_private.h +++ b/src/theory/arith/theory_arith_private.h @@ -848,8 +848,16 @@ private: * semantics. Needed to deal with partial function "mod". */ Node d_modZero; - - + + /** + * Maps for Skolems for to-integer, real/integer div-by-k. + * Introduced during ppRewriteTerms. + */ + typedef context::CDHashMap< Node, Node, NodeHashFunction > NodeMap; + NodeMap d_to_int_skolem; + NodeMap d_div_skolem; + NodeMap d_int_div_skolem; + };/* class TheoryArithPrivate */ }/* CVC4::theory::arith namespace */