Separate public-facing and internal-facing interfaces to Statistics.

The external interface (e.g., what's answered by ExprManager::getStatistics() and SmtEngine::getStatistics()) is a snapshot of the current statistics (rather than a reference to the actual StatisticsRegistry).

The StatisticsRegistry is now internal-only.  However, it's built as a convenience library so that the parser and driver can use it too (by re-linking against it).

This is part of the ongoing effort to clean up the public interface.

(this commit was certified error- and warning-free by the test-and-commit script.)

8 files changed, 8 insertions, 8 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 {