Merge from nonclausal-simplification-v2 branch:

* Preprocessing-time, non-clausal, Boolean simplification round to
  support "quasi-non-linear rewrites" as discussed at last few meetings.

* --simplification=none is the default for now, but we'll probably
  change that to --simplification=incremental.  --simplification=batch
  is also a possibility.  See --simplification=help for details.

* RecursionBreaker<T> now uses a hash set for the seen trail.
* Fixes to TLS stuff to support that.
* Fixes to theory and SmtEngine documentation.
* Fixes to stream indentation.
* Other miscellaneous stuff.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/theory/valuation.cpp b/src/theory/valuation.cpp
index 536255c2d..604ae21e1 100644
--- a/src/theory/valuation.cpp
+++ b/src/theory/valuation.cpp
@@ -41,5 +41,13 @@ Node Valuation::getSatValue(TNode n) const{
   }
 }
 
+Node Valuation::simplify(TNode in, Substitutions& outSubstitutions) {
+  return d_engine->simplify(in, outSubstitutions);
+}
+
+Node Valuation::rewrite(TNode in) {
+  return d_engine->preprocess(in);
+}
+
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */