diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2013-03-06 10:46:07 -0600 |
|---|---|---|
| committer | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2013-03-06 10:46:19 -0600 |
| commit | 44d9a7c29f565dbba0baea3f9df23d6d3e5bd74f (patch) | |
| tree | f9a0b47038e393553a2d6a315138ae8b128915a1 /src/theory/quantifiers/quantifiers_rewriter.h | |
| parent | 66b99ac64a6920787905948315e74ca1c5b3e90b (diff) | |
fixed two bugs for the new E-matching implementation, added aggressive miniscoping option --ag-miniscope-quant, minor cleanup
Diffstat (limited to 'src/theory/quantifiers/quantifiers_rewriter.h')
| -rw-r--r-- | src/theory/quantifiers/quantifiers_rewriter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/theory/quantifiers/quantifiers_rewriter.h b/src/theory/quantifiers/quantifiers_rewriter.h index 00301c610..75b392e15 100644 --- a/src/theory/quantifiers/quantifiers_rewriter.h +++ b/src/theory/quantifiers/quantifiers_rewriter.h @@ -41,19 +41,19 @@ private: static void computeArgs( std::vector< Node >& args, std::vector< Node >& activeArgs, Node n ); static bool hasArg( std::vector< Node >& args, Node n ); static void setNestedQuantifiers( Node n, Node q ); - static void computeArgs( std::map< Node, bool >& active, Node n ); static Node computeClause( Node n ); private: static Node computeMiniscoping( std::vector< Node >& args, Node body, Node ipl, bool isNested = false ); + static Node computeAggressiveMiniscoping( std::vector< Node >& args, Node body, bool isNested = false ); static Node computeNNF( 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, bool polReq ); + static Node computePrenex( Node body, std::vector< Node >& args, bool pol ); private: enum{ COMPUTE_MINISCOPING = 0, + COMPUTE_AGGRESSIVE_MINISCOPING, COMPUTE_NNF, - COMPUTE_PRE_SKOLEM, COMPUTE_PRENEX, COMPUTE_VAR_ELIMINATION, //COMPUTE_FLATTEN_ARGS_UF, |