updated include directives

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

CMakeLists.txt

@@ -257,8 +257,10 @@ else()
   message(FATAL_ERROR "Platform \"${CMAKE_SYSTEM_NAME}\" not recognised")
 endif()
 
-list(APPEND Z3_COMPONENT_EXTRA_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/src")
-
+list(APPEND Z3_COMPONENT_EXTRA_INCLUDE_DIRS 
+  "${CMAKE_BINARY_DIR}/src"
+  "${CMAKE_SOURCE_DIR}/src"
+)
 ################################################################################
 # GNU multiple precision library support
 ################################################################################

scripts/update_include.py

@@ -8,7 +8,6 @@ is_include2 = re.compile("#include\"(.*)\"")
 
 
 def fix_include(file, paths):
-    print(file)
     tmp = "%s.tmp" % file
     ins = open(file)
     ous = open(tmp,'w')
@@ -36,6 +35,7 @@ def fix_include(file, paths):
     ins.close()
     ous.close()
     if found:
+        print(file)
         os.system("move %s %s" % (tmp, file))
     else:
         os.system("del %s" % tmp)
@@ -48,6 +48,10 @@ def find_paths(dir):
             if f.endswith('.h'):
                 path = "%s/%s" % (root1, f)
                 paths[f] = path
+            if f.endswith('.pyg'):
+                f = f.replace("pyg","hpp")
+                path = "%s/%s" % (root1, f)
+                paths[f] = path
     return paths
 
 paths = find_paths('src')
@@ -55,6 +59,8 @@ paths = find_paths('src')
 def fixup(dir):
     for root, dirs, files in os.walk(dir):
         for f in files:
+            if f == "z3.h":
+                continue
             if f.endswith('.h') or f.endswith('.cpp'):
                 path = "%s\\%s" % (root, f)
                 fix_include(path, paths)

src/ackermannization/ackermannize_bv_tactic.cpp

@@ -17,7 +17,7 @@ Revision History:
 #include "tactic/tactical.h"
 #include "ackermannization/lackr.h"
 #include "model/model_smt2_pp.h"
-#include"ackermannize_bv_tactic_params.hpp"
+#include "ackermannization/ackermannize_bv_tactic_params.hpp"
 #include "ackermannization/ackermannize_bv_model_converter.h"
 
 

src/ackermannization/lackr.cpp

@@ -16,7 +16,7 @@
 --*/
 
 #include "ackermannization/lackr.h"
-#include"ackermannization_params.hpp"
+#include "ackermannization/ackermannization_params.hpp"
 #include "tactic/tactic.h"
 #include "ackermannization/lackr_model_constructor.h"
 #include "ackermannization/ackr_info.h"

src/api/api_ast.cpp

@@ -37,7 +37,7 @@ Revision History:
 #include "util/scoped_ctrl_c.h"
 #include "util/cancel_eh.h"
 #include "util/scoped_timer.h"
-#include"pp_params.hpp"
+#include "ast/pp_params.hpp"
 
 extern bool is_numeral_sort(Z3_context c, Z3_sort ty);
 

src/api/api_model.cpp

@@ -25,8 +25,8 @@ Revision History:
 #include "model/model.h"
 #include "model/model_v2_pp.h"
 #include "model/model_smt2_pp.h"
-#include"model_params.hpp"
-#include"model_evaluator_params.hpp"
+#include "model/model_params.hpp"
+#include "model/model_evaluator_params.hpp"
 
 extern "C" {
 

src/api/api_qe.cpp

@@ -18,19 +18,19 @@ Notes:
 --*/
 
 #include <iostream>
-#include "z3.h"
+#include "api/z3.h"
 #include "api_log_macros.h"
-#include "api_context.h"
-#include "api_util.h"
-#include "api_model.h"
-#include "api_ast_map.h"
-#include "api_ast_vector.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "api/api_model.h"
+#include "api/api_ast_map.h"
+#include "api/api_ast_vector.h"
 
-#include "qe_vartest.h"
-#include "qe_lite.h"
-#include "spacer_util.h"
+#include "qe/qe_vartest.h"
+#include "qe/qe_lite.h"
+#include "muz/spacer/spacer_util.h"
 
-#include "expr_map.h"
+#include "ast/expr_map.h"
 
 extern "C"
 {

src/ast/ast_smt2_pp.cpp

@@ -24,7 +24,7 @@ Revision History:
 #include "ast/ast_ll_pp.h"
 #include "ast/ast_pp.h"
 #include "math/polynomial/algebraic_numbers.h"
-#include"pp_params.hpp"
+#include "ast/pp_params.hpp"
 using namespace format_ns;
 
 #define ALIAS_PREFIX "a"

src/ast/fpa/fpa2bv_rewriter.cpp

@@ -21,7 +21,7 @@ Notes:
 #include "ast/rewriter/rewriter_def.h"
 #include "ast/fpa/fpa2bv_rewriter.h"
 #include "util/cooperate.h"
-#include"fpa2bv_rewriter_params.hpp"
+#include "ast/fpa/fpa2bv_rewriter_params.hpp"
 
 
 fpa2bv_rewriter_cfg::fpa2bv_rewriter_cfg(ast_manager & m, fpa2bv_converter & c, params_ref const & p) :

src/ast/normal_forms/nnf.cpp

@@ -18,7 +18,7 @@ Notes:
 
 --*/
 #include "ast/normal_forms/nnf.h"
-#include"nnf_params.hpp"
+#include "ast/normal_forms/nnf_params.hpp"
 #include "util/warning.h"
 #include "ast/used_vars.h"
 #include "ast/well_sorted.h"

src/ast/pattern/pattern_inference.cpp

@@ -576,7 +576,7 @@ void pattern_inference::mk_patterns(unsigned num_bindings,
     m_candidates.reset();
 }
 
-#include "database.h"
+#include "ast/pattern/database.h"
 
 void pattern_inference::reduce1_quantifier(quantifier * q) {
     TRACE("pattern_inference", tout << "processing:\n" << mk_pp(q, m) << "\n";);

src/ast/pattern/pattern_inference_params.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "ast/pattern/pattern_inference_params.h"
-#include"pattern_inference_params_helper.hpp"
+#include "ast/pattern/pattern_inference_params_helper.hpp"
 
 void pattern_inference_params::updt_params(params_ref const & _p) {
     pattern_inference_params_helper p(_p);

src/ast/pp.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "ast/pp.h"
-#include"pp_params.hpp"
+#include "ast/pp_params.hpp"
 using namespace format_ns;
 
 static std::pair<unsigned, bool> space_upto_line_break(ast_manager & m, format * f) {

src/ast/rewriter/arith_rewriter.cpp

@@ -17,7 +17,7 @@ Notes:
 
 --*/
 #include "ast/rewriter/arith_rewriter.h"
-#include"arith_rewriter_params.hpp"
+#include "ast/rewriter/arith_rewriter_params.hpp"
 #include "ast/rewriter/poly_rewriter_def.h"
 #include "math/polynomial/algebraic_numbers.h"
 #include "ast/ast_pp.h"

src/ast/rewriter/array_rewriter.cpp

@@ -17,7 +17,7 @@ Notes:
 
 --*/
 #include "ast/rewriter/array_rewriter.h"
-#include"array_rewriter_params.hpp"
+#include "ast/rewriter/array_rewriter_params.hpp"
 #include "ast/ast_lt.h"
 #include "ast/ast_pp.h"
 

src/ast/rewriter/bool_rewriter.cpp

@@ -17,7 +17,7 @@ Notes:
 
 --*/
 #include "ast/rewriter/bool_rewriter.h"
-#include"bool_rewriter_params.hpp"
+#include "ast/rewriter/bool_rewriter_params.hpp"
 #include "ast/rewriter/rewriter_def.h"
 
 void bool_rewriter::updt_params(params_ref const & _p) {

src/ast/rewriter/bv_rewriter.cpp

@@ -17,7 +17,7 @@ Notes:
 
 --*/
 #include "ast/rewriter/bv_rewriter.h"
-#include"bv_rewriter_params.hpp"
+#include "ast/rewriter/bv_rewriter_params.hpp"
 #include "ast/rewriter/poly_rewriter_def.h"
 #include "ast/ast_smt2_pp.h"
 

src/ast/rewriter/fpa_rewriter.cpp

@@ -17,7 +17,7 @@ Notes:
 
 --*/
 #include "ast/rewriter/fpa_rewriter.h"
-#include"fpa_rewriter_params.hpp"
+#include "ast/rewriter/fpa_rewriter_params.hpp"
 #include "ast/ast_smt2_pp.h"
 
 fpa_rewriter::fpa_rewriter(ast_manager & m, params_ref const & p) :

src/ast/rewriter/poly_rewriter_def.h

@@ -17,7 +17,7 @@ Notes:
 
 --*/
 #include "ast/rewriter/poly_rewriter.h"
-#include"poly_rewriter_params.hpp"
+#include "ast/rewriter/poly_rewriter_params.hpp"
 #include "ast/ast_lt.h"
 #include "ast/ast_ll_pp.h"
 #include "ast/ast_smt2_pp.h"

src/ast/rewriter/th_rewriter.cpp

@@ -17,7 +17,7 @@ Notes:
 
 --*/
 #include "ast/rewriter/th_rewriter.h"
-#include"rewriter_params.hpp"
+#include "ast/rewriter/rewriter_params.hpp"
 #include "ast/rewriter/bool_rewriter.h"
 #include "ast/rewriter/arith_rewriter.h"
 #include "ast/rewriter/bv_rewriter.h"

src/ast/simplifier/arith_simplifier_params.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "ast/simplifier/arith_simplifier_params.h"
-#include"arith_simplifier_params_helper.hpp"
+#include "ast/simplifier/arith_simplifier_params_helper.hpp"
 
 void arith_simplifier_params::updt_params(params_ref const & _p) {
     arith_simplifier_params_helper p(_p);

src/ast/simplifier/array_simplifier_params.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "ast/simplifier/array_simplifier_params.h"
-#include"array_simplifier_params_helper.hpp"
+#include "ast/simplifier/array_simplifier_params_helper.hpp"
 
 void array_simplifier_params::updt_params(params_ref const & _p) {
     array_simplifier_params_helper p(_p);

src/ast/simplifier/bv_simplifier_params.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 #include "ast/simplifier/bv_simplifier_params.h"
-#include"bv_simplifier_params_helper.hpp"
-#include"bv_rewriter_params.hpp"
+#include "ast/simplifier/bv_simplifier_params_helper.hpp"
+#include "ast/rewriter/bv_rewriter_params.hpp"
 
 void bv_simplifier_params::updt_params(params_ref const & _p) {
     bv_simplifier_params_helper p(_p);

src/cmd_context/basic_cmds.cpp

@@ -29,7 +29,7 @@ Notes:
 #include "util/gparams.h"
 #include "util/env_params.h"
 #include "ast/well_sorted.h"
-#include"pp_params.hpp"
+#include "ast/pp_params.hpp"
 
 class help_cmd : public cmd {
     svector<symbol> m_cmds;

src/cmd_context/cmd_context.cpp

@@ -43,7 +43,7 @@ Notes:
 #include "cmd_context/interpolant_cmds.h"
 #include "model/model_smt2_pp.h"
 #include "model/model_v2_pp.h"
-#include"model_params.hpp"
+#include "model/model_params.hpp"
 #include "ast/rewriter/th_rewriter.h"
 #include "tactic/tactic_exception.h"
 #include "solver/smt_logics.h"

src/cmd_context/extra_cmds/polynomial_cmds.cpp

@@ -29,7 +29,7 @@ Notes:
 #include "math/polynomial/polynomial_var2value.h"
 #include "ast/expr2var.h"
 #include "ast/pp.h"
-#include"pp_params.hpp"
+#include "ast/pp_params.hpp"
 
 static void to_poly(cmd_context & ctx, expr * t) {
     polynomial::numeral_manager nm;

src/cmd_context/interpolant_cmds.cpp

@@ -31,7 +31,7 @@
 #include "interp/iz3interp.h"
 #include "interp/iz3checker.h"
 #include "interp/iz3profiling.h"
-#include"interp_params.hpp"
+#include "interp/interp_params.hpp"
 #include "ast/scoped_proof.h"
 
 static void show_interpolant_and_maybe_check(cmd_context & ctx,

src/math/polynomial/algebraic_numbers.cpp

@@ -25,7 +25,7 @@ Notes:
 #include "util/scoped_ptr_vector.h"
 #include "util/mpbqi.h"
 #include "util/timeit.h"
-#include"algebraic_params.hpp"
+#include "math/polynomial/algebraic_params.hpp"
 #include "util/common_msgs.h"
 
 namespace algebraic_numbers {

src/math/realclosure/realclosure.cpp

@@ -20,7 +20,7 @@ Notes:
 
 --*/
 #include "math/realclosure/realclosure.h"
-#include"rcf_params.hpp"
+#include "math/realclosure/rcf_params.hpp"
 #include "util/array.h"
 #include "util/mpbq.h"
 #include "math/realclosure/mpz_matrix.h"

src/model/model_evaluator.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "model/model.h"
-#include"model_evaluator_params.hpp"
+#include "model/model_evaluator_params.hpp"
 #include "ast/rewriter/rewriter_types.h"
 #include "model/model_evaluator.h"
 #include "ast/rewriter/bool_rewriter.h"

src/muz/base/dl_context.cpp

@@ -27,7 +27,7 @@ Revision History:
 #include "ast/ast_smt2_pp.h"
 #include "ast/datatype_decl_plugin.h"
 #include "ast/scoped_proof.h"
-#include"fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 #include "ast/ast_pp_util.h"
 
 

src/muz/bmc/dl_bmc_engine.cpp

@@ -33,7 +33,7 @@ Revision History:
 #include "muz/transforms/dl_mk_rule_inliner.h"
 #include "ast/scoped_proof.h"
 
-#include "fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 
 namespace datalog {
 

src/muz/duality/duality_dl_interface.cpp

@@ -34,7 +34,7 @@
 #include "ast/expr_abstract.h"
 #include "model/model_smt2_pp.h"
 #include "model/model_v2_pp.h"
-#include "fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 #include "ast/used_vars.h"
 #include "ast/func_decl_dependencies.h"
 #include "muz/transforms/dl_transforms.h"

src/muz/fp/dl_cmds.cpp

@@ -30,7 +30,7 @@ Notes:
 #include "util/scoped_ctrl_c.h"
 #include "util/scoped_timer.h"
 #include "util/trail.h"
-#include"fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 #include<iomanip>
 
 

src/muz/fp/horn_tactic.cpp

@@ -27,7 +27,7 @@ Revision History:
 #include "muz/transforms/dl_mk_slice.h"
 #include "tactic/filter_model_converter.h"
 #include "muz/transforms/dl_transforms.h"
-#include"fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 #include "ast/ast_util.h"
 #include "ast/rewriter/var_subst.h"
 

src/muz/pdr/pdr_context.h

@@ -28,7 +28,7 @@ Revision History:
 #include "muz/pdr/pdr_manager.h"
 #include "muz/pdr/pdr_prop_solver.h"
 #include "muz/pdr/pdr_reachable_cache.h"
-#include "fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 
 
 namespace datalog {

src/muz/spacer/spacer_context.h

@@ -32,7 +32,7 @@ Notes:
 #include "muz/spacer/spacer_manager.h"
 #include "muz/spacer/spacer_prop_solver.h"
 
-#include "fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 
 namespace datalog {
     class rule_set;
@@ -174,7 +174,7 @@ class pred_transformer {
     };
 
     /// manager of the lemmas in all the frames
-#include "spacer_legacy_frames.h"
+#include "muz/spacer/spacer_legacy_frames.h"
     class frames {
     private:
         pred_transformer &m_pt;

src/muz/spacer/spacer_legacy_frames.cpp

@@ -19,7 +19,7 @@
 #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 "muz/transforms/dl_mk_rule_inliner.h"
 #include "ast/ast_smt2_pp.h"
 #include "ast/ast_ll_pp.h"
 #include "ast/ast_util.h"

src/muz/spacer/spacer_legacy_mev.cpp

@@ -22,7 +22,7 @@ Copyright (c) 2017 Arie Gurfinkel
 #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 "ast/arith_decl_plugin.h"
 #include "ast/rewriter/expr_replacer.h"
 #include "model/model_smt2_pp.h"
 #include "ast/scoped_proof.h"

src/muz/spacer/spacer_mev_array.cpp

@@ -15,7 +15,7 @@ Revision History:
 
 --*/
 #include"model/model.h"
-#include"model_evaluator_params.hpp"
+#include "model/model_evaluator_params.hpp"
 #include"ast/rewriter/rewriter_types.h"
 #include"model/model_evaluator.h"
 #include"muz/spacer/spacer_mev_array.h"

src/muz/spacer/spacer_prop_solver.cpp

@@ -35,7 +35,7 @@ Revision History:
 #include "muz/spacer/spacer_farkas_learner.h"
 #include "muz/spacer/spacer_prop_solver.h"
 
-#include "fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 
 namespace spacer {
 

src/muz/tab/tab_context.cpp

@@ -30,7 +30,7 @@ Revision History:
 #include "ast/for_each_expr.h"
 #include "ast/substitution/matcher.h"
 #include "ast/scoped_proof.h"
-#include "fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 #include "ast/ast_util.h"
 
 namespace tb {

src/muz/transforms/dl_mk_array_eq_rewrite.cpp

@@ -15,126 +15,111 @@ Revision History:
 
 --*/
 
-
-#include "dl_mk_array_eq_rewrite.h"
-#include "dl_context.h"
-#include "pattern_inference.h"
-#include "dl_context.h"
-#include "expr_safe_replace.h"
-#include "expr_abstract.h"
-#include"fixedpoint_params.hpp"
+#include "ast/pattern/pattern_inference.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/expr_abstract.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/fixedpoint_params.hpp"
+#include "muz/transforms/dl_mk_array_eq_rewrite.h"
 #include "../spacer/obj_equiv_class.h"
 
+// NSB code review: avoid dependency on spacer inside this directory.
+// The python build system will rightfully complain if you include 
+// "muz/spacer/obj_equiv_class.h".
+
 namespace datalog {
 
-  mk_array_eq_rewrite::mk_array_eq_rewrite(
+    mk_array_eq_rewrite::mk_array_eq_rewrite(
         context & ctx, unsigned priority):
         plugin(priority),
         m(ctx.get_manager()),
         m_ctx(ctx),
         m_a(m)
-  {
-  }
-
-  rule_set * mk_array_eq_rewrite::operator()(rule_set const & source)
-  {
-    src_set = &source;
-    rule_set * result = alloc(rule_set, m_ctx);
-    result->inherit_predicates(source);
-    dst=result;
-    unsigned nbrules = source.get_num_rules();
-    src_manager = &source.get_rule_manager();
-    for(unsigned i =0;i<nbrules;i++)
     {
-      rule & r = *source.get_rule(i);
-      instantiate_rule(r, *result);
-    }
-    return result;
-  }
-
-  void mk_array_eq_rewrite::instantiate_rule(const rule& r, rule_set & dest)
-  {
-    //Reset everything
-    cnt = src_manager->get_counter().get_max_rule_var(r)+1;
-
-
-    expr_ref_vector new_tail(m);
-    unsigned nb_predicates = r.get_uninterpreted_tail_size();
-    unsigned tail_size = r.get_tail_size();
-    for(unsigned i=0;i<nb_predicates;i++)
-    {
-      new_tail.push_back(r.get_tail(i));
     }
 
-    spacer::expr_equiv_class array_eq_classes(m);
-    for(unsigned i=nb_predicates;i<tail_size;i++)
+    rule_set * mk_array_eq_rewrite::operator()(rule_set const & source)
     {
-      expr* cond = r.get_tail(i);
-      expr* e1, *e2;
-      if(m.is_eq(cond, e1, e2) && m_a.is_array(get_sort(e1)))
-      {
-        array_eq_classes.merge(e1, e2);
-      }
-      else
-      {
-        new_tail.push_back(cond);
-      }
-    }
-
-    for(spacer::expr_equiv_class::equiv_iterator c_eq = array_eq_classes.begin();
-        c_eq != array_eq_classes.end();++c_eq)
-    {
-      expr* representative = *(*c_eq).begin();
-      for(spacer::expr_equiv_class::iterator it = (*c_eq).begin();
-          it!=(*c_eq).end(); ++it)
-      {
-        if(!is_var(*it))
-        {
-          representative = *it;
-          break;
+        m_src_set = &source;
+        rule_set * result = alloc(rule_set, m_ctx);
+        result->inherit_predicates(source);
+        m_dst = result;
+        m_src_manager = &source.get_rule_manager();
+        for (rule * rp : source) {
+            instantiate_rule(*rp, *result);
         }
-      }
-      for(spacer::expr_equiv_class::iterator it = (*c_eq).begin();
-          it!=(*c_eq).end(); ++it)
-      {
-        for(unsigned i=0;i<new_tail.size();i++)
-          new_tail[i] = replace(new_tail[i].get(), representative, *it);
-      }
-      for(spacer::expr_equiv_class::iterator it = (*c_eq).begin();
-          it!=(*c_eq).end(); ++it)
-      {
-        new_tail.push_back(m.mk_eq(*it, representative));
-      }
+        return result;
     }
-    params_ref select_over_store;
-    select_over_store.set_bool("expand_select_store", true);
-    th_rewriter t(m, select_over_store);
-    expr_ref_vector res_conjs(m);
-    for(unsigned i=0;i<new_tail.size();i++)
-    {
-      expr_ref tmp(m);
-      t(new_tail[i].get(), tmp);
-      res_conjs.push_back(tmp);
-    }
-    proof_ref pr(m);
-    src_manager->mk_rule(m.mk_implies(m.mk_and(res_conjs.size(), res_conjs.c_ptr()), r.get_head()), pr, dest, r.name());
-  }
 
-  expr* mk_array_eq_rewrite::replace(expr* e, expr* new_val, expr* old_val)
-  {
-    if(e==old_val)
-      return new_val;
-    else if(!is_app(e))
+    void mk_array_eq_rewrite::instantiate_rule(const rule& r, rule_set & dest)
     {
-      return e;
+        //Reset everything
+        m_cnt = m_src_manager->get_counter().get_max_rule_var(r)+1;
+
+
+        expr_ref_vector new_tail(m);
+        unsigned nb_predicates = r.get_uninterpreted_tail_size();
+        unsigned tail_size = r.get_tail_size();
+        for (unsigned i = 0; i < nb_predicates; i++) {
+            new_tail.push_back(r.get_tail(i));
+        }
+
+        spacer::expr_equiv_class array_eq_classes(m);
+        for(unsigned i = nb_predicates; i < tail_size; i++) {
+            expr* cond = r.get_tail(i);
+            expr* e1, *e2;
+            if (m.is_eq(cond, e1, e2) && m_a.is_array(get_sort(e1))) {
+                array_eq_classes.merge(e1, e2);
+            }
+            else {
+                new_tail.push_back(cond);
+            }
+        }
+
+        for (auto & c_eq : array_eq_classes) {
+            expr* representative = *(c_eq.begin());
+            for (expr * v : c_eq) {
+                if (!is_var(v)) {
+                    representative = v;
+                    break;
+                }
+            }
+            for (expr * v : c_eq) {
+                for (unsigned i = 0; i < new_tail.size(); i++)
+                    new_tail[i] = replace(new_tail[i].get(), representative, v);
+            }
+            for (expr * v : c_eq) {
+                new_tail.push_back(m.mk_eq(v, representative));
+            }
+        }
+        params_ref select_over_store;
+        select_over_store.set_bool("expand_select_store", true);
+        th_rewriter t(m, select_over_store);
+        expr_ref_vector res_conjs(m);
+        for (expr* e : new_tail) {
+            expr_ref tmp(m);
+            t(e, tmp);
+            res_conjs.push_back(tmp);
+        }
+        proof_ref pr(m);
+        m_src_manager->mk_rule(m.mk_implies(m.mk_and(res_conjs.size(), res_conjs.c_ptr()), r.get_head()), pr, dest, r.name());
     }
-    app*f = to_app(e);
-    ptr_vector<expr> n_args;
-    for(unsigned i=0;i<f->get_num_args();i++)
+
+    // NSB Code review: use substitution facility, such as expr_safe_replace or expr_replacer.
+    expr* mk_array_eq_rewrite::replace(expr* e, expr* new_val, expr* old_val)
     {
-      n_args.push_back(replace(f->get_arg(i), new_val, old_val));
+        if (e == old_val)
+            return new_val;
+        else if (!is_app(e)) {
+            return e;
+        }
+        app* f = to_app(e);
+        ptr_vector<expr> n_args;
+        for (expr * arg : *f) {
+            n_args.push_back(replace(arg, new_val, old_val));
+        }
+        return m.mk_app(f->get_decl(), n_args.size(), n_args.c_ptr());
     }
-    return m.mk_app(f->get_decl(), n_args.size(), n_args.c_ptr());
-  }
 
 }

src/muz/transforms/dl_mk_array_eq_rewrite.h

@@ -19,7 +19,7 @@ Revision History:
 #define DL_MK_ARRAY_EQ_REWRITE_H_
 
 
-#include "dl_rule_transformer.h"
+#include "muz/base/dl_rule_transformer.h"
 #include "../spacer/obj_equiv_class.h"
 
 namespace datalog {
@@ -29,13 +29,13 @@ namespace datalog {
        //Context objects
        ast_manager&      m;
        context&          m_ctx;
-       array_util   m_a;
+       array_util        m_a;
     
        //Rule set context
-       const rule_set*src_set;
-       rule_set*dst;
-       rule_manager* src_manager;
-       unsigned cnt;//Index for new variables
+       const rule_set*   m_src_set;
+       rule_set*         m_dst;
+       rule_manager*     m_src_manager;
+       unsigned          m_cnt;//Index for new variables
 
        expr* replace(expr* e, expr* new_val, expr* old_val);
        void instantiate_rule(const rule& r, rule_set & dest);

src/muz/transforms/dl_mk_array_instantiation.cpp

@@ -17,13 +17,13 @@ Revision History:
 --*/
 
 
-#include "dl_mk_array_instantiation.h"
-#include "dl_context.h"
-#include "pattern_inference.h"
-#include "dl_context.h"
-#include "expr_safe_replace.h"
-#include "expr_abstract.h"
-#include"fixedpoint_params.hpp"
+#include "muz/transforms/dl_mk_array_instantiation.h"
+#include "muz/base/dl_context.h"
+#include "ast/pattern/pattern_inference.h"
+#include "muz/base/dl_context.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/expr_abstract.h"
+#include "muz/base/fixedpoint_params.hpp"
 #include "../spacer/obj_equiv_class.h"
 
 namespace datalog {

src/muz/transforms/dl_mk_array_instantiation.h

@@ -70,7 +70,7 @@ Revision History:
 #define DL_MK_ARRAY_INSTANTIATION_H_
 
 
-#include "dl_rule_transformer.h"
+#include "muz/base/dl_rule_transformer.h"
 #include "../spacer/obj_equiv_class.h"
 
 namespace datalog {

src/muz/transforms/dl_mk_bit_blast.cpp

@@ -24,7 +24,7 @@ Revision History:
 #include "ast/rewriter/expr_safe_replace.h"
 #include "tactic/filter_model_converter.h"
 #include "muz/transforms/dl_mk_interp_tail_simplifier.h"
-#include "fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 #include "ast/scoped_proof.h"
 #include "model/model_v2_pp.h"
 

src/muz/transforms/dl_mk_interp_tail_simplifier.cpp

@@ -27,7 +27,7 @@ Revision History:
 #include "muz/transforms/dl_mk_interp_tail_simplifier.h"
 #include "ast/ast_util.h"
 
-#include "fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 namespace datalog {
 
     // -----------------------------------

src/muz/transforms/dl_mk_quantifier_abstraction.cpp

@@ -23,7 +23,7 @@ Revision History:
 #include "muz/base/dl_context.h"
 #include "ast/rewriter/expr_safe_replace.h"
 #include "ast/expr_abstract.h"
-#include"fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 
 
 namespace datalog {

src/muz/transforms/dl_mk_rule_inliner.cpp

@@ -52,7 +52,7 @@ Subsumption transformation (remove rule):
 #include "ast/rewriter/rewriter.h"
 #include "ast/rewriter/rewriter_def.h"
 #include "muz/transforms/dl_mk_rule_inliner.h"
-#include "fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_scale.cpp

@@ -18,7 +18,7 @@ Revision History:
 
 #include "muz/transforms/dl_mk_scale.h"
 #include "muz/base/dl_context.h"
-#include"fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 
 namespace datalog {
 

src/muz/transforms/dl_mk_subsumption_checker.cpp

@@ -25,7 +25,7 @@ Revision History:
 #include "ast/rewriter/rewriter_def.h"
 #include "muz/transforms/dl_mk_subsumption_checker.h"
 
-#include "fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 namespace datalog {
 
 

src/muz/transforms/dl_transforms.cpp

@@ -35,7 +35,7 @@ Revision History:
 #include "muz/transforms/dl_mk_scale.h"
 #include "muz/transforms/dl_mk_array_eq_rewrite.h"
 #include "muz/transforms/dl_mk_array_instantiation.h"
-#include "fixedpoint_params.hpp"
+#include "muz/base/fixedpoint_params.hpp"
 
 namespace datalog {
 

src/nlsat/nlsat_solver.cpp

@@ -31,7 +31,7 @@ Revision History:
 #include "util/dependency.h"
 #include "math/polynomial/polynomial_cache.h"
 #include "util/permutation.h"
-#include"nlsat_params.hpp"
+#include "nlsat/nlsat_params.hpp"
 
 #define NLSAT_EXTRA_VERBOSE
 

src/opt/maxres.cpp

@@ -61,7 +61,7 @@ Notes:
 #include "sat/sat_solver/inc_sat_solver.h"
 #include "opt/opt_context.h"
 #include "ast/pb_decl_plugin.h"
-#include "opt_params.hpp"
+#include "opt/opt_params.hpp"
 #include "ast/ast_util.h"
 #include "smt/smt_solver.h"
 

src/opt/opt_cmds.cpp

@@ -29,7 +29,7 @@ Notes:
 #include "util/scoped_ctrl_c.h"
 #include "util/scoped_timer.h"
 #include "cmd_context/parametric_cmd.h"
-#include "opt_params.hpp"
+#include "opt/opt_params.hpp"
 #include "model/model_smt2_pp.h"
 
 static opt::context& get_opt(cmd_context& cmd, opt::context* opt) {

src/opt/opt_context.cpp

@@ -20,7 +20,7 @@ Notes:
 #include "opt/opt_context.h"
 #include "ast/ast_pp.h"
 #include "opt/opt_solver.h"
-#include "opt_params.hpp"
+#include "opt/opt_params.hpp"
 #include "ast/for_each_expr.h"
 #include "tactic/goal.h"
 #include "tactic/tactic.h"

src/opt/opt_solver.cpp

@@ -29,8 +29,8 @@ Notes:
 #include "smt/theory_lra.h"
 #include "ast/ast_pp.h"
 #include "ast/ast_smt_pp.h"
-#include "pp_params.hpp"
-#include "opt_params.hpp"
+#include "ast/pp_params.hpp"
+#include "opt/opt_params.hpp"
 #include "model/model_smt2_pp.h"
 #include "util/stopwatch.h"
 

src/opt/optsmt.cpp

@@ -37,7 +37,7 @@ Notes:
 #include "ast/ast_util.h"
 #include "model/model_pp.h"
 #include "ast/rewriter/th_rewriter.h"
-#include "opt_params.hpp"
+#include "opt/opt_params.hpp"
 
 namespace opt {
 

src/parsers/smt/smtlib_solver.cpp

@@ -28,8 +28,8 @@ Revision History:
 #include "solver/solver.h"
 #include "tactic/portfolio/smt_strategic_solver.h"
 #include "cmd_context/cmd_context.h"
-#include"model_params.hpp"
-#include"parser_params.hpp"
+#include "model/model_params.hpp"
+#include "parsers/util/parser_params.hpp"
 
 namespace smtlib {
 

src/parsers/smt2/smt2parser.cpp

@@ -29,7 +29,7 @@ Revision History:
 #include "ast/rewriter/rewriter.h"
 #include "ast/has_free_vars.h"
 #include "ast/ast_smt2_pp.h"
-#include"parser_params.hpp"
+#include "parsers/util/parser_params.hpp"
 #include<sstream>
 
 namespace smt2 {

src/parsers/smt2/smt2scanner.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "parsers/smt2/smt2scanner.h"
-#include"parser_params.hpp"
+#include "parsers/util/parser_params.hpp"
 
 namespace smt2 {
 

src/sat/sat_asymm_branch.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "sat/sat_asymm_branch.h"
-#include"sat_asymm_branch_params.hpp"
+#include "sat/sat_asymm_branch_params.hpp"
 #include "sat/sat_solver.h"
 #include "util/stopwatch.h"
 #include "util/trace.h"

src/sat/sat_config.cpp

@@ -18,7 +18,7 @@ Revision History:
 --*/
 #include "sat/sat_config.h"
 #include "sat/sat_types.h"
-#include"sat_params.hpp"
+#include "sat/sat_params.hpp"
 
 namespace sat {
 

src/sat/sat_scc.cpp

@@ -21,7 +21,7 @@ Revision History:
 #include "sat/sat_elim_eqs.h"
 #include "util/stopwatch.h"
 #include "util/trace.h"
-#include"sat_scc_params.hpp"
+#include "sat/sat_scc_params.hpp"
 
 namespace sat {
 

src/sat/sat_simplifier.cpp

@@ -19,7 +19,7 @@ Revision History:
 
 --*/
 #include "sat/sat_simplifier.h"
-#include"sat_simplifier_params.hpp"
+#include "sat/sat_simplifier_params.hpp"
 #include "sat/sat_solver.h"
 #include "util/stopwatch.h"
 #include "util/trace.h"

src/shell/lp_frontend.cpp

@@ -7,7 +7,7 @@ Author:
 
 --*/
 
-#include "lp_params.hpp"
+#include "util/lp/lp_params.hpp"
 #include "util/lp/lp_settings.h"
 #include "util/lp/mps_reader.h"
 #include "util/timeout.h"

src/smt/params/dyn_ack_params.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "smt/params/dyn_ack_params.h"
-#include"smt_params_helper.hpp"
+#include "smt/params/smt_params_helper.hpp"
 
 void dyn_ack_params::updt_params(params_ref const & _p) {
     smt_params_helper p(_p);

src/smt/params/preprocessor_params.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "smt/params/preprocessor_params.h"
-#include"smt_params_helper.hpp"
+#include "smt/params/smt_params_helper.hpp"
 
 void preprocessor_params::updt_local_params(params_ref const & _p) {
     smt_params_helper p(_p);

src/smt/params/qi_params.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "smt/params/qi_params.h"
-#include"smt_params_helper.hpp"
+#include "smt/params/smt_params_helper.hpp"
 
 void qi_params::updt_params(params_ref const & _p) {
     smt_params_helper p(_p);

src/smt/params/smt_params.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 #include "smt/params/smt_params.h"
-#include"smt_params_helper.hpp"
-#include"model_params.hpp"
+#include "smt/params/smt_params_helper.hpp"
+#include "model/model_params.hpp"
 #include "util/gparams.h"
 
 void smt_params::updt_local_params(params_ref const & _p) {

src/smt/params/theory_arith_params.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "smt/params/theory_arith_params.h"
-#include"smt_params_helper.hpp"
+#include "smt/params/smt_params_helper.hpp"
 
 void theory_arith_params::updt_params(params_ref const & _p) {
     smt_params_helper p(_p);

src/smt/params/theory_array_params.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "smt/params/theory_array_params.h"
-#include"smt_params_helper.hpp"
+#include "smt/params/smt_params_helper.hpp"
 
 void theory_array_params::updt_params(params_ref const & _p) {
     smt_params_helper p(_p);

src/smt/params/theory_bv_params.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "smt/params/theory_bv_params.h"
-#include"smt_params_helper.hpp"
+#include "smt/params/smt_params_helper.hpp"
 
 void theory_bv_params::updt_params(params_ref const & _p) {
     smt_params_helper p(_p);

src/smt/params/theory_pb_params.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "smt/params/theory_pb_params.h"
-#include"smt_params_helper.hpp"
+#include "smt/params/smt_params_helper.hpp"
 
 void theory_pb_params::updt_params(params_ref const & _p) {
     smt_params_helper p(_p);

src/smt/params/theory_str_params.cpp

@@ -16,7 +16,7 @@ Revision History:
 --*/
 
 #include "smt/params/theory_str_params.h"
-#include"smt_params_helper.hpp"
+#include "smt/params/smt_params_helper.hpp"
 
 void theory_str_params::updt_params(params_ref const & _p) {
     smt_params_helper p(_p);

src/smt/proto_model/proto_model.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include "smt/proto_model/proto_model.h"
-#include"model_params.hpp"
+#include "model/model_params.hpp"
 #include "ast/ast_pp.h"
 #include "ast/ast_ll_pp.h"
 #include "ast/rewriter/var_subst.h"

src/smt/smt_kernel.cpp

@@ -19,7 +19,7 @@ Revision History:
 #include "smt/smt_kernel.h"
 #include "smt/smt_context.h"
 #include "ast/ast_smt2_pp.h"
-#include"smt_params_helper.hpp"
+#include "smt/params/smt_params_helper.hpp"
 
 namespace smt {
 

src/smt/smt_solver.cpp

@@ -20,7 +20,7 @@ Notes:
 #include "smt/smt_kernel.h"
 #include "ast/reg_decl_plugins.h"
 #include "smt/params/smt_params.h"
-#include"smt_params_helper.hpp"
+#include "smt/params/smt_params_helper.hpp"
 #include "solver/mus.h"
 #include "ast/for_each_expr.h"
 #include "ast/ast_smt2_pp.h"

src/smt/tactic/smt_tactic.cpp

@@ -20,8 +20,8 @@ Notes:
 #include "tactic/tactical.h"
 #include "smt/smt_kernel.h"
 #include "smt/params/smt_params.h"
-#include"smt_params_helper.hpp"
-#include"lp_params.hpp"
+#include "smt/params/smt_params_helper.hpp"
+#include "util/lp/lp_params.hpp"
 #include "ast/rewriter/rewriter_types.h"
 #include "tactic/filter_model_converter.h"
 #include "ast/ast_util.h"

src/smt/theory_lra.cpp

@@ -26,7 +26,7 @@ Revision History:
 #include "util/lp/lar_solver.h"
 #include "util/nat_set.h"
 #include "util/optional.h"
-#include "lp_params.hpp"
+#include "util/lp/lp_params.hpp"
 #include "util/inf_rational.h"
 #include "smt/smt_theory.h"
 #include "smt/smt_context.h"

src/solver/combined_solver.cpp

@@ -20,7 +20,7 @@ Notes:
 --*/
 #include "solver/solver.h"
 #include "util/scoped_timer.h"
-#include"combined_solver_params.hpp"
+#include "solver/combined_solver_params.hpp"
 #include "util/common_msgs.h"
 #define PS_VB_LVL 15
 

src/tactic/bv/bv_bound_chk_tactic.cpp

@@ -19,7 +19,7 @@
 #include "ast/rewriter/rewriter.h"
 #include "ast/rewriter/rewriter_def.h"
 #include "ast/rewriter/bv_bounds.h"
-#include"rewriter_params.hpp"
+#include "ast/rewriter/rewriter_params.hpp"
 #include "ast/rewriter/bool_rewriter.h"
 #include "util/cooperate.h"
 

src/tactic/sls/sls_engine.cpp

@@ -27,7 +27,7 @@ Notes:
 #include "util/cooperate.h"
 #include "util/luby.h"
 
-#include"sls_params.hpp"
+#include "tactic/sls/sls_params.hpp"
 #include "tactic/sls/sls_engine.h"
 
 

src/tactic/sls/sls_tactic.cpp

@@ -27,7 +27,7 @@ Notes:
 #include "tactic/core/nnf_tactic.h"
 #include "util/stopwatch.h"
 #include "tactic/sls/sls_tactic.h"
-#include"sls_params.hpp"
+#include "tactic/sls/sls_params.hpp"
 #include "tactic/sls/sls_engine.h"
 
 class sls_tactic : public tactic {    

src/tactic/sls/sls_tracker.h

@@ -26,7 +26,7 @@ Notes:
 #include "ast/bv_decl_plugin.h"
 #include "model/model.h"
 
-#include"sls_params.hpp"
+#include "tactic/sls/sls_params.hpp"
 #include "tactic/sls/sls_powers.h"
 
 class sls_tracker {

src/tactic/smtlogics/qfufbv_tactic.cpp

@@ -27,12 +27,12 @@ Notes:
 #include "tactic/bv/bv_size_reduction_tactic.h"
 #include "tactic/core/reduce_args_tactic.h"
 #include "tactic/smtlogics/qfbv_tactic.h"
-#include"qfufbv_tactic_params.hpp"
+#include "tactic/smtlogics/qfufbv_tactic_params.hpp"
 ///////////////
 #include "model/model_smt2_pp.h"
 #include "util/cooperate.h"
 #include "ackermannization/lackr.h"
-#include"ackermannization_params.hpp"
+#include "ackermannization/ackermannization_params.hpp"
 #include "tactic/smtlogics/qfufbv_ackr_model_converter.h"
 ///////////////
 #include "sat/sat_solver/inc_sat_solver.h"