diff options
author | Kshitij Bansal <kshitij@cs.nyu.edu> | 2012-09-28 22:46:09 +0000 |
---|---|---|
committer | Kshitij Bansal <kshitij@cs.nyu.edu> | 2012-09-28 22:46:09 +0000 |
commit | 589bf879f00d2d8df4ccdaf3db28674ce3639512 (patch) | |
tree | 467b33e449ff47556388707000ab6b1edfb70411 /src/main/portfolio_util.h | |
parent | 730ea7d49ae56f8674e63ac9085adf06b6adf6f5 (diff) |
Some fixes to portfolio
* respect output lang
* fix export variable for BOUND_VARIABLE
* support export of SUBRANGE_TYPE
* statistic for lastWinner, other minor stat changes
* fix running of multiple threads on checsat/query
* changes of Assert -> assert which became private
* fix some destruction time order issues
* fix Pickler with AssertionException going private
Fixed by not fixing:
* portfolio+datatypes does not work
- added ExportUnsupportedException to more places, switches
to sequential
(still TODO / decide : not switch silently, but print error)
> note: this exception now needs to be (and is) defined in expr.h
Known issues:
* problems in portfolio+quantifiers
- at least some problems appear to be because of static variables
(will be later "fixed" like the datatypes)
(this commit was certified error- and warning-free by the test-and-commit script.)
Diffstat (limited to 'src/main/portfolio_util.h')
-rw-r--r-- | src/main/portfolio_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/portfolio_util.h b/src/main/portfolio_util.h index 1955a29a7..416b9f44a 100644 --- a/src/main/portfolio_util.h +++ b/src/main/portfolio_util.h @@ -155,7 +155,7 @@ void sharingManager(unsigned numThreads, /* Alert if channel full, so that we increase sharingChannelSize or decrease sharingBroadcastInterval */ - Assert(not channelsOut[t]->full()); + assert(not channelsOut[t]->full()); T data = channelsOut[t]->pop(); @@ -177,7 +177,7 @@ void sharingManager(unsigned numThreads, for(unsigned t = 0; t < numThreads; ++t){ /* Alert if channel full, so that we increase sharingChannelSize or decrease sharingBroadcastInterval */ - Assert(not channelsIn[t]->full()); + assert(not channelsIn[t]->full()); while(!queues[t].empty() && !channelsIn[t]->full()){ Trace("sharing") << "sharing: pushing on channel " << t << std::endl; |