diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2013-06-25 12:18:05 -0500 |
---|---|---|
committer | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2013-06-25 12:18:14 -0500 |
commit | d8de492163b90974709a16918cb615515a536afc (patch) | |
tree | 8241c94be9a610149b40af0fc0932ee05094b2aa /src/theory/rep_set.cpp | |
parent | a9bf7fc500daba46ed86ca744c1346059880e6f4 (diff) |
Refactoring of model engine to separate individual implementations of model builder. Begin work on interval models for integers. Other minor cleanup.
Diffstat (limited to 'src/theory/rep_set.cpp')
-rw-r--r-- | src/theory/rep_set.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/theory/rep_set.cpp b/src/theory/rep_set.cpp index f2cb22b85..180c4bbcf 100644 --- a/src/theory/rep_set.cpp +++ b/src/theory/rep_set.cpp @@ -276,7 +276,7 @@ bool RepSetIterator::resetIndex( int i, bool initial ) { return true; } -void RepSetIterator::increment2( int counter ){ +int RepSetIterator::increment2( int counter ){ Assert( !isFinished() ); #ifdef DISABLE_EVAL_SKIP_MULTIPLE counter = (int)d_index.size()-1; @@ -305,14 +305,17 @@ void RepSetIterator::increment2( int counter ){ } if( emptyDomain ){ Trace("rsi-debug") << "This is an empty domain, increment again." << std::endl; - increment(); + return increment(); } } + return counter; } -void RepSetIterator::increment(){ +int RepSetIterator::increment(){ if( !isFinished() ){ - increment2( (int)d_index.size()-1 ); + return increment2( (int)d_index.size()-1 ); + }else{ + return -1; } } |