This commit merges in the changes from branches/arithmetic/refactor0
authorTim King <taking@cs.nyu.edu>
Fri, 2 Mar 2012 23:37:06 +0000 (23:37 +0000)
committerTim King <taking@cs.nyu.edu>
Fri, 2 Mar 2012 23:37:06 +0000 (23:37 +0000)
commit98b2fe2c6fefb15b57d2eae6bda505e1f41da451
tree4124caa3d7f94aec78ff735fa766149aee86e842
parent068107e1d1f705eb9054b4309a26236230687d80
This commit merges in the changes from branches/arithmetic/refactor0
- Improved the checks in AssertLower and AssertUpper so that redundant bounds cause less work.
- Because of the above change, d_constantIntegerVariables now cannot have duplicate elements enqueued. This allows removing d_varsInDioSolver.
- Fix to an assertion in CDQueue.
- Implements a CDArithVarSet using a vector of booleans and CDList.
- Refactored ArithVar out of arith_utilities.h. Miscellaneous cleanup of arithmetic.
23 files changed:
src/context/cdqueue.h
src/theory/arith/Makefile.am
src/theory/arith/arith_priority_queue.h
src/theory/arith/arith_prop_manager.cpp
src/theory/arith/arith_prop_manager.h
src/theory/arith/arith_rewriter.cpp
src/theory/arith/arith_rewriter.h
src/theory/arith/arith_static_learner.cpp
src/theory/arith/arith_utilities.h
src/theory/arith/arithvar.h [new file with mode: 0644]
src/theory/arith/arithvar_node_map.h
src/theory/arith/arithvar_set.h
src/theory/arith/atom_database.cpp
src/theory/arith/difference_manager.h
src/theory/arith/dio_solver.h
src/theory/arith/linear_equality.h
src/theory/arith/ordered_set.h
src/theory/arith/partial_model.cpp
src/theory/arith/partial_model.h
src/theory/arith/simplex.h
src/theory/arith/tableau.h
src/theory/arith/theory_arith.cpp
src/theory/arith/theory_arith.h