diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2017-11-01 15:20:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 15:20:37 -0500 |
| commit | 4b580ea3876055f701b13e67e0e4e78abbe47674 (patch) | |
| tree | 35d1cd8f48077dfed5a5bae682f2efc90d80703f /src/theory/rep_set.cpp | |
| parent | 13e452be03bef09e2f54f42e2bc42383505ffcea (diff) | |
(Refactor) Split term util (#1303)
* Fix some documentation.
* Move model basis out of term db.
* Moving
* Finished moving.
* Document Skolemize and term enumeration.
* Minor
* Model basis to first order model.
* Change function name.
* Minor
* Clang format.
* Minor
* Format
* Minor
* Format
* Address review.
Diffstat (limited to 'src/theory/rep_set.cpp')
| -rw-r--r-- | src/theory/rep_set.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/theory/rep_set.cpp b/src/theory/rep_set.cpp index dd139d5ec..5c02b631c 100644 --- a/src/theory/rep_set.cpp +++ b/src/theory/rep_set.cpp @@ -14,11 +14,12 @@ #include <unordered_set> -#include "theory/rep_set.h" -#include "theory/type_enumerator.h" #include "theory/quantifiers/bounded_integers.h" -#include "theory/quantifiers/term_util.h" #include "theory/quantifiers/first_order_model.h" +#include "theory/quantifiers/term_enumeration.h" +#include "theory/quantifiers/term_util.h" +#include "theory/rep_set.h" +#include "theory/type_enumerator.h" using namespace std; using namespace CVC4; @@ -216,6 +217,9 @@ bool RepSetIterator::setFunctionDomain( Node op, RepBoundExt* rext ){ return initialize( rext ); } +// TODO : as part of #1199, the portions of this +// function which modify d_rep_set should be +// moved to TheoryModel. bool RepSetIterator::initialize( RepBoundExt* rext ){ Trace("rsi") << "Initialize rep set iterator..." << std::endl; for( unsigned v=0; v<d_types.size(); v++ ){ @@ -260,7 +264,8 @@ bool RepSetIterator::initialize( RepBoundExt* rext ){ } if( !tn.isSort() ){ if( inc ){ - if( d_qe->getTermUtil()->mayComplete( tn ) ){ + if (d_qe->getTermEnumeration()->mayComplete(tn)) + { Trace("rsi") << " do complete, since cardinality is small (" << tn.getCardinality() << ")..." << std::endl; d_rep_set->complete( tn ); //must have succeeded |