diff options
author | Tim King <taking@cs.nyu.edu> | 2011-02-19 00:22:34 +0000 |
---|---|---|
committer | Tim King <taking@cs.nyu.edu> | 2011-02-19 00:22:34 +0000 |
commit | 0db4ec99a2f289b66878d0ca3be9d43492eff3ad (patch) | |
tree | cdcb1badb92bf405c2be4f15a19bec05ea716c32 /src/theory/arith/tableau.h | |
parent | 005066130a774c9e4aa838ca500d5fd3137909be (diff) |
Changes:
- The Tableau is now in charge of managing what variables are basic in a unified manner. Specifically, TheoryArith::d_basicManager was merged into Tableau::d_basicVariables.
Diffstat (limited to 'src/theory/arith/tableau.h')
-rw-r--r-- | src/theory/arith/tableau.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/theory/arith/tableau.h b/src/theory/arith/tableau.h index 433f6472f..32c2986e3 100644 --- a/src/theory/arith/tableau.h +++ b/src/theory/arith/tableau.h @@ -42,10 +42,9 @@ private: typedef std::vector< ReducedRowVector* > RowsTable; - ArithVarSet d_activeBasicVars; RowsTable d_rowsTable; - ArithVarSet& d_basicManager; + ArithVarSet d_basicVariables; std::vector<uint32_t> d_rowCount; @@ -53,29 +52,33 @@ public: /** * Constructs an empty tableau. */ - Tableau(ArithVarSet& bm) : - d_activeBasicVars(), + Tableau() : d_rowsTable(), - d_basicManager(bm) + d_basicVariables(), + d_rowCount() {} ~Tableau(); void increaseSize(){ - d_activeBasicVars.increaseSize(); + d_basicVariables.increaseSize(); d_rowsTable.push_back(NULL); d_rowCount.push_back(0); } + bool isBasic(ArithVar v) const { + return d_basicVariables.isMember(v); + } + ArithVarSet::iterator begin(){ - return d_activeBasicVars.begin(); + return d_basicVariables.begin(); } ArithVarSet::iterator end(){ - return d_activeBasicVars.end(); + return d_basicVariables.end(); } ReducedRowVector& lookup(ArithVar var){ - Assert(d_activeBasicVars.isMember(var)); + Assert(d_basicVariables.isMember(var)); Assert(d_rowsTable[var] != NULL); return *(d_rowsTable[var]); } |