diff options
| author | Tim King <taking@cs.nyu.edu> | 2012-03-02 23:37:06 +0000 |
|---|---|---|
| committer | Tim King <taking@cs.nyu.edu> | 2012-03-02 23:37:06 +0000 |
| commit | 98b2fe2c6fefb15b57d2eae6bda505e1f41da451 (patch) | |
| tree | 4124caa3d7f94aec78ff735fa766149aee86e842 /src/theory/arith/simplex.h | |
| parent | 068107e1d1f705eb9054b4309a26236230687d80 (diff) | |
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.
Diffstat (limited to 'src/theory/arith/simplex.h')
| -rw-r--r-- | src/theory/arith/simplex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/theory/arith/simplex.h b/src/theory/arith/simplex.h index d69de3756..39c0bc20b 100644 --- a/src/theory/arith/simplex.h +++ b/src/theory/arith/simplex.h @@ -50,7 +50,7 @@ #ifndef __CVC4__THEORY__ARITH__SIMPLEX_H #define __CVC4__THEORY__ARITH__SIMPLEX_H -#include "theory/arith/arith_utilities.h" +#include "theory/arith/arithvar.h" #include "theory/arith/arith_priority_queue.h" #include "theory/arith/arithvar_set.h" #include "theory/arith/delta_rational.h" |