diff options
author | Tim King <taking@cs.nyu.edu> | 2010-10-23 21:47:47 +0000 |
---|---|---|
committer | Tim King <taking@cs.nyu.edu> | 2010-10-23 21:47:47 +0000 |
commit | 237995ce0e7f47b826e26c0afb317cf5e3174879 (patch) | |
tree | ddeec96c8880ff186d350979f2a151179ae2d73f /src/theory/arith/tableau.h | |
parent | 0a3ecb598dac9e5e7416f88403dbf73d558c8739 (diff) |
Removed slack.h, and arith_activity.h. Replaced IsBasicManager with the more general ArithVarDenseSet. Renamed NextArithRewriter to ArithRewriter.
Diffstat (limited to 'src/theory/arith/tableau.h')
-rw-r--r-- | src/theory/arith/tableau.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/theory/arith/tableau.h b/src/theory/arith/tableau.h index 88a5c2317..588b521b1 100644 --- a/src/theory/arith/tableau.h +++ b/src/theory/arith/tableau.h @@ -22,8 +22,7 @@ #include "expr/attribute.h" #include "theory/arith/arith_utilities.h" -#include "theory/arith/arith_activity.h" -#include "theory/arith/basic.h" +#include "theory/arith/arithvar_dense_set.h" #include "theory/arith/normal_form.h" #include <ext/hash_map> @@ -144,14 +143,15 @@ private: ArithVarSet d_activeBasicVars; RowsTable d_rowsTable; + ActivityMonitor& d_activityMonitor; - IsBasicManager& d_basicManager; + ArithVarDenseSet& d_basicManager; public: /** * Constructs an empty tableau. */ - Tableau(ActivityMonitor &am, IsBasicManager& bm) : + Tableau(ActivityMonitor &am, ArithVarDenseSet& bm) : d_activeBasicVars(), d_rowsTable(), d_activityMonitor(am), @@ -196,18 +196,18 @@ public: void printTableau(); bool isEjected(ArithVar var){ - return d_basicManager.isBasic(var) && !isActiveBasicVariable(var); + return d_basicManager.isMember(var) && !isActiveBasicVariable(var); } void ejectBasic(ArithVar basic){ - Assert(d_basicManager.isBasic(basic)); + Assert(d_basicManager.isMember(basic)); Assert(isActiveBasicVariable(basic)); d_activeBasicVars.erase(basic); } void reinjectBasic(ArithVar basic){ - Assert(d_basicManager.isBasic(basic)); + Assert(d_basicManager.isMember(basic)); Assert(isEjected(basic)); Row* row = lookupEjected(basic); |