Brings the tuning branch into trunk. This includes the changes from restricted-simplex.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/theory/arith/simplex.h b/src/theory/arith/simplex.h
index 8450afb06..d260ff9b4 100644
--- a/src/theory/arith/simplex.h
+++ b/src/theory/arith/simplex.h
@@ -62,6 +62,7 @@
 #include "util/dense_map.h"
 #include "util/options.h"
 #include "util/stats.h"
+#include "util/result.h"
 
 #include <queue>
 
@@ -130,7 +131,7 @@ public:
    *
    * Corresponds to the "check()" procedure in [Cav06].
    */
-  bool findModel();
+  Result::Sat findModel(bool exactResult);
 
 private:
 
@@ -218,6 +219,11 @@ private:
 public:
   void increaseMax() {d_numVariables++;}
 
+
+  void clearQueue() {
+    d_queue.clear();
+  }
+
 private:
 
   /** Reports a conflict to on the output channel. */