diff options
author | Morgan Deters <mdeters@gmail.com> | 2011-09-02 17:56:43 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2011-09-02 17:56:43 +0000 |
commit | 487e610b88f2a634e3285886ff96717c103338de (patch) | |
tree | 7f034b5c9f537195df72ac9ecd7666226dc2ed9f /src/theory/arith/tableau.h | |
parent | 90267f8729799f44c6fb33ace11b971a16e78dff (diff) |
Partial merge of integers work; this is simple B&B and some pseudoboolean
infrastructure, and takes care not to affect CVC4's performance on LRA
benchmarks.
Diffstat (limited to 'src/theory/arith/tableau.h')
-rw-r--r-- | src/theory/arith/tableau.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/theory/arith/tableau.h b/src/theory/arith/tableau.h index fa227757a..e14436f8c 100644 --- a/src/theory/arith/tableau.h +++ b/src/theory/arith/tableau.h @@ -224,10 +224,10 @@ private: class Iterator { private: EntryID d_curr; - TableauEntryManager& d_entryManager; + const TableauEntryManager& d_entryManager; public: - Iterator(EntryID start, TableauEntryManager& manager) : + Iterator(EntryID start, const TableauEntryManager& manager) : d_curr(start), d_entryManager(manager) {} @@ -244,7 +244,7 @@ private: Iterator& operator++(){ Assert(!atEnd()); - TableauEntry& entry = d_entryManager.get(d_curr); + const TableauEntry& entry = d_entryManager.get(d_curr); d_curr = isRowIterator ? entry.getNextRowID() : entry.getNextColID(); return *this; } @@ -288,13 +288,13 @@ public: return d_basicVariables.end(); } - RowIterator rowIterator(ArithVar v){ + RowIterator rowIterator(ArithVar v) const { Assert(v < d_rowHeads.size()); EntryID head = d_rowHeads[v]; return RowIterator(head, d_entryManager); } - ColIterator colIterator(ArithVar v){ + ColIterator colIterator(ArithVar v) const { Assert(v < d_colHeads.size()); EntryID head = d_colHeads[v]; return ColIterator(head, d_entryManager); @@ -350,9 +350,9 @@ public: /** * Prints the contents of the Tableau to Debug("tableau::print") */ - void printTableau(); - void printRow(ArithVar basic); - void printEntry(const TableauEntry& entry); + void printTableau() const; + void printRow(ArithVar basic) const; + void printEntry(const TableauEntry& entry) const; private: |