From 1f1f24f3c8618cb601b2ef95991792c7e3232a71 Mon Sep 17 00:00:00 2001 From: Clark Barrett Date: Mon, 1 Apr 2013 22:38:52 -0400 Subject: [PATCH] Turning on model based array solver for QF_AX --- src/smt/smt_engine.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp index 10a74ea5b..7bbc12551 100644 --- a/src/smt/smt_engine.cpp +++ b/src/smt/smt_engine.cpp @@ -864,24 +864,23 @@ void SmtEngine::setLogicInternal() throw() { Trace("smt") << "setting ite simplification to " << iteSimp << endl; options::doITESimp.set(iteSimp); } - // Turn off array eager index splitting for QF_AUFLIA and QF_AX + // Turn off array eager index splitting for QF_AUFLIA if(! options::arraysEagerIndexSplitting.wasSetByUser()) { if (not d_logic.isQuantified() && d_logic.isTheoryEnabled(THEORY_ARRAY) && - (d_logic.isPure(THEORY_ARRAY) || - (d_logic.isTheoryEnabled(THEORY_UF) && - d_logic.isTheoryEnabled(THEORY_ARITH)))) { + d_logic.isTheoryEnabled(THEORY_UF) && + d_logic.isTheoryEnabled(THEORY_ARITH)) { Trace("smt") << "setting array eager index splitting to false" << endl; options::arraysEagerIndexSplitting.set(false); } } - // Turn on array eager lemmas for QF_AX - if(! options::arraysEagerLemmas.wasSetByUser()) { + // Turn on model-based arrays for QF_AX + if(! options::arraysModelBased.wasSetByUser()) { if (not d_logic.isQuantified() && d_logic.isTheoryEnabled(THEORY_ARRAY) && d_logic.isPure(THEORY_ARRAY)) { - Trace("smt") << "setting array eager lemmas to true" << endl; - options::arraysEagerIndexSplitting.set(true); + Trace("smt") << "turning on model-based array solver" << endl; + options::arraysModelBased.set(true); } } // Turn on multiple-pass non-clausal simplification for QF_AUFBV -- 2.30.2