diff options
Diffstat (limited to 'src/theory/quantifiers/ematching')
4 files changed, 6 insertions, 7 deletions
diff --git a/src/theory/quantifiers/ematching/inst_strategy_e_matching.cpp b/src/theory/quantifiers/ematching/inst_strategy_e_matching.cpp index ce328df2e..c4b15a852 100644 --- a/src/theory/quantifiers/ematching/inst_strategy_e_matching.cpp +++ b/src/theory/quantifiers/ematching/inst_strategy_e_matching.cpp @@ -18,6 +18,7 @@ #include "theory/quantifiers/quantifiers_attributes.h" #include "theory/quantifiers/term_database.h" #include "theory/quantifiers/term_util.h" +#include "theory/quantifiers_engine.h" #include "theory/theory_engine.h" #include "util/random.h" diff --git a/src/theory/quantifiers/ematching/inst_strategy_e_matching.h b/src/theory/quantifiers/ematching/inst_strategy_e_matching.h index 5eb992368..b71b8ee47 100644 --- a/src/theory/quantifiers/ematching/inst_strategy_e_matching.h +++ b/src/theory/quantifiers/ematching/inst_strategy_e_matching.h @@ -21,7 +21,6 @@ #include "context/context_mm.h" #include "theory/quantifiers/ematching/instantiation_engine.h" #include "theory/quantifiers/ematching/trigger.h" -#include "theory/quantifiers_engine.h" #include "util/statistics_registry.h" #include "options/quantifiers_options.h" diff --git a/src/theory/quantifiers/ematching/instantiation_engine.cpp b/src/theory/quantifiers/ematching/instantiation_engine.cpp index d2650f01f..bb70002a0 100644 --- a/src/theory/quantifiers/ematching/instantiation_engine.cpp +++ b/src/theory/quantifiers/ematching/instantiation_engine.cpp @@ -15,11 +15,12 @@ #include "theory/quantifiers/ematching/instantiation_engine.h" #include "options/quantifiers_options.h" -#include "theory/quantifiers/first_order_model.h" #include "theory/quantifiers/ematching/inst_strategy_e_matching.h" +#include "theory/quantifiers/ematching/trigger.h" +#include "theory/quantifiers/first_order_model.h" #include "theory/quantifiers/term_database.h" #include "theory/quantifiers/term_util.h" -#include "theory/quantifiers/ematching/trigger.h" +#include "theory/quantifiers_engine.h" #include "theory/theory_engine.h" using namespace std; diff --git a/src/theory/quantifiers/ematching/instantiation_engine.h b/src/theory/quantifiers/ematching/instantiation_engine.h index 139adcb04..b959bef2d 100644 --- a/src/theory/quantifiers/ematching/instantiation_engine.h +++ b/src/theory/quantifiers/ematching/instantiation_engine.h @@ -17,10 +17,9 @@ #ifndef CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H #define CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H -#include <memory> +#include <vector> -#include "theory/quantifiers_engine.h" -#include "theory/quantifiers/theory_quantifiers.h" +#include "theory/quantifiers/quant_util.h" namespace CVC4 { namespace theory { @@ -64,7 +63,6 @@ class InstantiationEngine : public QuantifiersModule { /** auto gen triggers; only kept for destructor cleanup */ std::unique_ptr<InstStrategyAutoGenTriggers> d_i_ag; - typedef context::CDHashMap<Node, bool, NodeHashFunction> BoolMap; /** current processing quantified formulas */ std::vector<Node> d_quants; |