From 66108085fad2f05aa64dc21e73ae26eb098589d8 Mon Sep 17 00:00:00 2001
From: Arie Gurfinkel <arie.gurfinkel@uwaterloo.ca>
Date: Mon, 31 Jul 2017 22:28:41 -0400
Subject: [PATCH 1/3] removing pragmas to make travis happy

---
 src/muz/spacer/spacer_prop_solver.cpp        | 1 -
 src/muz/spacer/spacer_unsat_core_learner.cpp | 4 ----
 src/muz/spacer/spacer_unsat_core_plugin.cpp  | 9 ++-------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/muz/spacer/spacer_prop_solver.cpp b/src/muz/spacer/spacer_prop_solver.cpp
index 4f5ad86f2..29b34b799 100644
--- a/src/muz/spacer/spacer_prop_solver.cpp
+++ b/src/muz/spacer/spacer_prop_solver.cpp
@@ -260,7 +260,6 @@ lbool prop_solver::check_assumptions(const expr_ref_vector & _hard,
         else { m_ctx->assert_expr(bg[i]); }
 
     unsigned soft_sz = soft.size();
-#pragma unused(soft_sz)
     lbool res = internal_check_assumptions(hard, soft);
     if (!m_use_push_bg) { m_ctx->pop(1); }
 
diff --git a/src/muz/spacer/spacer_unsat_core_learner.cpp b/src/muz/spacer/spacer_unsat_core_learner.cpp
index 1e4dc522f..557858ca4 100644
--- a/src/muz/spacer/spacer_unsat_core_learner.cpp
+++ b/src/muz/spacer/spacer_unsat_core_learner.cpp
@@ -25,9 +25,7 @@ Revision History:
 namespace spacer
 {
 
-#pragma mark - proof iterators
 
-# pragma mark - main methods
 unsat_core_learner::~unsat_core_learner()
 {
     std::for_each(m_plugins.begin(), m_plugins.end(), delete_proc<unsat_core_plugin>());
@@ -262,7 +260,6 @@ void unsat_core_learner::finalize()
     }
 }
 
-#pragma mark - API
 
 bool unsat_core_learner::is_a_marked(proof* p)
 {
@@ -290,7 +287,6 @@ void unsat_core_learner::set_closed(proof* p, bool value)
         m_unsat_core.push_back(lemma);
     }
 
-# pragma mark - checking for b_symbols
 
 class collect_pure_proc {
     func_decl_set& m_symbs;
diff --git a/src/muz/spacer/spacer_unsat_core_plugin.cpp b/src/muz/spacer/spacer_unsat_core_plugin.cpp
index d0d443528..58c700dae 100644
--- a/src/muz/spacer/spacer_unsat_core_plugin.cpp
+++ b/src/muz/spacer/spacer_unsat_core_plugin.cpp
@@ -32,7 +32,6 @@ Revision History:
 namespace spacer
 {
 
-#pragma mark - unsat_core_plugin_lemma
 
 void unsat_core_plugin_lemma::compute_partial_core(proof* step)
 {
@@ -105,7 +104,6 @@ void unsat_core_plugin_lemma::add_lowest_split_to_core(proof* step) const
 }
 
 
-#pragma mark - unsat_core_plugin_farkas_lemma
 void unsat_core_plugin_farkas_lemma::compute_partial_core(proof* step)
 {
     ast_manager &m = m_learner.m;
@@ -285,7 +283,6 @@ void unsat_core_plugin_farkas_lemma::compute_linear_combination(const vector<rat
     }
 }
 
-#pragma mark - unsat_core_plugin_farkas_optimized
     void unsat_core_plugin_farkas_lemma_optimized::compute_partial_core(proof* step)
     {
         SASSERT(m_learner.is_a_marked(step));
@@ -444,7 +441,6 @@ void unsat_core_plugin_farkas_lemma::compute_linear_combination(const vector<rat
         res = mk_not(m, negated_linear_combination); //TODO: rewrite the get-method to return nonnegated stuff?
                     }
 
-#pragma mark - unsat_core_plugin_farkas_bounded
 
     void unsat_core_plugin_farkas_lemma_bounded::finalize()
                     {
@@ -557,7 +553,7 @@ void unsat_core_plugin_farkas_lemma::compute_linear_combination(const vector<rat
 
                     app_ref sum(m);
                     sum = util.mk_int(0);
-                    for (int k=0; k < n; ++k)
+                    for (unsigned k=0; k < n; ++k)
                         {
                         sum = util.mk_add(sum, util.mk_mul(coeffs[i][k].get(), bounded_vectors[j][k].get()));
                         }
@@ -579,7 +575,7 @@ void unsat_core_plugin_farkas_lemma::compute_linear_combination(const vector<rat
         {
             ptr_vector<app> literals;
             vector<rational> coefficients;
-                    for (int j=0; j < matrix.num_cols(); ++j)
+                    for (unsigned j=0; j < matrix.num_cols(); ++j)
             {
                         expr_ref evaluation(m);
 
@@ -601,7 +597,6 @@ void unsat_core_plugin_farkas_lemma::compute_linear_combination(const vector<rat
         }
     }
 
-#pragma mark - unsat_core_plugin_min_cut
     unsat_core_plugin_min_cut::unsat_core_plugin_min_cut(unsat_core_learner& learner, ast_manager& m) : unsat_core_plugin(learner), m(m){}
 
     void unsat_core_plugin_min_cut::compute_partial_core(proof* step)

From ecd85b314c35652b1277a5f0c4689fe581c44e18 Mon Sep 17 00:00:00 2001
From: Arie Gurfinkel <arie.gurfinkel@uwaterloo.ca>
Date: Mon, 31 Jul 2017 17:57:21 -0400
Subject: [PATCH 2/3] more includes

---
 src/muz/spacer/spacer_itp_solver.cpp    | 14 +++----
 src/muz/spacer/spacer_itp_solver.h      |  6 +--
 src/muz/spacer/spacer_legacy_frames.cpp | 54 ++++++++++++------------
 src/muz/spacer/spacer_legacy_mbp.cpp    | 55 +++++++++++++------------
 src/muz/spacer/spacer_legacy_mev.cpp    | 52 +++++++++++------------
 src/muz/spacer/spacer_legacy_mev.h      | 20 ++++-----
 src/muz/spacer/spacer_manager.cpp       | 19 +++++----
 src/muz/spacer/spacer_manager.h         | 23 ++++++-----
 src/muz/spacer/spacer_marshal.cpp       | 13 +++---
 src/muz/spacer/spacer_marshal.h         |  3 +-
 src/muz/spacer/spacer_matrix.cpp        |  2 +-
 src/muz/spacer/spacer_matrix.h          |  3 +-
 src/muz/spacer/spacer_mev_array.cpp     | 26 ++++++------
 src/muz/spacer/spacer_mev_array.h       |  8 ++--
 14 files changed, 152 insertions(+), 146 deletions(-)

diff --git a/src/muz/spacer/spacer_itp_solver.cpp b/src/muz/spacer/spacer_itp_solver.cpp
index 7571352b3..bcf6b07ae 100644
--- a/src/muz/spacer/spacer_itp_solver.cpp
+++ b/src/muz/spacer/spacer_itp_solver.cpp
@@ -16,13 +16,13 @@ Author:
 Notes:
 
 --*/
-#include"spacer_itp_solver.h"
-#include"ast.h"
-#include"spacer_util.h"
-#include"spacer_farkas_learner.h"
-#include"expr_replacer.h"
-#include "spacer_unsat_core_learner.h"
-#include "spacer_unsat_core_plugin.h"
+#include"muz/spacer/spacer_itp_solver.h"
+#include"ast/ast.h"
+#include"muz/spacer/spacer_util.h"
+#include"muz/spacer/spacer_farkas_learner.h"
+#include"ast/rewriter/expr_replacer.h"
+#include"muz/spacer/spacer_unsat_core_learner.h"
+#include"muz/spacer/spacer_unsat_core_plugin.h"
 
 namespace spacer {
 void itp_solver::push ()
diff --git a/src/muz/spacer/spacer_itp_solver.h b/src/muz/spacer/spacer_itp_solver.h
index bf5a00751..fce2c4a9c 100644
--- a/src/muz/spacer/spacer_itp_solver.h
+++ b/src/muz/spacer/spacer_itp_solver.h
@@ -19,9 +19,9 @@ Notes:
 #ifndef SPACER_ITP_SOLVER_H_
 #define SPACER_ITP_SOLVER_H_
 
-#include "solver.h"
-#include "expr_substitution.h"
-#include"stopwatch.h"
+#include"solver/solver.h"
+#include"ast/expr_substitution.h"
+#include"util/stopwatch.h"
 namespace spacer {
 class itp_solver : public solver {
 private:
diff --git a/src/muz/spacer/spacer_legacy_frames.cpp b/src/muz/spacer/spacer_legacy_frames.cpp
index c998121c6..77e6f5650 100644
--- a/src/muz/spacer/spacer_legacy_frames.cpp
+++ b/src/muz/spacer/spacer_legacy_frames.cpp
@@ -3,38 +3,38 @@
 
   Legacy implementations of frames. To be removed.
  */
-#include "spacer_context.h"
 #include <sstream>
 #include <iomanip>
 
-#include "dl_util.h"
-#include "rewriter.h"
-#include "rewriter_def.h"
-#include "var_subst.h"
-#include "util.h"
-#include "spacer_prop_solver.h"
-#include "spacer_context.h"
-#include "spacer_generalizers.h"
-#include "for_each_expr.h"
-#include "dl_rule_set.h"
-#include "unit_subsumption_tactic.h"
-#include "model_smt2_pp.h"
+#include "muz/spacer/spacer_context.h"
+#include "muz/base/dl_util.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/rewriter/var_subst.h"
+#include "util/util.h"
+#include "muz/spacer/spacer_prop_solver.h"
+#include "muz/spacer/spacer_context.h"
+#include "muz/spacer/spacer_generalizers.h"
+#include "ast/for_each_expr.h"
+#include "muz/base/dl_rule_set.h"
+#include "smt/tactic/unit_subsumption_tactic.h"
+#include "model/model_smt2_pp.h"
 #include "dl_mk_rule_inliner.h"
-#include "ast_smt2_pp.h"
-#include "ast_ll_pp.h"
-#include "ast_util.h"
-#include "proof_checker.h"
-#include "smt_value_sort.h"
-#include "proof_utils.h"
-#include "scoped_proof.h"
-#include "spacer_qe_project.h"
-#include "blast_term_ite_tactic.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_util.h"
+#include "ast/proof_checker/proof_checker.h"
+#include "smt/smt_value_sort.h"
+#include "muz/base/proof_utils.h"
+#include "ast/scoped_proof.h"
+#include "muz/spacer/spacer_qe_project.h"
+#include "tactic/core/blast_term_ite_tactic.h"
 
-#include "timeit.h"
-#include "luby.h"
-#include "expr_safe_replace.h"
-#include "expr_abstract.h"
-#include "obj_equiv_class.h"
+#include "util/timeit.h"
+#include "util/luby.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/expr_abstract.h"
+#include "muz/spacer/obj_equiv_class.h"
 
 
 namespace spacer {
diff --git a/src/muz/spacer/spacer_legacy_mbp.cpp b/src/muz/spacer/spacer_legacy_mbp.cpp
index a9569004c..fc2fd1fdd 100644
--- a/src/muz/spacer/spacer_legacy_mbp.cpp
+++ b/src/muz/spacer/spacer_legacy_mbp.cpp
@@ -17,35 +17,36 @@ Notes:
 
 --*/
 #include <sstream>
-#include "arith_simplifier_plugin.h"
-#include "array_decl_plugin.h"
-#include "ast_pp.h"
-#include "basic_simplifier_plugin.h"
-#include "bv_simplifier_plugin.h"
-#include "bool_rewriter.h"
-#include "dl_util.h"
-#include "for_each_expr.h"
-#include "smt_params.h"
-#include "model.h"
-#include "ref_vector.h"
-#include "rewriter.h"
-#include "rewriter_def.h"
-#include "util.h"
-#include "spacer_manager.h"
-#include "spacer_util.h"
-#include "arith_decl_plugin.h"
-#include "expr_replacer.h"
-#include "model_smt2_pp.h"
-#include "scoped_proof.h"
-#include "qe_lite.h"
-#include "spacer_qe_project.h"
-#include "model_pp.h"
-#include "expr_safe_replace.h"
 
-#include "datatype_decl_plugin.h"
-#include "bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "muz/base/dl_util.h"
+#include "ast/for_each_expr.h"
+#include "smt/params/smt_params.h"
+#include "model/model.h"
+#include "util/ref_vector.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "util/util.h"
+#include "muz/spacer/spacer_manager.h"
+#include "muz/spacer/spacer_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "model/model_smt2_pp.h"
+#include "ast/scoped_proof.h"
+#include "qe/qe_lite.h"
+#include "muz/spacer/spacer_qe_project.h"
+#include "model/model_pp.h"
+#include "ast/rewriter/expr_safe_replace.h"
 
-#include "spacer_legacy_mev.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+
+#include "muz/spacer/spacer_legacy_mev.h"
 
 namespace spacer {
 void qe_project(ast_manager& m, app_ref_vector& vars, expr_ref& fml, model_ref& M, expr_map& map)
diff --git a/src/muz/spacer/spacer_legacy_mev.cpp b/src/muz/spacer/spacer_legacy_mev.cpp
index 0ab33c693..8b53410b1 100644
--- a/src/muz/spacer/spacer_legacy_mev.cpp
+++ b/src/muz/spacer/spacer_legacy_mev.cpp
@@ -5,34 +5,34 @@ Copyright (c) 2017 Arie Gurfinkel
 */
 
 #include <sstream>
-#include "arith_simplifier_plugin.h"
-#include "array_decl_plugin.h"
-#include "ast_pp.h"
-#include "basic_simplifier_plugin.h"
-#include "bv_simplifier_plugin.h"
-#include "bool_rewriter.h"
-#include "dl_util.h"
-#include "for_each_expr.h"
-#include "smt_params.h"
-#include "model.h"
-#include "ref_vector.h"
-#include "rewriter.h"
-#include "rewriter_def.h"
-#include "util.h"
-#include "spacer_manager.h"
-#include "spacer_legacy_mev.h"
-#include "spacer_util.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "muz/base/dl_util.h"
+#include "ast/for_each_expr.h"
+#include "smt/params/smt_params.h"
+#include "model/model.h"
+#include "util/ref_vector.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "util/util.h"
+#include "muz/spacer/spacer_manager.h"
+#include "muz/spacer/spacer_legacy_mev.h"
+#include "muz/spacer/spacer_util.h"
 #include "arith_decl_plugin.h"
-#include "expr_replacer.h"
-#include "model_smt2_pp.h"
-#include "scoped_proof.h"
-#include "qe_lite.h"
-#include "spacer_qe_project.h"
-#include "model_pp.h"
-#include "expr_safe_replace.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "model/model_smt2_pp.h"
+#include "ast/scoped_proof.h"
+#include "qe/qe_lite.h"
+#include "muz/spacer/spacer_qe_project.h"
+#include "model/model_pp.h"
+#include "ast/rewriter/expr_safe_replace.h"
 
-#include "datatype_decl_plugin.h"
-#include "bv_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
 
 namespace old {
 
diff --git a/src/muz/spacer/spacer_legacy_mev.h b/src/muz/spacer/spacer_legacy_mev.h
index 21790f022..bebf1d0db 100644
--- a/src/muz/spacer/spacer_legacy_mev.h
+++ b/src/muz/spacer/spacer_legacy_mev.h
@@ -6,16 +6,16 @@ Copyright (c) 2017 Arie Gurfinkel
 #ifndef OLD_MEV_H
 #define OLD_MEV_H
 
-#include "ast.h"
-#include "ast_pp.h"
-#include "obj_hashtable.h"
-#include "ref_vector.h"
-#include "simplifier.h"
-#include "trace.h"
-#include "vector.h"
-#include "arith_decl_plugin.h"
-#include "array_decl_plugin.h"
-#include "bv_decl_plugin.h"
+#include "ast/ast.h"
+#include "ast/ast_pp.h"
+#include "util/obj_hashtable.h"
+#include "util/ref_vector.h"
+#include "ast/simplifier/simplifier.h"
+#include "util/trace.h"
+#include "util/vector.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
 
 namespace old {
 class model_evaluator {
diff --git a/src/muz/spacer/spacer_manager.cpp b/src/muz/spacer/spacer_manager.cpp
index 077874488..4ad3e0d7f 100644
--- a/src/muz/spacer/spacer_manager.cpp
+++ b/src/muz/spacer/spacer_manager.cpp
@@ -19,15 +19,16 @@ Revision History:
 --*/
 
 #include <sstream>
-#include "spacer_manager.h"
-#include "ast_smt2_pp.h"
-#include "for_each_expr.h"
-#include "has_free_vars.h"
-#include "expr_replacer.h"
-#include "expr_abstract.h"
-#include "model2expr.h"
-#include "model_smt2_pp.h"
-#include "model_converter.h"
+
+#include "muz/spacer/spacer_manager.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/for_each_expr.h"
+#include "ast/has_free_vars.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/expr_abstract.h"
+#include "model/model2expr.h"
+#include "model/model_smt2_pp.h"
+#include "tactic/model_converter.h"
 
 namespace spacer {
 
diff --git a/src/muz/spacer/spacer_manager.h b/src/muz/spacer/spacer_manager.h
index 360c4ceb2..f2382c15d 100644
--- a/src/muz/spacer/spacer_manager.h
+++ b/src/muz/spacer/spacer_manager.h
@@ -23,19 +23,20 @@ Revision History:
 
 #include <utility>
 #include <map>
-#include "bool_rewriter.h"
-#include "expr_replacer.h"
-#include "expr_substitution.h"
-#include "map.h"
-#include "ref_vector.h"
-#include "smt_kernel.h"
-#include "spacer_util.h"
-#include "spacer_sym_mux.h"
-#include "spacer_farkas_learner.h"
-#include "spacer_smt_context_manager.h"
-#include "dl_rule.h"
 #include <vector>
 
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/expr_substitution.h"
+#include "util/map.h"
+#include "util/ref_vector.h"
+#include "smt/smt_kernel.h"
+#include "muz/spacer/spacer_util.h"
+#include "muz/spacer/spacer_sym_mux.h"
+#include "muz/spacer/spacer_farkas_learner.h"
+#include "muz/spacer/spacer_smt_context_manager.h"
+#include "muz/base/dl_rule.h"
+
 namespace smt {
 class context;
 }
diff --git a/src/muz/spacer/spacer_marshal.cpp b/src/muz/spacer/spacer_marshal.cpp
index fce0d6a34..68c90bd33 100644
--- a/src/muz/spacer/spacer_marshal.cpp
+++ b/src/muz/spacer/spacer_marshal.cpp
@@ -9,14 +9,15 @@ Abstract:
    marshaling and unmarshaling of expressions
 
    --*/
-#include "spacer_marshal.h"
+#include "muz/spacer/spacer_marshal.h"
 
 #include <sstream>
-#include "cmd_context.h"
-#include "smt2parser.h"
-#include "vector.h"
-#include "ast_smt_pp.h"
-#include "ast_pp.h"
+
+#include "cmd_context/cmd_context.h"
+#include "parsers/smt2/smt2parser.h"
+#include "util/vector.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/ast_pp.h"
 
 namespace spacer {
 std::ostream &marshal(std::ostream &os, expr_ref e, ast_manager &m)
diff --git a/src/muz/spacer/spacer_marshal.h b/src/muz/spacer/spacer_marshal.h
index e4c59628f..95cb8f26a 100644
--- a/src/muz/spacer/spacer_marshal.h
+++ b/src/muz/spacer/spacer_marshal.h
@@ -13,9 +13,10 @@ Abstract:
 #define _SPACER_MARSHAL_H_
 
 #include <string>
-#include "ast.h"
 #include <iostream>
 
+#include "ast/ast.h"
+
 namespace spacer {
 std::ostream &marshal(std::ostream &os, expr_ref e, ast_manager &m);
 std::string marshal(expr_ref e, ast_manager &m);
diff --git a/src/muz/spacer/spacer_matrix.cpp b/src/muz/spacer/spacer_matrix.cpp
index b7d03d453..3cc83996c 100644
--- a/src/muz/spacer/spacer_matrix.cpp
+++ b/src/muz/spacer/spacer_matrix.cpp
@@ -15,7 +15,7 @@ Revision History:
 
 
 --*/
-#include "spacer_matrix.h"
+#include "muz/spacer/spacer_matrix.h"
 
 namespace spacer
 {
diff --git a/src/muz/spacer/spacer_matrix.h b/src/muz/spacer/spacer_matrix.h
index def194793..4fc418f2b 100644
--- a/src/muz/spacer/spacer_matrix.h
+++ b/src/muz/spacer/spacer_matrix.h
@@ -18,7 +18,8 @@ Revision History:
 #ifndef _SPACER_MATRIX_H_
 #define _SPACER_MATRIX_H_
 
-#include "ast.h"
+#include "util/rational.h"
+#include "util/vector.h"
 
 namespace spacer {
 
diff --git a/src/muz/spacer/spacer_mev_array.cpp b/src/muz/spacer/spacer_mev_array.cpp
index 7a69eeab5..9e04b457e 100644
--- a/src/muz/spacer/spacer_mev_array.cpp
+++ b/src/muz/spacer/spacer_mev_array.cpp
@@ -14,20 +14,20 @@ Author:
 Revision History:
 
 --*/
-#include"model.h"
+#include"model/model.h"
 #include"model_evaluator_params.hpp"
-#include"rewriter_types.h"
-#include"model_evaluator.h"
-#include"spacer_mev_array.h"
-#include"bool_rewriter.h"
-#include"arith_rewriter.h"
-#include"bv_rewriter.h"
-#include"datatype_rewriter.h"
-#include"array_rewriter.h"
-#include"rewriter_def.h"
-#include"cooperate.h"
-#include"ast_pp.h"
-#include"func_interp.h"
+#include"ast/rewriter/rewriter_types.h"
+#include"model/model_evaluator.h"
+#include"muz/spacer/spacer_mev_array.h"
+#include"ast/rewriter/bool_rewriter.h"
+#include"ast/rewriter/arith_rewriter.h"
+#include"ast/rewriter/bv_rewriter.h"
+#include"ast/rewriter/datatype_rewriter.h"
+#include"ast/rewriter/array_rewriter.h"
+#include"ast/rewriter/rewriter_def.h"
+#include"util/cooperate.h"
+#include"ast/ast_pp.h"
+#include"model/func_interp.h"
 
 
 
diff --git a/src/muz/spacer/spacer_mev_array.h b/src/muz/spacer/spacer_mev_array.h
index d7904d677..078925865 100644
--- a/src/muz/spacer/spacer_mev_array.h
+++ b/src/muz/spacer/spacer_mev_array.h
@@ -18,10 +18,10 @@ Revision History:
 #ifndef _SPACER_MEV_ARRAY_H_
 #define _SPACER_MEV_ARRAY_H_
 
-#include"ast.h"
-#include"rewriter_types.h"
-#include"params.h"
-#include "array_decl_plugin.h"
+#include"ast/ast.h"
+#include"ast/rewriter/rewriter_types.h"
+#include"util/params.h"
+#include"ast/array_decl_plugin.h"
 
 /**
  * based on model_evaluator in muz/pdr/pdr_util.h

From 25c6480e6eabab36c766e72f8429991398208071 Mon Sep 17 00:00:00 2001
From: Arie Gurfinkel <arie.gurfinkel@uwaterloo.ca>
Date: Mon, 31 Jul 2017 23:16:42 -0400
Subject: [PATCH 3/3] updated include directives

---
 src/model/model_evaluator.h                   |  4 +-
 src/muz/spacer/spacer_context.h               |  6 +-
 src/muz/spacer/spacer_min_cut.cpp             |  2 +-
 src/muz/spacer/spacer_min_cut.h               |  3 +-
 src/muz/spacer/spacer_proof_utils.cpp         |  8 +--
 src/muz/spacer/spacer_proof_utils.h           |  2 +-
 src/muz/spacer/spacer_prop_solver.cpp         | 30 +++++----
 src/muz/spacer/spacer_prop_solver.h           | 17 ++---
 src/muz/spacer/spacer_qe_project.cpp          | 32 +++++----
 src/muz/spacer/spacer_qe_project.h            |  4 +-
 src/muz/spacer/spacer_smt_context_manager.cpp | 18 ++---
 src/muz/spacer/spacer_smt_context_manager.h   | 10 +--
 src/muz/spacer/spacer_sym_mux.cpp             | 17 ++---
 src/muz/spacer/spacer_sym_mux.h               |  6 +-
 src/muz/spacer/spacer_unsat_core_learner.cpp  | 11 ++--
 src/muz/spacer/spacer_unsat_core_learner.h    |  6 +-
 src/muz/spacer/spacer_unsat_core_plugin.cpp   | 24 +++----
 src/muz/spacer/spacer_unsat_core_plugin.h     |  4 +-
 src/muz/spacer/spacer_util.cpp                | 66 +++++++++----------
 src/muz/spacer/spacer_util.h                  | 26 ++++----
 src/muz/spacer/spacer_virtual_solver.cpp      | 14 ++--
 src/muz/spacer/spacer_virtual_solver.h        | 12 ++--
 22 files changed, 169 insertions(+), 153 deletions(-)

diff --git a/src/model/model_evaluator.h b/src/model/model_evaluator.h
index 2497ec927..bd2b2d664 100644
--- a/src/model/model_evaluator.h
+++ b/src/model/model_evaluator.h
@@ -22,7 +22,9 @@ Revision History:
 #include "ast/ast.h"
 #include "ast/rewriter/rewriter_types.h"
 #include "util/params.h"
+
 class model;
+class model_core;
 
 typedef rewriter_exception model_evaluator_exception;
 
@@ -46,7 +48,7 @@ public:
 
     void cleanup(params_ref const & p = params_ref());
     void reset(params_ref const & p = params_ref());
-    
+
     unsigned get_num_steps() const;
 };
 
diff --git a/src/muz/spacer/spacer_context.h b/src/muz/spacer/spacer_context.h
index 78541130c..b6cfaff0c 100644
--- a/src/muz/spacer/spacer_context.h
+++ b/src/muz/spacer/spacer_context.h
@@ -28,8 +28,10 @@ Notes:
 #undef max
 #endif
 #include <queue>
-#include "spacer_manager.h"
-#include "spacer_prop_solver.h"
+
+#include "muz/spacer/spacer_manager.h"
+#include "muz/spacer/spacer_prop_solver.h"
+
 #include "fixedpoint_params.hpp"
 
 namespace datalog {
diff --git a/src/muz/spacer/spacer_min_cut.cpp b/src/muz/spacer/spacer_min_cut.cpp
index c56ddbd66..22ff81a80 100644
--- a/src/muz/spacer/spacer_min_cut.cpp
+++ b/src/muz/spacer/spacer_min_cut.cpp
@@ -15,7 +15,7 @@ Revision History:
 
 
 --*/
-#include "spacer_min_cut.h"
+#include "muz/spacer/spacer_min_cut.h"
 
 namespace spacer {
 
diff --git a/src/muz/spacer/spacer_min_cut.h b/src/muz/spacer/spacer_min_cut.h
index ae285b9bb..c73a8d3d3 100644
--- a/src/muz/spacer/spacer_min_cut.h
+++ b/src/muz/spacer/spacer_min_cut.h
@@ -19,7 +19,8 @@ Revision History:
 #ifndef _SPACER_MIN_CUT_H_
 #define _SPACER_MIN_CUT_H_
 
-#include "ast.h"
+#include "ast/ast.h"
+#include "util/vector.h"
 
 namespace spacer {
 
diff --git a/src/muz/spacer/spacer_proof_utils.cpp b/src/muz/spacer/spacer_proof_utils.cpp
index ff020dee4..6edb29881 100644
--- a/src/muz/spacer/spacer_proof_utils.cpp
+++ b/src/muz/spacer/spacer_proof_utils.cpp
@@ -16,11 +16,11 @@ Revision History:
 
 --*/
 
-#include "spacer_proof_utils.h"
-#include "ast_util.h"
-#include "ast_pp.h"
+#include "muz/spacer/spacer_proof_utils.h"
+#include "ast/ast_util.h"
+#include "ast/ast_pp.h"
 
-#include "proof_checker.h"
+#include "ast/proof_checker/proof_checker.h"
 
 namespace spacer {
 
diff --git a/src/muz/spacer/spacer_proof_utils.h b/src/muz/spacer/spacer_proof_utils.h
index 7973c673b..f2897f7ec 100644
--- a/src/muz/spacer/spacer_proof_utils.h
+++ b/src/muz/spacer/spacer_proof_utils.h
@@ -18,7 +18,7 @@ Revision History:
 
 #ifndef _SPACER_PROOF_UTILS_H_
 #define _SPACER_PROOF_UTILS_H_
-#include "ast.h"
+#include "ast/ast.h"
 
 namespace spacer {
 /*
diff --git a/src/muz/spacer/spacer_prop_solver.cpp b/src/muz/spacer/spacer_prop_solver.cpp
index 29b34b799..27225315c 100644
--- a/src/muz/spacer/spacer_prop_solver.cpp
+++ b/src/muz/spacer/spacer_prop_solver.cpp
@@ -18,19 +18,23 @@ Revision History:
 
 --*/
 
-#include <sstream>
-#include "model.h"
-#include "spacer_util.h"
-#include "spacer_prop_solver.h"
-#include "ast_smt2_pp.h"
-#include "dl_util.h"
-#include "model_pp.h"
-#include "smt_params.h"
-#include "datatype_decl_plugin.h"
-#include "bv_decl_plugin.h"
-#include "spacer_farkas_learner.h"
-#include "ast_smt2_pp.h"
-#include "expr_replacer.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+
+#include "ast/rewriter/expr_replacer.h"
+
+#include "smt/params/smt_params.h"
+
+#include "model/model.h"
+#include "model/model_pp.h"
+
+#include "muz/base/dl_util.h"
+
+#include "muz/spacer/spacer_util.h"
+#include "muz/spacer/spacer_farkas_learner.h"
+#include "muz/spacer/spacer_prop_solver.h"
+
 #include "fixedpoint_params.hpp"
 
 namespace spacer {
diff --git a/src/muz/spacer/spacer_prop_solver.h b/src/muz/spacer/spacer_prop_solver.h
index 4f5df819b..1ddec91c6 100644
--- a/src/muz/spacer/spacer_prop_solver.h
+++ b/src/muz/spacer/spacer_prop_solver.h
@@ -23,14 +23,15 @@ Revision History:
 #include <map>
 #include <string>
 #include <utility>
-#include "ast.h"
-#include "obj_hashtable.h"
-#include "smt_kernel.h"
-#include "util.h"
-#include "vector.h"
-#include "spacer_manager.h"
-#include "spacer_smt_context_manager.h"
-#include "spacer_itp_solver.h"
+
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "smt/smt_kernel.h"
+#include "util/util.h"
+#include "util/vector.h"
+#include "muz/spacer/spacer_manager.h"
+#include "muz/spacer/spacer_smt_context_manager.h"
+#include "muz/spacer/spacer_itp_solver.h"
 
 struct fixedpoint_params;
 
diff --git a/src/muz/spacer/spacer_qe_project.cpp b/src/muz/spacer/spacer_qe_project.cpp
index cfc5d6449..62c9c2643 100644
--- a/src/muz/spacer/spacer_qe_project.cpp
+++ b/src/muz/spacer/spacer_qe_project.cpp
@@ -21,20 +21,24 @@ Revision History:
 
 --*/
 
-#include "spacer_qe_project.h"
-#include "qe_vartest.h"
-#include "qe.h"
-#include "arith_decl_plugin.h"
-#include "ast_pp.h"
-#include "th_rewriter.h"
-#include "expr_functors.h"
-#include "expr_substitution.h"
-#include "expr_replacer.h"
-#include "model_pp.h"
-#include "expr_safe_replace.h"
-#include "model_evaluator.h"
-#include "qe_lite.h"
-#include "spacer_mev_array.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/expr_functors.h"
+#include "ast/expr_substitution.h"
+
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/rewriter/th_rewriter.h"
+
+#include "model/model_evaluator.h"
+#include "model/model_pp.h"
+
+#include "qe/qe.h"
+#include "qe/qe_vartest.h"
+#include "qe/qe_lite.h"
+
+#include "muz/spacer/spacer_mev_array.h"
+#include "muz/spacer/spacer_qe_project.h"
 
 namespace
 {
diff --git a/src/muz/spacer/spacer_qe_project.h b/src/muz/spacer/spacer_qe_project.h
index 6074f0d91..b923dc3c7 100644
--- a/src/muz/spacer/spacer_qe_project.h
+++ b/src/muz/spacer/spacer_qe_project.h
@@ -20,8 +20,8 @@ Notes:
 #ifndef SPACER_QE_PROJECT_H_
 #define SPACER_QE_PROJECT_H_
 
-#include "model.h"
-#include "expr_map.h"
+#include "model/model.h"
+#include "ast/expr_map.h"
 
 namespace qe {
     /**
diff --git a/src/muz/spacer/spacer_smt_context_manager.cpp b/src/muz/spacer/spacer_smt_context_manager.cpp
index f5e5ba9c1..e6ab2c883 100644
--- a/src/muz/spacer/spacer_smt_context_manager.cpp
+++ b/src/muz/spacer/spacer_smt_context_manager.cpp
@@ -17,16 +17,16 @@ Revision History:
 
 --*/
 
-#include "spacer_smt_context_manager.h"
-#include "has_free_vars.h"
-#include "ast_pp.h"
-#include "ast_smt_pp.h"
-#include <sstream>
-#include "smt_params.h"
 
-#include "ast_pp_util.h"
-#include "smt_context.h"
-#include "spacer_util.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_pp_util.h"
+#include "ast/ast_smt_pp.h"
+
+#include "smt/smt_context.h"
+#include "smt/params/smt_params.h"
+
+#include "muz/spacer/spacer_util.h"
+#include "muz/spacer/spacer_smt_context_manager.h"
 namespace spacer {
 
 
diff --git a/src/muz/spacer/spacer_smt_context_manager.h b/src/muz/spacer/spacer_smt_context_manager.h
index fd04eaf4e..0df9bc77b 100644
--- a/src/muz/spacer/spacer_smt_context_manager.h
+++ b/src/muz/spacer/spacer_smt_context_manager.h
@@ -20,11 +20,11 @@ Revision History:
 #ifndef _SPACER_SMT_CONTEXT_MANAGER_H_
 #define _SPACER_SMT_CONTEXT_MANAGER_H_
 
-#include "smt_kernel.h"
-#include "func_decl_dependencies.h"
-#include "dl_util.h"
-#include "spacer_virtual_solver.h"
-#include "stopwatch.h"
+#include "util/stopwatch.h"
+
+#include "smt/smt_kernel.h"
+#include "muz/base/dl_util.h"
+#include "muz/spacer/spacer_virtual_solver.h"
 
 namespace spacer {
 
diff --git a/src/muz/spacer/spacer_sym_mux.cpp b/src/muz/spacer/spacer_sym_mux.cpp
index 659aea2cc..da8f8eeca 100644
--- a/src/muz/spacer/spacer_sym_mux.cpp
+++ b/src/muz/spacer/spacer_sym_mux.cpp
@@ -17,14 +17,15 @@ Revision History:
 
 --*/
 
-#include <sstream>
-#include "ast_pp.h"
-#include "for_each_expr.h"
-#include "model.h"
-#include "rewriter.h"
-#include "rewriter_def.h"
-#include "spacer_util.h"
-#include "spacer_sym_mux.h"
+#include "ast/ast_pp.h"
+#include "ast/for_each_expr.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+
+#include "model/model.h"
+
+#include "muz/spacer/spacer_util.h"
+#include "muz/spacer/spacer_sym_mux.h"
 
 using namespace spacer;
 
diff --git a/src/muz/spacer/spacer_sym_mux.h b/src/muz/spacer/spacer_sym_mux.h
index d9bae95a3..892542557 100644
--- a/src/muz/spacer/spacer_sym_mux.h
+++ b/src/muz/spacer/spacer_sym_mux.h
@@ -20,9 +20,9 @@ Revision History:
 #ifndef _SYM_MUX_H_
 #define _SYM_MUX_H_
 
-#include "ast.h"
-#include "map.h"
-#include "vector.h"
+#include "ast/ast.h"
+#include "util/map.h"
+#include "util/vector.h"
 #include <vector>
 
 class model_core;
diff --git a/src/muz/spacer/spacer_unsat_core_learner.cpp b/src/muz/spacer/spacer_unsat_core_learner.cpp
index 557858ca4..222ca146c 100644
--- a/src/muz/spacer/spacer_unsat_core_learner.cpp
+++ b/src/muz/spacer/spacer_unsat_core_learner.cpp
@@ -15,13 +15,12 @@ Revision History:
 
 
 --*/
-#include "spacer_unsat_core_learner.h"
-
-#include "spacer_unsat_core_plugin.h"
-
-#include "proof_utils.h"
-#include "for_each_expr.h"
 #include <unordered_map>
+
+#include "muz/spacer/spacer_unsat_core_learner.h"
+#include "muz/spacer/spacer_unsat_core_plugin.h"
+#include "ast/for_each_expr.h"
+
 namespace spacer
 {
 
diff --git a/src/muz/spacer/spacer_unsat_core_learner.h b/src/muz/spacer/spacer_unsat_core_learner.h
index 91ae01292..6ee7c3b37 100644
--- a/src/muz/spacer/spacer_unsat_core_learner.h
+++ b/src/muz/spacer/spacer_unsat_core_learner.h
@@ -18,9 +18,9 @@ Revision History:
 #ifndef _SPACER_UNSAT_CORE_LEARNER_H_
 #define _SPACER_UNSAT_CORE_LEARNER_H_
 
-#include "ast.h"
-#include "spacer_util.h"
-#include "spacer_proof_utils.h"
+#include "ast/ast.h"
+#include "muz/spacer/spacer_util.h"
+#include "muz/spacer/spacer_proof_utils.h"
 
 namespace spacer {
 
diff --git a/src/muz/spacer/spacer_unsat_core_plugin.cpp b/src/muz/spacer/spacer_unsat_core_plugin.cpp
index 58c700dae..a352a2460 100644
--- a/src/muz/spacer/spacer_unsat_core_plugin.cpp
+++ b/src/muz/spacer/spacer_unsat_core_plugin.cpp
@@ -15,19 +15,21 @@ Revision History:
 
 
 --*/
-#include "spacer_unsat_core_plugin.h"
-
-#include "spacer_unsat_core_learner.h"
-
-#include "smt_farkas_util.h"
-#include "bool_rewriter.h"
-#include "arith_decl_plugin.h"
 #include <set>
-#include "smt_solver.h"
-#include "solver.h"
 #include <limits>
-#include "spacer_proof_utils.h"
-#include "spacer_matrix.h"
+
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/arith_decl_plugin.h"
+
+#include "solver/solver.h"
+
+#include "smt/smt_farkas_util.h"
+#include "smt/smt_solver.h"
+
+#include "muz/spacer/spacer_proof_utils.h"
+#include "muz/spacer/spacer_matrix.h"
+#include "muz/spacer/spacer_unsat_core_plugin.h"
+#include "muz/spacer/spacer_unsat_core_learner.h"
 
 namespace spacer
 {
diff --git a/src/muz/spacer/spacer_unsat_core_plugin.h b/src/muz/spacer/spacer_unsat_core_plugin.h
index 6e1f383c1..388a2bd38 100644
--- a/src/muz/spacer/spacer_unsat_core_plugin.h
+++ b/src/muz/spacer/spacer_unsat_core_plugin.h
@@ -18,8 +18,8 @@ Revision History:
 #ifndef _SPACER_UNSAT_CORE_PLUGIN_H_
 #define _SPACER_UNSAT_CORE_PLUGIN_H_
 
-#include "ast.h"
-#include "spacer_min_cut.h"
+#include "ast/ast.h"
+#include "muz/spacer/spacer_min_cut.h"
 
 namespace spacer {
 
diff --git a/src/muz/spacer/spacer_util.cpp b/src/muz/spacer/spacer_util.cpp
index a2cf4101f..be6b12cd0 100644
--- a/src/muz/spacer/spacer_util.cpp
+++ b/src/muz/spacer/spacer_util.cpp
@@ -27,43 +27,43 @@ Notes:
 #include <sstream>
 #include <algorithm>
 
-#include "ast.h"
-#include "occurs.h"
-#include "array_decl_plugin.h"
-#include "ast_pp.h"
-#include "bool_rewriter.h"
-#include "dl_util.h"
-#include "for_each_expr.h"
-#include "smt_params.h"
-#include "model.h"
-#include "model_evaluator.h"
-#include "ref_vector.h"
-#include "rewriter.h"
-#include "rewriter_def.h"
-#include "util.h"
-#include "spacer_manager.h"
-#include "spacer_util.h"
-#include "arith_decl_plugin.h"
-#include "expr_replacer.h"
-#include "model_smt2_pp.h"
-#include "scoped_proof.h"
-#include "qe_lite.h"
-#include "spacer_qe_project.h"
-#include "model_pp.h"
-#include "expr_safe_replace.h"
+#include "ast/ast.h"
+#include "ast/occurs.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "muz/base/dl_util.h"
+#include "ast/for_each_expr.h"
+#include "smt/params/smt_params.h"
+#include "model/model.h"
+#include "model/model_evaluator.h"
+#include "util/ref_vector.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "util/util.h"
+#include "muz/spacer/spacer_manager.h"
+#include "muz/spacer/spacer_util.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "model/model_smt2_pp.h"
+#include "ast/scoped_proof.h"
+#include "qe/qe_lite.h"
+#include "muz/spacer/spacer_qe_project.h"
+#include "model/model_pp.h"
+#include "ast/rewriter/expr_safe_replace.h"
 
-#include "datatype_decl_plugin.h"
-#include "bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
 
-#include "spacer_legacy_mev.h"
-#include "qe_mbp.h"
+#include "muz/spacer/spacer_legacy_mev.h"
+#include "qe/qe_mbp.h"
 
-#include "tactical.h"
-#include "propagate_values_tactic.h"
-#include "propagate_ineqs_tactic.h"
-#include "arith_bounds_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/arith/propagate_ineqs_tactic.h"
+#include "tactic/arith/arith_bounds_tactic.h"
 
-#include "obj_equiv_class.h"
+#include "muz/spacer/obj_equiv_class.h"
 
 namespace spacer {
 
diff --git a/src/muz/spacer/spacer_util.h b/src/muz/spacer/spacer_util.h
index f51df7a7b..5bbb84bfb 100644
--- a/src/muz/spacer/spacer_util.h
+++ b/src/muz/spacer/spacer_util.h
@@ -22,20 +22,20 @@ Revision History:
 #ifndef _SPACER_UTIL_H_
 #define _SPACER_UTIL_H_
 
-#include "ast.h"
-#include "ast_pp.h"
-#include "obj_hashtable.h"
-#include "ref_vector.h"
-#include "simplifier.h"
-#include "trace.h"
-#include "vector.h"
-#include "arith_decl_plugin.h"
-#include "array_decl_plugin.h"
-#include "bv_decl_plugin.h"
-#include "model.h"
+#include "ast/ast.h"
+#include "ast/ast_pp.h"
+#include "util/obj_hashtable.h"
+#include "util/ref_vector.h"
+#include "ast/simplifier/simplifier.h"
+#include "util/trace.h"
+#include "util/vector.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "model/model.h"
 
-#include "stopwatch.h"
-#include "spacer_antiunify.h"
+#include "util/stopwatch.h"
+#include "muz/spacer/spacer_antiunify.h"
 
 class model;
 class model_core;
diff --git a/src/muz/spacer/spacer_virtual_solver.cpp b/src/muz/spacer/spacer_virtual_solver.cpp
index c6b85a3ea..c080fa2c4 100644
--- a/src/muz/spacer/spacer_virtual_solver.cpp
+++ b/src/muz/spacer/spacer_virtual_solver.cpp
@@ -17,15 +17,15 @@ Notes:
 
 --*/
 
-#include "spacer_virtual_solver.h"
-#include "ast_util.h"
-#include "ast_pp_util.h"
-#include "spacer_util.h"
-#include "bool_rewriter.h"
+#include "muz/spacer/spacer_virtual_solver.h"
+#include "ast/ast_util.h"
+#include "ast/ast_pp_util.h"
+#include "muz/spacer/spacer_util.h"
+#include "ast/rewriter/bool_rewriter.h"
 
-#include "proof_checker.h"
+#include "ast/proof_checker/proof_checker.h"
 
-#include "scoped_proof.h"
+#include "ast/scoped_proof.h"
 
 namespace spacer {
 virtual_solver::virtual_solver(virtual_solver_factory &factory,
diff --git a/src/muz/spacer/spacer_virtual_solver.h b/src/muz/spacer/spacer_virtual_solver.h
index b5e97dce0..14e05302e 100644
--- a/src/muz/spacer/spacer_virtual_solver.h
+++ b/src/muz/spacer/spacer_virtual_solver.h
@@ -18,12 +18,12 @@ Notes:
 --*/
 #ifndef SPACER_VIRTUAL_SOLVER_H_
 #define SPACER_VIRTUAL_SOLVER_H_
-#include"ast.h"
-#include"params.h"
-#include"solver_na2as.h"
-#include"smt_kernel.h"
-#include"smt_params.h"
-#include"stopwatch.h"
+#include"ast/ast.h"
+#include"util/params.h"
+#include"solver/solver_na2as.h"
+#include"smt/smt_kernel.h"
+#include"smt/params/smt_params.h"
+#include"util/stopwatch.h"
 namespace spacer {
 class virtual_solver_factory;