From: Clark Barrett <barrett@cs.nyu.edu>
Date: Wed, 17 Sep 2014 22:01:19 +0000 (-0700)
Subject: More model-based combination for arrays
X-Git-Tag: cvc5-1.0.0~6607
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4c32421fee453d82e6c1d7d3dc1605da11db1a09;p=cvc5.git

More model-based combination for arrays
---

diff --git a/src/theory/arrays/options b/src/theory/arrays/options
index 15220fbc2..baf0962bf 100644
--- a/src/theory/arrays/options
+++ b/src/theory/arrays/options
@@ -12,7 +12,7 @@ option arraysLazyRIntro1 --arrays-lazy-rintro1 bool :default true :read-write
  turn on optimization to only perform RIntro1 rule lazily (see Jovanovic/Barrett 2012: Being Careful with Theory Combination)
 
 option arraysModelBased --arrays-model-based bool :default false :read-write
- turn on model-based arrray solver
+ turn on model-based array solver
 
 option arraysEagerIndexSplitting --arrays-eager-index bool :default true :read-write
  turn on eager index splitting for generated array lemmas
diff --git a/src/theory/arrays/theory_arrays.cpp b/src/theory/arrays/theory_arrays.cpp
index 6b91400e8..bfbf046c3 100644
--- a/src/theory/arrays/theory_arrays.cpp
+++ b/src/theory/arrays/theory_arrays.cpp
@@ -990,7 +990,9 @@ void TheoryArrays::check(Effort e) {
   if(!options::arraysEagerLemmas() && fullEffort(e) && !d_conflict && !options::arraysModelBased()) {
     // generate the lemmas on the worklist
     Trace("arrays-lem")<<"Arrays::discharging lemmas: "<<d_RowQueue.size()<<"\n";
-    dischargeLemmas();
+    while (d_RowQueue.size() > 0 && !d_conflict) {
+      dischargeLemmas();
+    }
   }
 
   Trace("arrays") << spaces(getSatContext()->getLevel()) << "Arrays::check(): done" << endl;
diff --git a/src/theory/theory_engine.cpp b/src/theory/theory_engine.cpp
index ffe4258cd..b943a7ee5 100644
--- a/src/theory/theory_engine.cpp
+++ b/src/theory/theory_engine.cpp
@@ -501,8 +501,8 @@ void TheoryEngine::combineTheories() {
     // We need to split on it
     Debug("combineTheories") << "TheoryEngine::combineTheories(): requesting a split " << endl;
     lemma(equality.orNode(equality.notNode()), false, false, false, carePair.theory);
-    if (false) {
-      if (es == EQUALITY_TRUE_IN_MODEL) {
+    if (true) {
+      if (es == EQUALITY_TRUE || es == EQUALITY_TRUE_IN_MODEL) {
         Node e = ensureLiteral(equality);
         d_propEngine->requirePhase(e, true);
       }