diff options
| author | Paul Meng <baolmeng@gmail.com> | 2016-10-11 13:54:20 -0500 |
|---|---|---|
| committer | Paul Meng <baolmeng@gmail.com> | 2016-10-11 13:54:20 -0500 |
| commit | 3395c5c13cd61d98aec0d9806e3b9bc3d707968a (patch) | |
| tree | 0eadad9799862ec77d29f7abe03a46c300d80de8 /src/theory/quantifiers/trigger.cpp | |
| parent | 773e7d27d606b71ff0f78e84efe1deef2653f016 (diff) | |
| parent | 5f415d4585134612bc24e9a823289fee35541a01 (diff) | |
Merge branch 'origin' of https://github.com/CVC4/CVC4.git
Conflicts:
src/options/quantifiers_options
Diffstat (limited to 'src/theory/quantifiers/trigger.cpp')
| -rwxr-xr-x | src/theory/quantifiers/trigger.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/theory/quantifiers/trigger.cpp b/src/theory/quantifiers/trigger.cpp index 2faed3af0..3017238ca 100755 --- a/src/theory/quantifiers/trigger.cpp +++ b/src/theory/quantifiers/trigger.cpp @@ -76,12 +76,6 @@ Trigger::Trigger( QuantifiersEngine* qe, Node f, std::vector< Node >& nodes ) ++(qe->d_statistics.d_multi_triggers); } //Notice() << "Trigger : " << (*this) << " for " << f << std::endl; - if( options::eagerInstQuant() ){ - for( int i=0; i<(int)d_nodes.size(); i++ ){ - Node op = qe->getTermDatabase()->getMatchOperator( d_nodes[i] ); - qe->getTermDatabase()->registerTrigger( this, op ); - } - } Trace("trigger-debug") << "Finished making trigger." << std::endl; } @@ -107,10 +101,6 @@ bool Trigger::getMatch( Node f, Node t, InstMatch& m ){ return ((InstMatchGenerator*)d_mg)->getMatch( f, t, m, d_quantEngine ); } -int Trigger::addTerm( Node t ){ - return d_mg->addTerm( d_f, t, d_quantEngine ); -} - Node Trigger::getInstPattern(){ return NodeManager::currentNM()->mkNode( INST_PATTERN, d_nodes ); } @@ -363,7 +353,8 @@ bool Trigger::isAtomicTrigger( Node n ){ bool Trigger::isAtomicTriggerKind( Kind k ) { return k==APPLY_UF || k==SELECT || k==STORE || k==APPLY_CONSTRUCTOR || k==APPLY_SELECTOR_TOTAL || k==APPLY_TESTER || - k==UNION || k==INTERSECTION || k==SUBSET || k==SETMINUS || k==MEMBER || k==SINGLETON; + k==UNION || k==INTERSECTION || k==SUBSET || k==SETMINUS || k==MEMBER || k==SINGLETON || + k==SEP_PTO; } bool Trigger::isRelationalTrigger( Node n ) { |