diff options
Diffstat (limited to 'src/theory')
29 files changed, 33 insertions, 29 deletions
diff --git a/src/theory/arith/arith_priority_queue.h b/src/theory/arith/arith_priority_queue.h index 43cf54d37..b4c2ef6d3 100644 --- a/src/theory/arith/arith_priority_queue.h +++ b/src/theory/arith/arith_priority_queue.h @@ -28,7 +28,7 @@ #include "theory/arith/matrix.h" #include "theory/arith/partial_model.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include <vector> diff --git a/src/theory/arith/arith_static_learner.h b/src/theory/arith/arith_static_learner.h index 66eb4d311..db0a5f4df 100644 --- a/src/theory/arith/arith_static_learner.h +++ b/src/theory/arith/arith_static_learner.h @@ -23,7 +23,7 @@ #define __CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H -#include "util/stats.h" +#include "util/statistics_registry.h" #include "theory/arith/arith_utilities.h" #include "theory/substitutions.h" #include <set> diff --git a/src/theory/arith/congruence_manager.h b/src/theory/arith/congruence_manager.h index 83a5e7fb4..55c704e18 100644 --- a/src/theory/arith/congruence_manager.h +++ b/src/theory/arith/congruence_manager.h @@ -33,7 +33,7 @@ #include "context/cdtrail_queue.h" #include "context/cdmaybe.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "util/dense_map.h" namespace CVC4 { diff --git a/src/theory/arith/dio_solver.h b/src/theory/arith/dio_solver.h index b6c9e3afb..7baa423e8 100644 --- a/src/theory/arith/dio_solver.h +++ b/src/theory/arith/dio_solver.h @@ -27,7 +27,7 @@ #include "theory/arith/partial_model.h" #include "util/rational.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include <vector> #include <utility> diff --git a/src/theory/arith/linear_equality.h b/src/theory/arith/linear_equality.h index 2553bedd0..ad6aafcac 100644 --- a/src/theory/arith/linear_equality.h +++ b/src/theory/arith/linear_equality.h @@ -38,7 +38,7 @@ #include "theory/arith/matrix.h" #include "theory/arith/constraint.h" -#include "util/stats.h" +#include "util/statistics_registry.h" namespace CVC4 { namespace theory { diff --git a/src/theory/arith/simplex.h b/src/theory/arith/simplex.h index 324f3b21b..eff969818 100644 --- a/src/theory/arith/simplex.h +++ b/src/theory/arith/simplex.h @@ -61,7 +61,7 @@ #include "util/dense_map.h" #include "options/options.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "util/result.h" #include <queue> diff --git a/src/theory/arith/theory_arith.h b/src/theory/arith/theory_arith.h index a8c025452..c98c759f7 100644 --- a/src/theory/arith/theory_arith.h +++ b/src/theory/arith/theory_arith.h @@ -43,7 +43,7 @@ #include "theory/arith/constraint.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "util/result.h" #include <vector> diff --git a/src/theory/arith/theory_arith_instantiator.h b/src/theory/arith/theory_arith_instantiator.h index a7602cf28..a8843bdd4 100644 --- a/src/theory/arith/theory_arith_instantiator.h +++ b/src/theory/arith/theory_arith_instantiator.h @@ -23,7 +23,7 @@ #include "theory/quantifiers_engine.h" #include "theory/arith/arithvar_node_map.h" -#include "util/stats.h" +#include "util/statistics_registry.h" namespace CVC4 { namespace theory { diff --git a/src/theory/arrays/array_info.h b/src/theory/arrays/array_info.h index e847a238d..ce34c72c4 100644 --- a/src/theory/arrays/array_info.h +++ b/src/theory/arrays/array_info.h @@ -24,7 +24,7 @@ #include "context/cdlist.h" #include "context/cdhashmap.h" #include "expr/node.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "util/ntuple.h" #include <ext/hash_set> #include <ext/hash_map> diff --git a/src/theory/arrays/theory_arrays.h b/src/theory/arrays/theory_arrays.h index aebee6817..b92921be7 100644 --- a/src/theory/arrays/theory_arrays.h +++ b/src/theory/arrays/theory_arrays.h @@ -23,7 +23,7 @@ #include "theory/theory.h" #include "theory/arrays/array_info.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "theory/uf/equality_engine.h" #include "context/cdhashmap.h" #include "context/cdhashset.h" diff --git a/src/theory/bv/bitblaster.h b/src/theory/bv/bitblaster.h index 16c50be22..2ff12bbdf 100644 --- a/src/theory/bv/bitblaster.h +++ b/src/theory/bv/bitblaster.h @@ -35,7 +35,7 @@ #include "theory/theory.h" #include "theory_bv_utils.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "bitblast_strategies.h" #include "prop/sat_solver.h" diff --git a/src/theory/bv/theory_bv.h b/src/theory/bv/theory_bv.h index 30cf5ac52..36a542878 100644 --- a/src/theory/bv/theory_bv.h +++ b/src/theory/bv/theory_bv.h @@ -26,7 +26,7 @@ #include "context/cdlist.h" #include "context/cdhashset.h" #include "theory/bv/theory_bv_utils.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "context/cdqueue.h" #include "theory/bv/bv_subtheory.h" #include "theory/bv/bv_subtheory_eq.h" diff --git a/src/theory/bv/theory_bv_rewrite_rules.h b/src/theory/bv/theory_bv_rewrite_rules.h index 2fd409313..ccc281d6f 100644 --- a/src/theory/bv/theory_bv_rewrite_rules.h +++ b/src/theory/bv/theory_bv_rewrite_rules.h @@ -22,7 +22,7 @@ #include "cvc4_private.h" #include "theory/theory.h" #include "context/context.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "theory/bv/theory_bv_utils.h" #include "expr/command.h" #include <sstream> diff --git a/src/theory/bv/theory_bv_rewriter.h b/src/theory/bv/theory_bv_rewriter.h index 6b885f1ed..853ccdc32 100644 --- a/src/theory/bv/theory_bv_rewriter.h +++ b/src/theory/bv/theory_bv_rewriter.h @@ -23,7 +23,7 @@ #define __CVC4__THEORY__BV__THEORY_BV_REWRITER_H #include "theory/rewriter.h" -#include "util/stats.h" +#include "util/statistics_registry.h" namespace CVC4 { namespace theory { diff --git a/src/theory/datatypes/theory_datatypes_instantiator.h b/src/theory/datatypes/theory_datatypes_instantiator.h index fe43f2cfc..ae47543ec 100644 --- a/src/theory/datatypes/theory_datatypes_instantiator.h +++ b/src/theory/datatypes/theory_datatypes_instantiator.h @@ -22,7 +22,7 @@ #include "theory/quantifiers_engine.h" -#include "util/stats.h" +#include "util/statistics_registry.h" namespace CVC4 { namespace theory { diff --git a/src/theory/ite_simplifier.h b/src/theory/ite_simplifier.h index cba5c7051..582b87b09 100644 --- a/src/theory/ite_simplifier.h +++ b/src/theory/ite_simplifier.h @@ -39,7 +39,7 @@ #include "theory/shared_terms_database.h" #include "theory/term_registration_visitor.h" #include "theory/valuation.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "util/hash.h" #include "util/cache.h" #include "util/ite_removal.h" diff --git a/src/theory/quantifiers/theory_quantifiers.h b/src/theory/quantifiers/theory_quantifiers.h index bc712955e..6d2290d75 100644 --- a/src/theory/quantifiers/theory_quantifiers.h +++ b/src/theory/quantifiers/theory_quantifiers.h @@ -23,7 +23,7 @@ #include "theory/theory.h" #include "util/hash.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include <ext/hash_set> #include <iostream> diff --git a/src/theory/quantifiers/theory_quantifiers_instantiator.h b/src/theory/quantifiers/theory_quantifiers_instantiator.h index e837811b0..2a8b8b35c 100644 --- a/src/theory/quantifiers/theory_quantifiers_instantiator.h +++ b/src/theory/quantifiers/theory_quantifiers_instantiator.h @@ -22,7 +22,7 @@ #include "theory/quantifiers_engine.h" -#include "util/stats.h" +#include "util/statistics_registry.h" namespace CVC4 { namespace theory { diff --git a/src/theory/quantifiers_engine.cpp b/src/theory/quantifiers_engine.cpp index ca5cc568e..8badb3998 100644 --- a/src/theory/quantifiers_engine.cpp +++ b/src/theory/quantifiers_engine.cpp @@ -97,7 +97,11 @@ d_active( c ){ } QuantifiersEngine::~QuantifiersEngine(){ - delete(d_term_db); + delete d_model_engine; + delete d_inst_engine; + delete d_model; + delete d_term_db; + delete d_eq_query; } Instantiator* QuantifiersEngine::getInstantiator( theory::TheoryId id ){ diff --git a/src/theory/quantifiers_engine.h b/src/theory/quantifiers_engine.h index 34d9d69a2..befd12d9d 100644 --- a/src/theory/quantifiers_engine.h +++ b/src/theory/quantifiers_engine.h @@ -24,7 +24,7 @@ #include "theory/quantifiers/inst_match.h" #include "theory/rewriterules/rr_inst_match.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include <ext/hash_set> #include <iostream> diff --git a/src/theory/rewriterules/theory_rewriterules.h b/src/theory/rewriterules/theory_rewriterules.h index 5937c541f..e2e7c7e1a 100644 --- a/src/theory/rewriterules/theory_rewriterules.h +++ b/src/theory/rewriterules/theory_rewriterules.h @@ -30,7 +30,7 @@ #include "theory/rewriterules/rr_inst_match_impl.h" #include "theory/rewriterules/rr_trigger.h" #include "theory/rewriterules/rr_inst_match.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "theory/rewriterules/theory_rewriterules_preprocess.h" #include "theory/model.h" diff --git a/src/theory/shared_terms_database.h b/src/theory/shared_terms_database.h index c685257ba..0c163015a 100644 --- a/src/theory/shared_terms_database.h +++ b/src/theory/shared_terms_database.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "theory/theory.h" #include "theory/uf/equality_engine.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "context/cdhashset.h" namespace CVC4 { diff --git a/src/theory/theory.h b/src/theory/theory.h index 2f980fe2f..0ff6c1fe5 100644 --- a/src/theory/theory.h +++ b/src/theory/theory.h @@ -33,7 +33,7 @@ #include "context/cdlist.h" #include "context/cdo.h" #include "options/options.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "util/dump.h" #include <string> diff --git a/src/theory/theory_engine.h b/src/theory/theory_engine.h index d1d6bd1f3..f2324e5d2 100644 --- a/src/theory/theory_engine.h +++ b/src/theory/theory_engine.h @@ -38,7 +38,7 @@ #include "theory/valuation.h" #include "options/options.h" #include "smt/options.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "util/hash.h" #include "util/cache.h" #include "theory/ite_simplifier.h" diff --git a/src/theory/uf/equality_engine.h b/src/theory/uf/equality_engine.h index cae169081..e32a34707 100644 --- a/src/theory/uf/equality_engine.h +++ b/src/theory/uf/equality_engine.h @@ -30,7 +30,7 @@ #include "expr/kind_map.h" #include "context/cdo.h" #include "util/output.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "theory/rewriter.h" #include "theory/theory.h" diff --git a/src/theory/uf/inst_strategy.h b/src/theory/uf/inst_strategy.h index 663720326..6369c6ba3 100644 --- a/src/theory/uf/inst_strategy.h +++ b/src/theory/uf/inst_strategy.h @@ -25,7 +25,7 @@ #include "context/context.h" #include "context/context_mm.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "theory/uf/theory_uf.h" namespace CVC4 { diff --git a/src/theory/uf/symmetry_breaker.h b/src/theory/uf/symmetry_breaker.h index 2b7b10209..fe97e8afc 100644 --- a/src/theory/uf/symmetry_breaker.h +++ b/src/theory/uf/symmetry_breaker.h @@ -52,7 +52,7 @@ #include "expr/node.h" #include "expr/node_builder.h" -#include "util/stats.h" +#include "util/statistics_registry.h" namespace CVC4 { namespace theory { diff --git a/src/theory/uf/theory_uf_instantiator.h b/src/theory/uf/theory_uf_instantiator.h index 59b8f36a4..1929e0e47 100644 --- a/src/theory/uf/theory_uf_instantiator.h +++ b/src/theory/uf/theory_uf_instantiator.h @@ -25,7 +25,7 @@ #include "context/context_mm.h" #include "context/cdchunk_list.h" -#include "util/stats.h" +#include "util/statistics_registry.h" #include "theory/uf/theory_uf.h" #include "theory/quantifiers/trigger.h" #include "util/ntuple.h" diff --git a/src/theory/uf/theory_uf_strong_solver.h b/src/theory/uf/theory_uf_strong_solver.h index 8c63b4308..d78a43498 100644 --- a/src/theory/uf/theory_uf_strong_solver.h +++ b/src/theory/uf/theory_uf_strong_solver.h @@ -25,7 +25,7 @@ #include "context/context_mm.h" #include "context/cdchunk_list.h" -#include "util/stats.h" +#include "util/statistics_registry.h" namespace CVC4 { namespace theory { |