Re-enabling ite simplification in incremental mode - no reason why
authorClark Barrett <barrett@cs.nyu.edu>
Mon, 9 May 2016 22:21:22 +0000 (15:21 -0700)
committerClark Barrett <barrett@cs.nyu.edu>
Mon, 9 May 2016 22:21:22 +0000 (15:21 -0700)
it should be a problem.

src/theory/theory_engine.cpp

index f2231ff7a01e4c214c7a47c343b8b06aab0b0687..1ab4c228bb0dab5ec6f3029d10c033cf44412980 100644 (file)
@@ -1558,15 +1558,9 @@ void TheoryEngine::mkAckermanizationAsssertions(std::vector<Node>& assertions) {
 
 Node TheoryEngine::ppSimpITE(TNode assertion)
 {
-  if(options::incrementalSolving()){
-    // disabling the d_iteUtilities->simpITE(assertion) pass for incremental solving.
-    // This is paranoia. We do not actually know of a bug coming from this.
-    // TODO re-enable
+  if (!d_iteRemover.containsTermITE(assertion)) {
     return assertion;
-  } else if(!d_iteRemover.containsTermITE(assertion)){
-    return assertion;
-  }else{
-
+  } else {
     Node result = d_iteUtilities->simpITE(assertion);
     Node res_rewritten = Rewriter::rewrite(result);
 
@@ -1576,10 +1570,9 @@ Node TheoryEngine::ppSimpITE(TNode assertion)
       Chat() << "ending simplifyWithCare()"
              << " post simplifyWithCare()" << postSimpWithCare.getId() << endl;
       result = Rewriter::rewrite(postSimpWithCare);
-    }else{
+    } else {
       result = res_rewritten;
     }
-
     return result;
   }
 }