diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2012-10-16 17:10:47 +0000 |
---|---|---|
committer | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2012-10-16 17:10:47 +0000 |
commit | bbcfb5208c6c0f343d1a63b129c54914f66b2701 (patch) | |
tree | f2369b3cc07121645ef0c8c3a415f243f5a4fcb9 /src/theory/quantifiers/model_engine.h | |
parent | 5b8b6acd9091e2afec654ebed1332d6755bbb7d9 (diff) |
first draft of new inst gen method (still with bugs), some cleanup of quantifiers code
Diffstat (limited to 'src/theory/quantifiers/model_engine.h')
-rw-r--r-- | src/theory/quantifiers/model_engine.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/theory/quantifiers/model_engine.h b/src/theory/quantifiers/model_engine.h index 4550564a2..f930fbec7 100644 --- a/src/theory/quantifiers/model_engine.h +++ b/src/theory/quantifiers/model_engine.h @@ -31,10 +31,7 @@ class ModelEngine : public QuantifiersModule friend class RepSetIterator; private: /** builder class */ - ModelEngineBuilder d_builder; -private: //data maintained globally: - //which quantifiers have been initialized - std::map< Node, bool > d_quant_init; + ModelEngineBuilder* d_builder; private: //analysis of current model: //relevant domain RelevantDomain d_rel_domain; @@ -47,8 +44,6 @@ private: bool optOneQuantPerRound(); bool optExhInstEvalSkipMultiple(); private: - //initialize quantifiers, return number of lemmas produced - int initializeQuantifier( Node f ); //check model void checkModel( int& addedLemmas ); //exhaustively instantiate quantifier (possibly using mbqi), return number of lemmas produced @@ -62,6 +57,8 @@ private: public: ModelEngine( context::Context* c, QuantifiersEngine* qe ); ~ModelEngine(){} + //get the builder + ModelEngineBuilder* getModelBuilder() { return d_builder; } public: void check( Theory::Effort e ); void registerQuantifier( Node f ); @@ -78,8 +75,6 @@ public: IntStat d_eval_uf_terms; IntStat d_eval_lits; IntStat d_eval_lits_unknown; - IntStat d_num_quants_init; - IntStat d_num_quants_init_fail; Statistics(); ~Statistics(); }; |