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/expr/pickler.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/expr/pickler.h')
-rw-r--r-- | src/expr/pickler.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/expr/pickler.h b/src/expr/pickler.h index a6427ad47..dee4f06e6 100644 --- a/src/expr/pickler.h +++ b/src/expr/pickler.h @@ -67,7 +67,7 @@ class CVC4_PUBLIC Pickler { protected: virtual uint64_t variableToMap(uint64_t x) const - throw(AssertionException, PicklingException) { + throw(PicklingException) { return x; } virtual uint64_t variableFromMap(uint64_t x) const { @@ -87,7 +87,7 @@ public: * * @return the pickle, which should be dispose()'d when you're done with it */ - void toPickle(Expr e, Pickle& p) throw(AssertionException, PicklingException); + void toPickle(Expr e, Pickle& p) throw(PicklingException); /** * Constructs a node from a Pickle. @@ -116,7 +116,7 @@ public: protected: virtual uint64_t variableToMap(uint64_t x) const - throw(AssertionException, PicklingException) { + throw(PicklingException) { VarMap::const_iterator i = d_toMap.find(x); if(i != d_toMap.end()) { return i->second; @@ -125,11 +125,7 @@ protected: } } - virtual uint64_t variableFromMap(uint64_t x) const { - VarMap::const_iterator i = d_fromMap.find(x); - Assert(i != d_fromMap.end()); - return i->second; - } + virtual uint64_t variableFromMap(uint64_t x) const; };/* class MapPickler */ }/* CVC4::expr::pickle namespace */ |