Merging a squash of the branch timothy-king/CVC4/glpknecfix c95bf7d4f1 into master...
authorTim King <taking@cs.nyu.edu>
Fri, 7 Mar 2014 23:00:37 +0000 (18:00 -0500)
committerTim King <taking@cs.nyu.edu>
Fri, 7 Mar 2014 23:00:52 +0000 (18:00 -0500)
commit9ccdea06edbc72e3ecd282e9e015f6fc4b2e7173
treecde6138cb9ab6ef0b7c15edf42e3e8cc53637002
parent42be934ef4d4430944ae9074c7202a7d130c75bb
Merging a squash of the branch timothy-king/CVC4/glpknecfix c95bf7d4f1 into   See the CAV14 submission for an explanation of the changes to the integer solver's behavior. If compiled against the our custom extension of glpk, https://github.com/timothy-king/glpk-cut-log, this should have substantial differences in behavior. This should have moderate performance differences for linear real and integer arithmetic even if these features are disabled.
48 files changed:
config/glpk.m4
src/Makefile.am
src/theory/arith/approx_simplex.cpp
src/theory/arith/approx_simplex.h
src/theory/arith/arith_ite_utils.cpp [new file with mode: 0644]
src/theory/arith/arith_ite_utils.h [new file with mode: 0644]
src/theory/arith/arith_rewriter.cpp
src/theory/arith/arith_static_learner.cpp
src/theory/arith/arith_static_learner.h
src/theory/arith/arith_utilities.h
src/theory/arith/callbacks.cpp
src/theory/arith/callbacks.h
src/theory/arith/congruence_manager.cpp
src/theory/arith/congruence_manager.h
src/theory/arith/constraint.cpp
src/theory/arith/constraint.h
src/theory/arith/constraint_forward.h
src/theory/arith/cut_log.cpp [new file with mode: 0644]
src/theory/arith/cut_log.h [new file with mode: 0644]
src/theory/arith/dio_solver.cpp
src/theory/arith/dio_solver.h
src/theory/arith/error_set.cpp
src/theory/arith/error_set.h
src/theory/arith/fc_simplex.cpp
src/theory/arith/linear_equality.cpp
src/theory/arith/linear_equality.h
src/theory/arith/matrix.h
src/theory/arith/normal_form.cpp
src/theory/arith/normal_form.h
src/theory/arith/options
src/theory/arith/partial_model.cpp
src/theory/arith/partial_model.h
src/theory/arith/simplex.cpp
src/theory/arith/simplex.h
src/theory/arith/simplex_update.cpp
src/theory/arith/simplex_update.h
src/theory/arith/soi_simplex.cpp
src/theory/arith/soi_simplex.h
src/theory/arith/tableau.h
src/theory/arith/theory_arith_private.cpp
src/theory/arith/theory_arith_private.h
src/theory/theory_engine.cpp
src/theory/theory_engine.h
src/util/rational_cln_imp.cpp
src/util/rational_cln_imp.h
src/util/rational_gmp_imp.cpp
src/util/rational_gmp_imp.h
test/regress/regress0/Makefile.am