diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2018-03-23 13:33:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-23 13:33:12 -0500 |
commit | 4f506ac50e43a71a92094a478deeaa2c2cd1df4a (patch) | |
tree | 0b79c617f63a07e2da75de63312240c808855488 /src/theory/quantifiers/ematching/trigger.cpp | |
parent | d95e5257f452d765aa67931f0b2af7b178f2e986 (diff) |
Minor reorganization for ematching (#1701)
Diffstat (limited to 'src/theory/quantifiers/ematching/trigger.cpp')
-rw-r--r-- | src/theory/quantifiers/ematching/trigger.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/theory/quantifiers/ematching/trigger.cpp b/src/theory/quantifiers/ematching/trigger.cpp index 430d261a1..4039c632f 100644 --- a/src/theory/quantifiers/ematching/trigger.cpp +++ b/src/theory/quantifiers/ematching/trigger.cpp @@ -15,7 +15,7 @@ #include "theory/quantifiers/ematching/trigger.h" #include "theory/arith/arith_msum.h" -#include "theory/quantifiers/candidate_generator.h" +#include "theory/quantifiers/ematching/candidate_generator.h" #include "theory/quantifiers/ematching/ho_trigger.h" #include "theory/quantifiers/ematching/inst_match_generator.h" #include "theory/quantifiers/instantiate.h" @@ -262,9 +262,8 @@ bool Trigger::isUsable( Node n, Node q ){ return true; }else{ std::map< Node, Node > coeffs; - if( isBooleanTermTrigger( n ) ){ - return true; - }else if( options::purifyTriggers() ){ + if (options::purifyTriggers()) + { Node x = getInversionVariable( n ); if( !x.isNull() ){ return true; @@ -522,22 +521,6 @@ void Trigger::collectPatTerms2( Node q, Node n, std::map< Node, std::vector< Nod } } -bool Trigger::isBooleanTermTrigger( Node n ) { - if( n.getKind()==ITE ){ - //check for boolean term converted to ITE - if( n[0].getKind()==INST_CONSTANT && - n[1].getKind()==CONST_BITVECTOR && - n[2].getKind()==CONST_BITVECTOR ){ - if( ((BitVectorType)n[1].getType().toType()).getSize()==1 && - n[1].getConst<BitVector>().toInteger()==1 && - n[2].getConst<BitVector>().toInteger()==0 ){ - return true; - } - } - } - return false; -} - bool Trigger::isPureTheoryTrigger( Node n ) { if( n.getKind()==APPLY_UF || n.getKind()==VARIABLE || n.getKind()==SKOLEM ){ //|| !quantifiers::TermUtil::hasInstConstAttr( n ) ){ return false; |