Merging branch 'soiquickexplain'.

diff --cc src/theory/arith/options
index 1366addaec7bafb432c75bd788ad09047e5a0552,388dcc7ff1c6e7d553521880b2876128930ada4b..35cede8b4f8e9e72ed19ee55ea58be99540462dd
--- 1/src/theory/arith/options
--- 2/src/theory/arith/options
+++ b/src/theory/arith/options
@@@ -91,10 -91,7 +91,14 @@@ option fancyFinal --fancy-final bool :d
  option exportDioDecompositions --dio-decomps bool :default false :read-write
   Let skolem variables for integer divisibility constraints leak from the dio solver.
  
 +option newProp --new-prop bool :default false :read-write
 + Use the new row propagation system
 +
 +option arithPropAsLemmaLength --arith-prop-clauses int :default 8 :read-write
 + Rows shorter than this are propagated as clauses
 +
+ option soiQuickExplain --soi-qe bool :default false :read-write
+  Use quick explain to minimize the sum of infeasibility conflicts.
+ 
++
  endmodule

diff --cc src/theory/arith/simplex.cpp
Simple merge

diff --cc src/theory/arith/soi_simplex.cpp
Simple merge

diff --cc src/theory/arith/soi_simplex.h
Simple merge