diff options
| author | ajreynol <andrew.j.reynolds@gmail.com> | 2015-10-26 11:26:13 +0100 |
|---|---|---|
| committer | ajreynol <andrew.j.reynolds@gmail.com> | 2015-10-26 11:26:22 +0100 |
| commit | aaf1bbbdc6e42910e07db64441885ee3476d86df (patch) | |
| tree | a6abf77b1b404e8183a44c78f733a0c93f2213fe /src/theory/quantifiers/quantifiers_rewriter.h | |
| parent | 95992fb5e9fb971f2319e1302b83ac85098e0438 (diff) | |
Extend counterexample-guided instantiation to extended theory of Int/Real, mixed Int/Real. Bug fixes. Updates to quantifiers rewriter.
Diffstat (limited to 'src/theory/quantifiers/quantifiers_rewriter.h')
| -rw-r--r-- | src/theory/quantifiers/quantifiers_rewriter.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/theory/quantifiers/quantifiers_rewriter.h b/src/theory/quantifiers/quantifiers_rewriter.h index 828099984..98a83b7de 100644 --- a/src/theory/quantifiers/quantifiers_rewriter.h +++ b/src/theory/quantifiers/quantifiers_rewriter.h @@ -44,8 +44,11 @@ private: static Node computeMiniscoping( Node f, std::vector< Node >& args, Node body, Node ipl ); static Node computeAggressiveMiniscoping( std::vector< Node >& args, Node body ); static Node computeNNF( Node body ); - static Node computeProcessIte( Node body, bool hasPol, bool pol, std::map< Node, bool >& currCond ); - static Node computeProcessIte2( Node body ); + //cache is dependent upon currCond, icache is not, new_conds are negated conditions + static Node computeProcessTerms( Node body, bool hasPol, bool pol, std::map< Node, bool >& currCond, int nCurrCond, + std::map< Node, Node >& cache, std::map< Node, Node >& icache, + std::vector< Node >& new_vars, std::vector< Node >& new_conds ); + static Node computeProcessIte( Node body ); static Node computeVarElimination( Node body, std::vector< Node >& args, Node& ipl ); static Node computeCNF( Node body, std::vector< Node >& args, NodeBuilder<>& defs, bool forcePred ); static Node computePrenex( Node body, std::vector< Node >& args, bool pol ); @@ -56,8 +59,8 @@ private: COMPUTE_MINISCOPING, COMPUTE_AGGRESSIVE_MINISCOPING, COMPUTE_NNF, + COMPUTE_PROCESS_TERMS, COMPUTE_PROCESS_ITE, - COMPUTE_PROCESS_ITE_2, COMPUTE_PRENEX, COMPUTE_VAR_ELIMINATION, //COMPUTE_FLATTEN_ARGS_UF, |