diff options
author | ajreynol <andrew.j.reynolds@gmail.com> | 2014-11-20 10:56:20 +0100 |
---|---|---|
committer | ajreynol <andrew.j.reynolds@gmail.com> | 2014-11-20 10:59:46 +0100 |
commit | f70804a7159390fcb01d8c1ec208fbfd8e544fba (patch) | |
tree | a16f6ae65eda646ab5f80ef4633b3199c648d853 /src/theory/quantifiers_engine.cpp | |
parent | eebaff108e57f15cf19c78d3b9eb27ac1d90dc11 (diff) |
Disable constants sharing in eq engine, disable hack in theory engine. Changes to strings solver : modify lemmas/splits to avoid constants, minor refactoring. Fix assertion failure in quantifiers engine.
Diffstat (limited to 'src/theory/quantifiers_engine.cpp')
-rw-r--r-- | src/theory/quantifiers_engine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/theory/quantifiers_engine.cpp b/src/theory/quantifiers_engine.cpp index 899d035ea..04b6c5d16 100644 --- a/src/theory/quantifiers_engine.cpp +++ b/src/theory/quantifiers_engine.cpp @@ -247,6 +247,10 @@ bool QuantifiersEngine::hasOwnership( Node q, QuantifiersModule * m ) { void QuantifiersEngine::check( Theory::Effort e ){ CodeTimer codeTimer(d_time); + if( !getMasterEqualityEngine()->consistent() ){ + Trace("quant-engine-debug") << "Master equality engine not consistent, return." << std::endl; + return; + } bool needsCheck = false; bool needsModel = false; bool needsFullModel = false; @@ -280,10 +284,6 @@ void QuantifiersEngine::check( Theory::Effort e ){ Trace("quant-engine-ee") << "Equality engine : " << std::endl; debugPrintEqualityEngine( "quant-engine-ee" ); - if( !getMasterEqualityEngine()->consistent() ){ - Trace("quant-engine") << "Master equality engine not consistent, return." << std::endl; - return; - } Trace("quant-engine-debug") << "Resetting all modules..." << std::endl; //reset relevant information d_conflict = false; |