diff options
author | Tim King <taking@google.com> | 2016-01-28 12:35:45 -0800 |
---|---|---|
committer | Tim King <taking@google.com> | 2016-01-28 12:35:45 -0800 |
commit | 2ba8bb701ce289ba60afec01b653b0930cc59298 (patch) | |
tree | 46df365b7b41ce662a0f94de5b11c3ed20829851 /src/smt/smt_engine.h | |
parent | 42b665f2a00643c81b42932fab1441987628c5a5 (diff) |
Adding listeners to Options.
- Options
-- Added the new option attribute :notify. One can get a notify() call on the Listener after a the option's value is updated. This is the new preferred way to achieve dynamic dispatch for options.
-- Removed SmtOptionsHandler and pushed its functionality into OptionsHandler and Listeners.
-- Added functions to Options for registering listeners of the notify calls.
-- Changed a number of options to use the new listener infrastructure.
-- Fixed a number of warnings in options.
-- Added the ArgumentExtender class to better capture how arguments are inserted while parsing options and ease memory management. Previously this was the "preemptGetopt" procedure.
-- Moved options/options_handler_interface.{cpp,h} to options/options_handler.{cpp,h}.
- Theories
-- Reimplemented alternative theories to use a datastructure stored on TheoryEngine instead of on Options.
- Ostream Handling:
-- Added new functionality that generalized how ostreams are opened, options/open_stream.h.
-- Simplified the memory management for different ostreams, smt/managed_ostreams.h.
-- Had the SmtEnginePrivate manage the memory for the ostreams set by options.
-- Simplified how the setting of ostreams are updated, smt/update_ostream.h.
- Configuration and Tags:
-- Configuration can now be used during predicates and handlers for options.
-- Moved configuration.{cpp,h,i} and configuration_private.h from util/ into base/.
-- Moved {Debug,Trace}_tags.* from being generated in options/ into base/.
- cvc4_private.h
-- Upgraded #warning's in cvc4_private.h and cvc4_private_library.h to #error's.
-- Added public first-order (non-templatized) member functions for options get and set the value of options outside of libcvc4. Fixed all of the use locations.
-- Made lib/lib/clock_gettime.h a cvc4_private_library.h header.
- Antlr
-- Fixed antlr and cvc4 macro definition conflicts that caused warnings.
- SmtGlobals
-- Refactored replayStream and replayLog out of SmtGlobals.
-- Renamed SmtGlobals to LemmaChannels and moved the implementation into smt_util/lemma_channels.{h,cpp}.
Diffstat (limited to 'src/smt/smt_engine.h')
-rw-r--r-- | src/smt/smt_engine.h | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/smt/smt_engine.h b/src/smt/smt_engine.h index 2f222790c..3616762bc 100644 --- a/src/smt/smt_engine.h +++ b/src/smt/smt_engine.h @@ -28,10 +28,11 @@ #include "context/cdlist_forward.h" #include "expr/expr.h" #include "expr/expr_manager.h" +#include "expr/expr_stream.h" #include "options/options.h" #include "proof/unsat_core.h" #include "smt/logic_exception.h" -#include "smt/smt_globals.h" +#include "smt_util/lemma_channels.h" #include "theory/logic_info.h" #include "util/hash.h" #include "util/proof.h" @@ -73,10 +74,6 @@ namespace prop { class PropEngine; }/* CVC4::prop namespace */ -namespace options { - class OptionsHandler; -}/* CVC4::prop namespace */ - namespace expr { namespace attr { class AttributeManager; @@ -267,10 +264,8 @@ class CVC4_PUBLIC SmtEngine { */ std::map<std::string, Integer> d_commandVerbosity; - /** - * This responds to requests to set options. - */ - options::OptionsHandler* d_optionsHandler; + /** ReplayStream for the solver. */ + ExprStream* d_replayStream; /** * A private utility class to SmtEngine. @@ -386,7 +381,8 @@ class CVC4_PUBLIC SmtEngine { smt::SmtEngineStatistics* d_stats; - SmtGlobals* d_globals; + /** Container for the lemma input and output channels for this SmtEngine.*/ + LemmaChannels* d_channels; /** * Add to Model command. This is used for recording a command @@ -728,12 +724,19 @@ public: void setPrintFuncInModel(Expr f, bool p); + /** Throws a ModalException if the SmtEngine has been fully initialized. */ + void beforeSearch() throw(ModalException); + + LemmaChannels* channels() { return d_channels; } + + /** - * Throws a ModalException if smt is non-null and the SmtEngine has not been fully initialized. + * Expermintal feature: Sets the sequence of decisions. + * This currently requires very fine grained knowledge about literal + * translation. */ - static void beforeSearch(SmtEngine* smt, const std::string& option) throw(ModalException); + void setReplayStream(ExprStream* exprStream); - SmtGlobals* globals() { return d_globals; } };/* class SmtEngine */ }/* CVC4 namespace */ |