diff options
author | ajreynol <andrew.j.reynolds@gmail.com> | 2016-05-12 10:13:17 -0500 |
---|---|---|
committer | ajreynol <andrew.j.reynolds@gmail.com> | 2016-05-12 10:13:17 -0500 |
commit | 411ced2c475e5ccb4c114ce2c77a39bf93d139f4 (patch) | |
tree | 633033193faf75556ca16772efc8730f1893f04a /src/theory/quantifiers/quant_conflict_find.h | |
parent | b78f4be5dac08916e0b189ba99f608a44fa08d5d (diff) |
Add casc scripts. Improvements to qcf related to nested quantifiers and variable ordering.
Diffstat (limited to 'src/theory/quantifiers/quant_conflict_find.h')
-rw-r--r-- | src/theory/quantifiers/quant_conflict_find.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/theory/quantifiers/quant_conflict_find.h b/src/theory/quantifiers/quant_conflict_find.h index 974495269..47a66b1b1 100644 --- a/src/theory/quantifiers/quant_conflict_find.h +++ b/src/theory/quantifiers/quant_conflict_find.h @@ -62,7 +62,7 @@ private: std::map< int, Node > d_ground_eval; //determine variable order void determineVariableOrder( QuantInfo * qi, std::vector< int >& bvars ); - void collectBoundVar( QuantInfo * qi, Node n, std::vector< int >& cbvars ); + void collectBoundVar( QuantInfo * qi, Node n, std::vector< int >& cbvars, std::map< Node, bool >& visited, bool& hasNested ); public: //type of the match generator enum { @@ -121,7 +121,7 @@ private: //for completing match //optimization: number of variables set, to track when we can stop std::map< int, bool > d_vars_set; std::map< Node, bool > d_ground_terms; - unsigned d_extra_var; + std::vector< Node > d_extra_var; public: void setGroundSubterm( Node t ) { d_ground_terms[t] = true; } bool isGroundSubterm( Node t ) { return d_ground_terms.find( t )!=d_ground_terms.end(); } |