make include paths uniformly use path relative to src. #534

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

src/muz/base/bind_variables.cpp

@@ -18,7 +18,7 @@ Notes:
 
 --*/
 
-#include "bind_variables.h"
+#include "muz/base/bind_variables.h"
 
 bind_variables::bind_variables(ast_manager & m):
     m(m),

src/muz/base/bind_variables.h

@@ -21,7 +21,7 @@ Notes:
 #ifndef BIND_VARIABLES_H_
 #define BIND_VARIABLES_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 class bind_variables {
     typedef obj_map<app, var*> var2bound;

src/muz/base/dl_boogie_proof.cpp

@@ -51,11 +51,11 @@ Example from Boogie:
 ")
 */
 
-#include "dl_boogie_proof.h"
-#include "model_pp.h"
-#include "proof_utils.h"
-#include "ast_pp.h"
-#include "ast_util.h"
+#include "muz/base/dl_boogie_proof.h"
+#include "model/model_pp.h"
+#include "muz/base/proof_utils.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
 
 namespace datalog {
     

src/muz/base/dl_boogie_proof.h

@@ -48,8 +48,8 @@ define-fun) when Boogie supports this.
 
 */
 
-#include "ast.h"
-#include "model.h"
+#include "ast/ast.h"
+#include "model/model.h"
 
 namespace datalog {
     class boogie_proof {

src/muz/base/dl_context.cpp

@@ -19,16 +19,16 @@ Revision History:
 
 #include<sstream>
 #include<limits>
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"dl_context.h"
-#include"for_each_expr.h"
-#include"ast_smt_pp.h"
-#include"ast_smt2_pp.h"
-#include"datatype_decl_plugin.h"
-#include"scoped_proof.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "muz/base/dl_context.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/scoped_proof.h"
 #include"fixedpoint_params.hpp"
-#include"ast_pp_util.h"
+#include "ast/ast_pp_util.h"
 
 
 namespace datalog {

src/muz/base/dl_context.h

@@ -23,26 +23,26 @@ Revision History:
 #undef min
 #undef max
 #endif
-#include"arith_decl_plugin.h"
-#include"map.h"
-#include"th_rewriter.h"
-#include"str_hashtable.h"
-#include"var_subst.h"
-#include"dl_costs.h"
-#include"dl_decl_plugin.h"
-#include"dl_rule_set.h"
-#include"lbool.h"
-#include"statistics.h"
-#include"params.h"
-#include"trail.h"
-#include"model_converter.h"
-#include"model2expr.h"
-#include"smt_params.h"
-#include"dl_rule_transformer.h"
-#include"expr_functors.h"
-#include"dl_engine_base.h"
-#include"bind_variables.h"
-#include"rule_properties.h"
+#include "ast/arith_decl_plugin.h"
+#include "util/map.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "util/str_hashtable.h"
+#include "ast/rewriter/var_subst.h"
+#include "muz/base/dl_costs.h"
+#include "ast/dl_decl_plugin.h"
+#include "muz/base/dl_rule_set.h"
+#include "util/lbool.h"
+#include "util/statistics.h"
+#include "util/params.h"
+#include "util/trail.h"
+#include "tactic/model_converter.h"
+#include "model/model2expr.h"
+#include "smt/params/smt_params.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "ast/expr_functors.h"
+#include "muz/base/dl_engine_base.h"
+#include "muz/base/bind_variables.h"
+#include "muz/base/rule_properties.h"
 
 struct fixedpoint_params;
 

src/muz/base/dl_costs.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 
-#include "debug.h"
-#include "stopwatch.h"
-#include "dl_context.h"
-#include "dl_rule.h"
-#include "dl_costs.h"
+#include "util/debug.h"
+#include "util/stopwatch.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_costs.h"
 
 namespace datalog {
 

src/muz/base/dl_costs.h

@@ -22,7 +22,7 @@ Revision History:
 
 #include<iosfwd>
 
-#include "ast.h"
+#include "ast/ast.h"
 
 class stopwatch;
 

src/muz/base/dl_engine_base.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef DL_ENGINE_BASE_H_
 #define DL_ENGINE_BASE_H_
 
-#include "model.h"
+#include "model/model.h"
 
 namespace datalog {
     enum DL_ENGINE {

src/muz/base/dl_rule.cpp

@@ -24,26 +24,26 @@ Revision History:
 #include<algorithm>
 #include<sstream>
 
-#include"ast_pp.h"
-#include"dl_context.h"
-#include"map.h"
-#include"recurse_expr_def.h"
-#include"dl_rule.h"
-#include"qe.h"
-#include"for_each_expr.h"
-#include"used_vars.h"
-#include"var_subst.h"
-#include"rewriter_def.h"
-#include"th_rewriter.h"
-#include"ast_smt2_pp.h"
-#include"used_symbols.h"
-#include"quant_hoist.h"
-#include"expr_replacer.h"
-#include"bool_rewriter.h"
-#include"expr_safe_replace.h"
-#include"filter_model_converter.h"
-#include"scoped_proof.h"
-#include"datatype_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "muz/base/dl_context.h"
+#include "util/map.h"
+#include "ast/recurse_expr_def.h"
+#include "muz/base/dl_rule.h"
+#include "qe/qe.h"
+#include "ast/for_each_expr.h"
+#include "ast/used_vars.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/used_symbols.h"
+#include "ast/rewriter/quant_hoist.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "tactic/filter_model_converter.h"
+#include "ast/scoped_proof.h"
+#include "ast/datatype_decl_plugin.h"
 
 namespace datalog {
 

src/muz/base/dl_rule.h

@@ -20,19 +20,19 @@ Revision History:
 #ifndef DL_RULE_H_
 #define DL_RULE_H_
 
-#include"ast.h"
-#include"dl_costs.h"
-#include"dl_util.h"
-#include"used_vars.h"
-#include"proof_converter.h"
-#include"model_converter.h"
-#include"ast_counter.h"
-#include"rewriter.h"
-#include"hnf.h"
-#include"qe_lite.h"
-#include"var_subst.h"
-#include"datatype_decl_plugin.h"
-#include"label_rewriter.h"
+#include "ast/ast.h"
+#include "muz/base/dl_costs.h"
+#include "muz/base/dl_util.h"
+#include "ast/used_vars.h"
+#include "tactic/proof_converter.h"
+#include "tactic/model_converter.h"
+#include "ast/rewriter/ast_counter.h"
+#include "ast/rewriter/rewriter.h"
+#include "muz/base/hnf.h"
+#include "qe/qe_lite.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/rewriter/label_rewriter.h"
 
 namespace datalog {
 

src/muz/base/dl_rule_set.cpp

@@ -19,9 +19,9 @@ Revision History:
 
 #include<algorithm>
 #include<functional>
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"ast_pp.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "ast/ast_pp.h"
 
 namespace datalog {
 

src/muz/base/dl_rule_set.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef DL_RULE_SET_H_
 #define DL_RULE_SET_H_
 
-#include"obj_hashtable.h"
-#include"dl_rule.h"
+#include "util/obj_hashtable.h"
+#include "muz/base/dl_rule.h"
 
 namespace datalog {
 

src/muz/base/dl_rule_subsumption_index.cpp

@@ -20,9 +20,9 @@ Revision History:
 
 
 #include <sstream>
-#include "ast_pp.h"
+#include "ast/ast_pp.h"
 
-#include "dl_rule_subsumption_index.h"
+#include "muz/base/dl_rule_subsumption_index.h"
 
 namespace datalog {
   

src/muz/base/dl_rule_subsumption_index.h

@@ -21,7 +21,7 @@ Revision History:
 #ifndef DL_RULE_SUBSUMPTION_INDEX_H_
 #define DL_RULE_SUBSUMPTION_INDEX_H_
 
-#include "dl_context.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/base/dl_rule_transformer.cpp

@@ -20,9 +20,9 @@ Revision History:
 #include <algorithm>
 #include<typeinfo>
 
-#include"dl_context.h"
-#include"dl_rule_transformer.h"
-#include"stopwatch.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "util/stopwatch.h"
 
 namespace datalog {
 

src/muz/base/dl_rule_transformer.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef DL_RULE_TRANSFORMER_H_
 #define DL_RULE_TRANSFORMER_H_
 
-#include"map.h"
-#include"vector.h"
-#include"dl_rule.h"
-#include"dl_rule_set.h"
+#include "util/map.h"
+#include "util/vector.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_rule_set.h"
 
 namespace datalog {
 

src/muz/base/dl_util.cpp

@@ -23,14 +23,14 @@ Revision History:
 #ifdef _WINDOWS
 #include <windows.h>
 #endif
-#include"ast_pp.h"
-#include"bool_rewriter.h"
-#include"for_each_expr.h"
-#include"scoped_proof.h"
-#include"dl_context.h"
-#include"dl_rule.h"
-#include"dl_util.h"
-#include"stopwatch.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/for_each_expr.h"
+#include "ast/scoped_proof.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_util.h"
+#include "util/stopwatch.h"
 
 namespace datalog {
 

src/muz/base/dl_util.h

@@ -20,17 +20,17 @@ Revision History:
 #define DL_UTIL_H_
 
 #include<vector>
-#include"ast.h"
-#include"hashtable.h"
-#include"obj_hashtable.h"
-#include"uint_set.h"
-#include"horn_subsume_model_converter.h"
-#include"replace_proof_converter.h"
-#include"substitution.h"
-#include"ast_counter.h"
-#include"statistics.h"
-#include"stopwatch.h"
-#include"lbool.h"
+#include "ast/ast.h"
+#include "util/hashtable.h"
+#include "util/obj_hashtable.h"
+#include "util/uint_set.h"
+#include "tactic/horn_subsume_model_converter.h"
+#include "tactic/replace_proof_converter.h"
+#include "ast/substitution/substitution.h"
+#include "ast/rewriter/ast_counter.h"
+#include "util/statistics.h"
+#include "util/stopwatch.h"
+#include "util/lbool.h"
 
 namespace datalog {
 

src/muz/base/hnf.cpp

@@ -43,20 +43,20 @@ Notes:
      
                 
 --*/
-#include"hnf.h"
-#include"warning.h"
-#include"used_vars.h"
-#include"well_sorted.h"
-#include"var_subst.h"
-#include"name_exprs.h"
-#include"act_cache.h"
-#include"cooperate.h"
-#include"ast_pp.h"
-#include"quant_hoist.h"
-#include"ast_util.h"
-#include"dl_util.h"
-#include"for_each_ast.h"
-#include"for_each_expr.h"
+#include "muz/base/hnf.h"
+#include "util/warning.h"
+#include "ast/used_vars.h"
+#include "ast/well_sorted.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/normal_forms/name_exprs.h"
+#include "ast/act_cache.h"
+#include "util/cooperate.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/quant_hoist.h"
+#include "ast/ast_util.h"
+#include "muz/base/dl_util.h"
+#include "ast/for_each_ast.h"
+#include "ast/for_each_expr.h"
 
 class hnf::imp {
 

src/muz/base/hnf.h

@@ -25,10 +25,10 @@ Copyright (c) 2015 Microsoft Corporation
 #ifndef HNF_H_
 #define HNF_H_
  
-#include"ast.h"
-#include"params.h"
-#include"defined_names.h"
-#include"proof_converter.h"
+#include "ast/ast.h"
+#include "util/params.h"
+#include "ast/normal_forms/defined_names.h"
+#include "tactic/proof_converter.h"
  
 class hnf {
     class imp;

src/muz/base/proof_utils.cpp

@@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "dl_util.h"
-#include "proof_utils.h"
-#include "ast_smt2_pp.h"
-#include "var_subst.h"
+#include "muz/base/dl_util.h"
+#include "muz/base/proof_utils.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/rewriter/var_subst.h"
 
 class reduce_hypotheses {
     typedef obj_hashtable<expr> expr_set;

src/muz/base/rule_properties.cpp

@@ -18,11 +18,11 @@ Notes:
 
 --*/
 
-#include"expr_functors.h"
-#include"rule_properties.h"
-#include"dl_rule_set.h"
-#include"for_each_expr.h"
-#include"dl_context.h"
+#include "ast/expr_functors.h"
+#include "muz/base/rule_properties.h"
+#include "muz/base/dl_rule_set.h"
+#include "ast/for_each_expr.h"
+#include "muz/base/dl_context.h"
 
 using namespace datalog;
 rule_properties::rule_properties(ast_manager & m, rule_manager& rm, context& ctx, i_expr_pred& p): 

src/muz/base/rule_properties.h

@@ -21,10 +21,10 @@ Notes:
 #ifndef RULE_PROPERTIES_H_
 #define RULE_PROPERTIES_H_
 
-#include"ast.h"
-#include"datatype_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"dl_rule.h"
+#include "ast/ast.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "muz/base/dl_rule.h"
 
 namespace datalog {
     class rule_properties {

src/muz/bmc/dl_bmc_engine.cpp

@@ -17,21 +17,21 @@ Revision History:
 
 --*/
 
-#include "dl_context.h"
-#include "dl_rule_transformer.h"
-#include "dl_bmc_engine.h"
-#include "dl_mk_slice.h"
-#include "smt_kernel.h"
-#include "datatype_decl_plugin.h"
-#include "dl_decl_plugin.h"
-#include "bool_rewriter.h"
-#include "model_smt2_pp.h"
-#include "ast_smt_pp.h"
-#include "well_sorted.h"
-#include "rewriter_def.h"
-#include "dl_transforms.h"
-#include "dl_mk_rule_inliner.h"
-#include "scoped_proof.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "muz/bmc/dl_bmc_engine.h"
+#include "muz/transforms/dl_mk_slice.h"
+#include "smt/smt_kernel.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/dl_decl_plugin.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "model/model_smt2_pp.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/well_sorted.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "muz/transforms/dl_transforms.h"
+#include "muz/transforms/dl_mk_rule_inliner.h"
+#include "ast/scoped_proof.h"
 
 namespace datalog {
 

src/muz/bmc/dl_bmc_engine.h

@@ -20,11 +20,11 @@ Revision History:
 #ifndef DL_BMC_ENGINE_H_
 #define DL_BMC_ENGINE_H_
 
-#include "params.h"
-#include "statistics.h"
-#include "smt_kernel.h"
-#include "bv_decl_plugin.h"
-#include "smt_params.h"
+#include "util/params.h"
+#include "util/statistics.h"
+#include "smt/smt_kernel.h"
+#include "ast/bv_decl_plugin.h"
+#include "smt/params/smt_params.h"
 
 
 namespace datalog {

src/muz/clp/clp_context.cpp

@@ -17,13 +17,13 @@ Revision History:
 
 --*/
 
-#include "clp_context.h"
-#include "dl_context.h"
-#include "unifier.h"
-#include "var_subst.h"
-#include "substitution.h"
-#include "smt_kernel.h"
-#include "dl_transforms.h"
+#include "muz/clp/clp_context.h"
+#include "muz/base/dl_context.h"
+#include "ast/substitution/unifier.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/substitution/substitution.h"
+#include "smt/smt_kernel.h"
+#include "muz/transforms/dl_transforms.h"
 
 namespace datalog {
 

src/muz/clp/clp_context.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef CLP_CONTEXT_H_
 #define CLP_CONTEXT_H_
 
-#include "ast.h"
-#include "lbool.h"
-#include "statistics.h"
-#include "dl_engine_base.h"
+#include "ast/ast.h"
+#include "util/lbool.h"
+#include "util/statistics.h"
+#include "muz/base/dl_engine_base.h"
 
 namespace datalog {
     class context;

src/muz/dataflow/dataflow.cpp

@@ -15,8 +15,8 @@ Author:
 
 --*/
 
-#include "dataflow.h"
-#include "reachability.h"
+#include "muz/dataflow/dataflow.h"
+#include "muz/dataflow/reachability.h"
 
 namespace datalog {
 

src/muz/dataflow/dataflow.h

@@ -18,10 +18,10 @@ Author:
 #ifndef DATAFLOW_H_
 #define DATAFLOW_H_
 
-#include "dl_rule.h"
-#include "dl_rule_set.h"
-#include "hashtable.h"
-#include "vector.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_rule_set.h"
+#include "util/hashtable.h"
+#include "util/vector.h"
 
 namespace datalog {
     template <typename Fact> class fact_reader;

src/muz/dataflow/reachability.h

@@ -17,7 +17,7 @@ Author:
 #ifndef REACHABILITY_H_
 #define REACHABILITY_H_
 
-#include "dataflow.h"
+#include "muz/dataflow/dataflow.h"
 
 namespace datalog {
     class reachability_info {

src/muz/ddnf/ddnf.cpp

@@ -20,12 +20,12 @@ Revision History:
 
 --*/
 
-#include "ddnf.h"
-#include "dl_rule_set.h"
-#include "dl_context.h"
-#include "scoped_proof.h"
-#include "bv_decl_plugin.h"
-#include "tbv.h"
+#include "muz/ddnf/ddnf.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/base/dl_context.h"
+#include "ast/scoped_proof.h"
+#include "ast/bv_decl_plugin.h"
+#include "muz/rel/tbv.h"
 
 namespace datalog {
 

src/muz/ddnf/ddnf.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef DDNF_H_
 #define DDNF_H_
 
-#include "ast.h"
-#include "lbool.h"
-#include "statistics.h"
-#include "dl_engine_base.h"
+#include "ast/ast.h"
+#include "util/lbool.h"
+#include "util/statistics.h"
+#include "muz/base/dl_engine_base.h"
 
 class tbv;
 class tbv_manager;

src/muz/duality/duality_dl_interface.cpp

@@ -18,26 +18,26 @@
 
   --*/
 
-#include "dl_context.h"
-#include "dl_mk_coi_filter.h"
-#include "dl_mk_interp_tail_simplifier.h"
-#include "dl_mk_subsumption_checker.h"
-#include "dl_mk_rule_inliner.h"
-#include "dl_rule.h"
-#include "dl_rule_transformer.h"
-#include "smt2parser.h"
-#include "duality_dl_interface.h"
-#include "dl_rule_set.h"
-#include "dl_mk_slice.h"
-#include "dl_mk_unfold.h"
-#include "dl_mk_coalesce.h"
-#include "expr_abstract.h"
-#include "model_smt2_pp.h"
-#include "model_v2_pp.h"
+#include "muz/base/dl_context.h"
+#include "muz/transforms/dl_mk_coi_filter.h"
+#include "muz/transforms/dl_mk_interp_tail_simplifier.h"
+#include "muz/transforms/dl_mk_subsumption_checker.h"
+#include "muz/transforms/dl_mk_rule_inliner.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "parsers/smt2/smt2parser.h"
+#include "muz/duality/duality_dl_interface.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/transforms/dl_mk_slice.h"
+#include "muz/transforms/dl_mk_unfold.h"
+#include "muz/transforms/dl_mk_coalesce.h"
+#include "ast/expr_abstract.h"
+#include "model/model_smt2_pp.h"
+#include "model/model_v2_pp.h"
 #include "fixedpoint_params.hpp"
-#include "used_vars.h"
-#include "func_decl_dependencies.h"
-#include "dl_transforms.h"
+#include "ast/used_vars.h"
+#include "ast/func_decl_dependencies.h"
+#include "muz/transforms/dl_transforms.h"
 
 // template class symbol_table<family_id>;
 
@@ -48,8 +48,8 @@
 #pragma warning(disable:4101)
 #endif
 
-#include "duality.h"
-#include "duality_profiling.h"
+#include "duality/duality.h"
+#include "duality/duality_profiling.h"
 
 // using namespace Duality;
 

src/muz/duality/duality_dl_interface.h

@@ -21,11 +21,11 @@
 #ifndef DUALITY_DL_INTERFACE_H_
 #define DUALITY_DL_INTERFACE_H_
 
-#include "lbool.h"
-#include "dl_rule.h"
-#include "dl_rule_set.h"
-#include "dl_engine_base.h"
-#include "statistics.h"
+#include "util/lbool.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/base/dl_engine_base.h"
+#include "util/statistics.h"
 
 namespace datalog {
     class context;

src/muz/fp/datalog_parser.cpp

@@ -5,13 +5,13 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 
-#include"datalog_parser.h"
-#include"string_buffer.h"
-#include"str_hashtable.h"
-#include"ast_pp.h"
-#include"arith_decl_plugin.h"
-#include"region.h"
-#include"warning.h"
+#include "muz/fp/datalog_parser.h"
+#include "util/string_buffer.h"
+#include "util/str_hashtable.h"
+#include "ast/ast_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "util/region.h"
+#include "util/warning.h"
 #include<iostream>
 #include<sstream>
 #include<cstdio>

src/muz/fp/datalog_parser.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef DATALOG_PARSER_H_
 #define DATALOG_PARSER_H_
 
-#include "ast.h"
-#include "dl_context.h"
+#include "ast/ast.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/fp/dl_cmds.cpp

@@ -15,21 +15,21 @@ Author:
 Notes:
 
 --*/
-#include"cmd_context.h"
-#include"dl_cmds.h"
-#include"dl_external_relation.h"
-#include"dl_context.h"
-#include"dl_register_engine.h"
-#include"dl_decl_plugin.h"
-#include"dl_instruction.h"
-#include"dl_compiler.h"
-#include"dl_rule.h"
-#include"ast_pp.h"
-#include"parametric_cmd.h"
-#include"cancel_eh.h"
-#include"scoped_ctrl_c.h"
-#include"scoped_timer.h"
-#include"trail.h"
+#include "cmd_context/cmd_context.h"
+#include "muz/fp/dl_cmds.h"
+#include "muz/rel/dl_external_relation.h"
+#include "muz/base/dl_context.h"
+#include "muz/fp/dl_register_engine.h"
+#include "ast/dl_decl_plugin.h"
+#include "muz/rel/dl_instruction.h"
+#include "muz/rel/dl_compiler.h"
+#include "muz/base/dl_rule.h"
+#include "ast/ast_pp.h"
+#include "cmd_context/parametric_cmd.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/scoped_timer.h"
+#include "util/trail.h"
 #include"fixedpoint_params.hpp"
 #include<iomanip>
 

src/muz/fp/dl_cmds.h

@@ -18,7 +18,7 @@ Notes:
 #ifndef DL_CMDS_H_
 #define DL_CMDS_H_
 
-#include "ast.h"
+#include "ast/ast.h"
 
 class cmd_context;
 

src/muz/fp/dl_register_engine.cpp

@@ -16,14 +16,14 @@ Author:
 Revision History:
 
 --*/
-#include "dl_register_engine.h"
-#include "dl_bmc_engine.h"
-#include "clp_context.h"
-#include "tab_context.h"
-#include "rel_context.h"
-#include "pdr_dl_interface.h"
-#include "ddnf.h"
-#include "duality_dl_interface.h"
+#include "muz/fp/dl_register_engine.h"
+#include "muz/bmc/dl_bmc_engine.h"
+#include "muz/clp/clp_context.h"
+#include "muz/tab/tab_context.h"
+#include "muz/rel/rel_context.h"
+#include "muz/pdr/pdr_dl_interface.h"
+#include "muz/ddnf/ddnf.h"
+#include "muz/duality/duality_dl_interface.h"
 
 namespace datalog {
     register_engine::register_engine(): m_ctx(0) {}

src/muz/fp/dl_register_engine.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef DL_REGISTER_ENGINE_H_
 #define DL_REGISTER_ENGINE_H_
 
-#include "dl_context.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/fp/horn_tactic.cpp

@@ -16,20 +16,20 @@ Author:
 Revision History:
 
 --*/
-#include"tactical.h"
-#include"model_converter.h"
-#include"proof_converter.h"
-#include"horn_tactic.h"
-#include"dl_context.h"
-#include"dl_register_engine.h"
-#include"expr_replacer.h"
-#include"dl_rule_transformer.h"
-#include"dl_mk_slice.h"
-#include"filter_model_converter.h"
-#include"dl_transforms.h"
+#include "tactic/tactical.h"
+#include "tactic/model_converter.h"
+#include "tactic/proof_converter.h"
+#include "muz/fp/horn_tactic.h"
+#include "muz/base/dl_context.h"
+#include "muz/fp/dl_register_engine.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "muz/transforms/dl_mk_slice.h"
+#include "tactic/filter_model_converter.h"
+#include "muz/transforms/dl_transforms.h"
 #include"fixedpoint_params.hpp"
-#include"ast_util.h"
-#include"var_subst.h"
+#include "ast/ast_util.h"
+#include "ast/rewriter/var_subst.h"
 
 class horn_tactic : public tactic {
     struct imp {

src/muz/fp/horn_tactic.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef HORN_TACTIC_H_
 #define HORN_TACTIC_H_
 
-#include"params.h"
+#include "util/params.h"
 class ast_manager;
 class tactic;
 

src/muz/pdr/pdr_closure.cpp

@@ -17,10 +17,10 @@ Revision History:
 
 --*/
 
-#include "pdr_closure.h"
-#include "pdr_context.h"
-#include "expr_safe_replace.h"
-#include "ast_util.h"
+#include "muz/pdr/pdr_closure.h"
+#include "muz/pdr/pdr_context.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/ast_util.h"
 
 namespace pdr {
 

src/muz/pdr/pdr_closure.h

@@ -20,7 +20,7 @@ Revision History:
 #ifndef PDR_CLOSURE_H_
 #define PDR_CLOSURE_H_
 
-#include "arith_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
 
 namespace pdr {
 

src/muz/pdr/pdr_context.cpp

@@ -25,31 +25,31 @@ Notes:
 
 
 #include <sstream>
-#include "dl_util.h"
-#include "rewriter.h"
-#include "rewriter_def.h"
-#include "var_subst.h"
-#include "util.h"
-#include "pdr_prop_solver.h"
-#include "pdr_context.h"
-#include "pdr_generalizers.h"
-#include "for_each_expr.h"
-#include "dl_rule_set.h"
-#include "unit_subsumption_tactic.h"
-#include "model_smt2_pp.h"
-#include "dl_mk_rule_inliner.h"
-#include "ast_smt2_pp.h"
-#include "qe_lite.h"
-#include "ast_ll_pp.h"
-#include "proof_checker.h"
-#include "smt_value_sort.h"
-#include "proof_utils.h"
-#include "dl_boogie_proof.h"
-#include "scoped_proof.h"
-#include "blast_term_ite_tactic.h"
-#include "model_implicant.h"
-#include "expr_safe_replace.h"
-#include "ast_util.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/pdr/pdr_prop_solver.h"
+#include "muz/pdr/pdr_context.h"
+#include "muz/pdr/pdr_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 "muz/transforms/dl_mk_rule_inliner.h"
+#include "ast/ast_smt2_pp.h"
+#include "qe/qe_lite.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/proof_checker/proof_checker.h"
+#include "smt/smt_value_sort.h"
+#include "muz/base/proof_utils.h"
+#include "muz/base/dl_boogie_proof.h"
+#include "ast/scoped_proof.h"
+#include "tactic/core/blast_term_ite_tactic.h"
+#include "model/model_implicant.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/ast_util.h"
 
 namespace pdr {
 

src/muz/pdr/pdr_context.h

@@ -25,9 +25,9 @@ Revision History:
 #undef max
 #endif
 #include <deque>
-#include "pdr_manager.h"
-#include "pdr_prop_solver.h"
-#include "pdr_reachable_cache.h"
+#include "muz/pdr/pdr_manager.h"
+#include "muz/pdr/pdr_prop_solver.h"
+#include "muz/pdr/pdr_reachable_cache.h"
 #include "fixedpoint_params.hpp"
 
 

src/muz/pdr/pdr_dl_interface.cpp

@@ -17,19 +17,19 @@ Revision History:
 
 --*/
 
-#include "dl_context.h"
-#include "dl_mk_coi_filter.h"
-#include "dl_rule.h"
-#include "dl_rule_transformer.h"
-#include "pdr_context.h"
-#include "pdr_dl_interface.h"
-#include "dl_rule_set.h"
-#include "dl_mk_slice.h"
-#include "dl_mk_unfold.h"
-#include "dl_mk_coalesce.h"
-#include "dl_transforms.h"
-#include "scoped_proof.h"
-#include "model_smt2_pp.h"
+#include "muz/base/dl_context.h"
+#include "muz/transforms/dl_mk_coi_filter.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_rule_transformer.h"
+#include "muz/pdr/pdr_context.h"
+#include "muz/pdr/pdr_dl_interface.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/transforms/dl_mk_slice.h"
+#include "muz/transforms/dl_mk_unfold.h"
+#include "muz/transforms/dl_mk_coalesce.h"
+#include "muz/transforms/dl_transforms.h"
+#include "ast/scoped_proof.h"
+#include "model/model_smt2_pp.h"
 
 using namespace pdr;
 

src/muz/pdr/pdr_dl_interface.h

@@ -20,12 +20,12 @@ Revision History:
 #ifndef PDR_DL_INTERFACE_H_
 #define PDR_DL_INTERFACE_H_
 
-#include "lbool.h"
-#include "dl_rule.h"
-#include "dl_rule_set.h"
-#include "dl_util.h"
-#include "dl_engine_base.h"
-#include "statistics.h"
+#include "util/lbool.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/base/dl_util.h"
+#include "muz/base/dl_engine_base.h"
+#include "util/statistics.h"
 
 namespace datalog {
     class context;

src/muz/pdr/pdr_farkas_learner.cpp

@@ -18,21 +18,21 @@ Revision History:
 
 --*/
 
-#include "ast_smt2_pp.h"
-#include "array_decl_plugin.h"
-#include "bool_rewriter.h"
-#include "dl_decl_plugin.h"
-#include "for_each_expr.h"
-#include "dl_util.h"
-#include "rewriter.h"
-#include "rewriter_def.h"
-#include "pdr_util.h"
-#include "pdr_farkas_learner.h"
-#include "th_rewriter.h"
-#include "ast_ll_pp.h"
-#include "arith_bounds_tactic.h"
-#include "proof_utils.h"
-#include "reg_decl_plugins.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/dl_decl_plugin.h"
+#include "ast/for_each_expr.h"
+#include "muz/base/dl_util.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "muz/pdr/pdr_util.h"
+#include "muz/pdr/pdr_farkas_learner.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/ast_ll_pp.h"
+#include "tactic/arith/arith_bounds_tactic.h"
+#include "muz/base/proof_utils.h"
+#include "ast/reg_decl_plugins.h"
 
 
 namespace pdr {

src/muz/pdr/pdr_farkas_learner.h

@@ -20,14 +20,14 @@ Revision History:
 #ifndef PDR_FARKAS_LEARNER_H_
 #define PDR_FARKAS_LEARNER_H_
 
-#include "arith_decl_plugin.h"
-#include "ast_translation.h"
-#include "bv_decl_plugin.h"
-#include "smt_kernel.h"
-#include "bool_rewriter.h"
-#include "pdr_util.h"
-#include "smt_params.h"
-#include "tactic.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_translation.h"
+#include "ast/bv_decl_plugin.h"
+#include "smt/smt_kernel.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "muz/pdr/pdr_util.h"
+#include "smt/params/smt_params.h"
+#include "tactic/tactic.h"
 
 namespace pdr {
 

src/muz/pdr/pdr_generalizers.cpp

@@ -18,13 +18,13 @@ Revision History:
 --*/
 
 
-#include "pdr_context.h"
-#include "pdr_farkas_learner.h"
-#include "pdr_generalizers.h"
-#include "expr_abstract.h"
-#include "var_subst.h"
-#include "expr_safe_replace.h"
-#include "model_smt2_pp.h"
+#include "muz/pdr/pdr_context.h"
+#include "muz/pdr/pdr_farkas_learner.h"
+#include "muz/pdr/pdr_generalizers.h"
+#include "ast/expr_abstract.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "model/model_smt2_pp.h"
 
 
 namespace pdr {

src/muz/pdr/pdr_generalizers.h

@@ -20,9 +20,9 @@ Revision History:
 #ifndef PDR_GENERALIZERS_H_
 #define PDR_GENERALIZERS_H_
 
-#include "pdr_context.h"
-#include "pdr_closure.h"
-#include "arith_decl_plugin.h"
+#include "muz/pdr/pdr_context.h"
+#include "muz/pdr/pdr_closure.h"
+#include "ast/arith_decl_plugin.h"
 
 namespace pdr {
 

src/muz/pdr/pdr_manager.cpp

@@ -19,15 +19,15 @@ Revision History:
 --*/
 
 #include <sstream>
-#include "pdr_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/pdr/pdr_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 pdr {
 

src/muz/pdr/pdr_manager.h

@@ -23,17 +23,17 @@ 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 "pdr_util.h"
-#include "pdr_sym_mux.h"
-#include "pdr_farkas_learner.h"
-#include "pdr_smt_context_manager.h"
-#include "dl_rule.h"
+#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/pdr/pdr_util.h"
+#include "muz/pdr/pdr_sym_mux.h"
+#include "muz/pdr/pdr_farkas_learner.h"
+#include "muz/pdr/pdr_smt_context_manager.h"
+#include "muz/base/dl_rule.h"
 
 
 namespace smt {

src/muz/pdr/pdr_prop_solver.cpp

@@ -18,18 +18,18 @@ Revision History:
 --*/
 
 #include <sstream>
-#include "model.h"
-#include "pdr_util.h"
-#include "pdr_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 "pdr_farkas_learner.h"
-#include "ast_smt2_pp.h"
-#include "expr_replacer.h"
+#include "model/model.h"
+#include "muz/pdr/pdr_util.h"
+#include "muz/pdr/pdr_prop_solver.h"
+#include "ast/ast_smt2_pp.h"
+#include "muz/base/dl_util.h"
+#include "model/model_pp.h"
+#include "smt/params/smt_params.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "muz/pdr/pdr_farkas_learner.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/rewriter/expr_replacer.h"
 
 //
 // Auxiliary structure to introduce propositional names for assumptions that are not

src/muz/pdr/pdr_prop_solver.h

@@ -23,13 +23,13 @@ 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 "pdr_manager.h"
-#include "pdr_smt_context_manager.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/pdr/pdr_manager.h"
+#include "muz/pdr/pdr_smt_context_manager.h"
 
 
 namespace pdr {

src/muz/pdr/pdr_reachable_cache.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include "pdr_reachable_cache.h"
+#include "muz/pdr/pdr_reachable_cache.h"
 
 namespace pdr {
 

src/muz/pdr/pdr_reachable_cache.h

@@ -20,10 +20,10 @@ Revision History:
 
 #ifndef REACHABLE_CACHE_H_
 #define REACHABLE_CACHE_H_
-#include "ast.h"
-#include "ref_vector.h"
-#include "pdr_manager.h"
-#include "pdr_smt_context_manager.h"
+#include "ast/ast.h"
+#include "util/ref_vector.h"
+#include "muz/pdr/pdr_manager.h"
+#include "muz/pdr/pdr_smt_context_manager.h"
 
 namespace pdr {
     class reachable_cache {

src/muz/pdr/pdr_smt_context_manager.cpp

@@ -17,12 +17,12 @@ Revision History:
 
 --*/
 
-#include "pdr_smt_context_manager.h"
-#include "has_free_vars.h"
-#include "ast_pp.h"
-#include "ast_smt_pp.h"
+#include "muz/pdr/pdr_smt_context_manager.h"
+#include "ast/has_free_vars.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt_pp.h"
 #include <sstream>
-#include "smt_params.h"
+#include "smt/params/smt_params.h"
 
 namespace pdr {
 

src/muz/pdr/pdr_smt_context_manager.h

@@ -20,9 +20,9 @@ Revision History:
 #ifndef PDR_SMT_CONTEXT_MANAGER_H_
 #define PDR_SMT_CONTEXT_MANAGER_H_
 
-#include "smt_kernel.h"
-#include "func_decl_dependencies.h"
-#include "dl_util.h"
+#include "smt/smt_kernel.h"
+#include "ast/func_decl_dependencies.h"
+#include "muz/base/dl_util.h"
 
 namespace pdr {
     

src/muz/pdr/pdr_sym_mux.cpp

@@ -18,13 +18,13 @@ Revision History:
 --*/
 
 #include <sstream>
-#include "ast_pp.h"
-#include "for_each_expr.h"
-#include "model.h"
-#include "rewriter.h"
-#include "rewriter_def.h"
-#include "pdr_util.h"
-#include "pdr_sym_mux.h"
+#include "ast/ast_pp.h"
+#include "ast/for_each_expr.h"
+#include "model/model.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "muz/pdr/pdr_util.h"
+#include "muz/pdr/pdr_sym_mux.h"
 
 using namespace pdr;
 

src/muz/pdr/pdr_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;

src/muz/pdr/pdr_util.cpp

@@ -22,29 +22,29 @@ 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 "pdr_manager.h"
-#include "pdr_util.h"
-#include "arith_decl_plugin.h"
-#include "expr_replacer.h"
-#include "model_smt2_pp.h"
-#include "poly_rewriter.h"
-#include "poly_rewriter_def.h"
-#include "arith_rewriter.h"
-#include "scoped_proof.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/pdr/pdr_manager.h"
+#include "muz/pdr/pdr_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "model/model_smt2_pp.h"
+#include "ast/rewriter/poly_rewriter.h"
+#include "ast/rewriter/poly_rewriter_def.h"
+#include "ast/rewriter/arith_rewriter.h"
+#include "ast/scoped_proof.h"
 
 
 

src/muz/pdr/pdr_util.h

@@ -20,16 +20,16 @@ Revision History:
 #ifndef PDR_UTIL_H_
 #define PDR_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 "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"
 
 
 class model;

src/muz/rel/aig_exporter.cpp

@@ -11,8 +11,8 @@ Abstract:
 
 --*/
 
-#include "aig_exporter.h"
-#include "dl_context.h"
+#include "muz/rel/aig_exporter.h"
+#include "muz/base/dl_context.h"
 #include <set>
 
 namespace datalog {

src/muz/rel/aig_exporter.h

@@ -14,11 +14,11 @@ Abstract:
 #ifndef AIG_EXPORTER_H_
 #define AIG_EXPORTER_H_
 
-#include "aig.h"
-#include "dl_rule_set.h"
+#include "tactic/aig/aig.h"
+#include "muz/base/dl_rule_set.h"
 #include <map>
 #include <sstream>
-#include "rel_context.h"
+#include "muz/rel/rel_context.h"
 
 namespace datalog {
     class aig_exporter {

src/muz/rel/check_relation.cpp

@@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "check_relation.h"
-#include "dl_relation_manager.h"
-#include "ast_util.h"
-#include "smt_kernel.h"
+#include "muz/rel/check_relation.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "ast/ast_util.h"
+#include "smt/smt_kernel.h"
 #include <typeinfo>
 
 

src/muz/rel/check_relation.h

@@ -22,8 +22,8 @@ Revision History:
 #ifndef CHECK_RELATION_H_
 #define CHECK_RELATION_H_
 
-#include "doc.h"
-#include "dl_base.h"
+#include "muz/rel/doc.h"
+#include "muz/rel/dl_base.h"
 
 namespace datalog {
     class check_relation_plugin;

src/muz/rel/dl_base.cpp

@@ -18,13 +18,13 @@ Revision History:
 --*/
 
 
-#include"ast_pp.h"
-#include"union_find.h"
-#include"vector.h"
-#include"dl_context.h"
-#include"dl_base.h"
-#include"bool_rewriter.h"
-#include"dl_relation_manager.h"
+#include "ast/ast_pp.h"
+#include "util/union_find.h"
+#include "util/vector.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_base.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "muz/rel/dl_relation_manager.h"
 #include<sstream>
 
 

src/muz/rel/dl_base.h

@@ -23,12 +23,12 @@ Revision History:
 
 #include<iosfwd>
 
-#include"ast.h"
-#include"map.h"
-#include"vector.h"
-#include"ref.h"
-#include"dl_util.h"
-#include"dl_context.h"
+#include "ast/ast.h"
+#include "util/map.h"
+#include "util/vector.h"
+#include "util/ref.h"
+#include "muz/base/dl_util.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/rel/dl_bound_relation.cpp

@@ -17,9 +17,9 @@ Revision History:
 
 --*/
 
-#include "dl_bound_relation.h"
-#include "debug.h"
-#include "ast_pp.h"
+#include "muz/rel/dl_bound_relation.h"
+#include "util/debug.h"
+#include "ast/ast_pp.h"
 
 namespace datalog {
 

src/muz/rel/dl_bound_relation.h

@@ -19,14 +19,14 @@ Revision History:
 #ifndef DL_BOUND_RELATION_H_
 #define DL_BOUND_RELATION_H_
 
-#include "dl_context.h"
-#include "dl_relation_manager.h"
-#include "dl_base.h"
-#include "uint_set.h"
-#include "dl_vector_relation.h"
-#include "dl_interval_relation.h"
-#include "arith_decl_plugin.h"
-#include "basic_simplifier_plugin.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "muz/rel/dl_base.h"
+#include "util/uint_set.h"
+#include "muz/rel/dl_vector_relation.h"
+#include "muz/rel/dl_interval_relation.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
 
 namespace datalog {
 

src/muz/rel/dl_check_table.cpp

@@ -19,8 +19,8 @@ Revision History:
 --*/
 
 
-#include "dl_check_table.h"
-#include "dl_table.h"
+#include "muz/rel/dl_check_table.h"
+#include "muz/rel/dl_table.h"
 
 
 namespace datalog {

src/muz/rel/dl_check_table.h

@@ -21,9 +21,9 @@ Revision History:
 #ifndef DL_CHECK_TABLE_H_
 #define DL_CHECK_TABLE_H_
 
-#include "dl_base.h"
-#include "dl_decl_plugin.h"
-#include "dl_relation_manager.h"
+#include "muz/rel/dl_base.h"
+#include "ast/dl_decl_plugin.h"
+#include "muz/rel/dl_relation_manager.h"
 
 namespace datalog {
     class check_table;

src/muz/rel/dl_compiler.cpp

@@ -19,15 +19,15 @@ Revision History:
 
 
 #include <sstream>
-#include"ref_vector.h"
-#include"dl_context.h"
-#include"rel_context.h"
-#include"dl_rule.h"
-#include"dl_util.h"
-#include"dl_compiler.h"
-#include"ast_pp.h"
+#include "util/ref_vector.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/rel_context.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_util.h"
+#include "muz/rel/dl_compiler.h"
+#include "ast/ast_pp.h"
 // include"ast_smt2_pp.h"
-#include"ast_util.h"
+#include "ast/ast_util.h"
 
 
 namespace datalog {

src/muz/rel/dl_compiler.h

@@ -23,16 +23,16 @@ Revision History:
 #include<list>
 #include<utility>
 
-#include "ast.h"
-#include "hashtable.h"
-#include "map.h"
-#include "obj_pair_hashtable.h"
-#include "ref_vector.h"
-#include "vector.h"
+#include "ast/ast.h"
+#include "util/hashtable.h"
+#include "util/map.h"
+#include "util/obj_pair_hashtable.h"
+#include "util/ref_vector.h"
+#include "util/vector.h"
 
-#include "dl_base.h"
-#include "dl_context.h"
-#include "dl_instruction.h"
+#include "muz/rel/dl_base.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_instruction.h"
 
 namespace datalog {
 

src/muz/rel/dl_external_relation.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 
-#include "debug.h"
-#include "ast_pp.h"
-#include "dl_context.h"
-#include "dl_external_relation.h"
-#include "dl_decl_plugin.h"
+#include "util/debug.h"
+#include "ast/ast_pp.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_external_relation.h"
+#include "ast/dl_decl_plugin.h"
 
 namespace datalog {
        

src/muz/rel/dl_external_relation.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef DL_EXTERNAL_RELATION_H_
 #define DL_EXTERNAL_RELATION_H_
 
-#include "dl_base.h"
+#include "muz/rel/dl_base.h"
 
 namespace datalog {
 

src/muz/rel/dl_finite_product_relation.cpp

@@ -19,11 +19,11 @@ Revision History:
 
 
 #include<string>
-#include"dl_context.h"
-#include"dl_relation_manager.h"
-#include"dl_table_relation.h"
-#include"dl_finite_product_relation.h"
-#include"bool_rewriter.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "muz/rel/dl_table_relation.h"
+#include "muz/rel/dl_finite_product_relation.h"
+#include "ast/rewriter/bool_rewriter.h"
 
 namespace datalog {
 

src/muz/rel/dl_finite_product_relation.h

@@ -20,9 +20,9 @@ Revision History:
 #define DL_FINITE_PRODUCT_RELATION_H_
 
 
-#include "dl_base.h"
-#include "dl_relation_manager.h"
-#include "dl_table_relation.h"
+#include "muz/rel/dl_base.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "muz/rel/dl_table_relation.h"
 
 namespace datalog {
 

src/muz/rel/dl_instruction.cpp

@@ -17,14 +17,14 @@ Revision History:
 
 --*/
 
-#include"ast_pp.h"
-#include"stopwatch.h"
-#include"dl_context.h"
-#include"dl_util.h"
-#include"dl_instruction.h"
-#include"rel_context.h"
-#include"debug.h"
-#include"warning.h"
+#include "ast/ast_pp.h"
+#include "util/stopwatch.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_util.h"
+#include "muz/rel/dl_instruction.h"
+#include "muz/rel/rel_context.h"
+#include "util/debug.h"
+#include "util/warning.h"
 
 namespace datalog {
 

src/muz/rel/dl_instruction.h

@@ -22,11 +22,11 @@ Revision History:
 #include<iostream>
 #include<string>
 #include<utility>
-#include "ast.h"
-#include "vector.h"
-#include "dl_base.h"
-#include "dl_costs.h"
-#include "dl_context.h"
+#include "ast/ast.h"
+#include "util/vector.h"
+#include "muz/rel/dl_base.h"
+#include "muz/base/dl_costs.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/rel/dl_interval_relation.cpp

@@ -17,12 +17,12 @@ Revision History:
 
 --*/
 
-#include "debug.h"
-#include "optional.h"
-#include "ast_pp.h"
-#include "dl_interval_relation.h"
-#include "dl_relation_manager.h"
-#include "bool_rewriter.h"
+#include "util/debug.h"
+#include "util/optional.h"
+#include "ast/ast_pp.h"
+#include "muz/rel/dl_interval_relation.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "ast/rewriter/bool_rewriter.h"
 
 
 namespace datalog {

src/muz/rel/dl_interval_relation.h

@@ -20,13 +20,13 @@ Revision History:
 #define DL_INTERVAL_RELATION_H_
 
 
-#include "dl_context.h"
-#include "dl_relation_manager.h"
-#include "dl_base.h"
-#include "old_interval.h"
-#include "dl_vector_relation.h"
-#include "arith_decl_plugin.h"
-#include "basic_simplifier_plugin.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "muz/rel/dl_base.h"
+#include "smt/old_interval.h"
+#include "muz/rel/dl_vector_relation.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
 
 namespace datalog {
 

src/muz/rel/dl_lazy_table.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#include "dl_lazy_table.h"
-#include "dl_relation_manager.h"
+#include "muz/rel/dl_lazy_table.h"
+#include "muz/rel/dl_relation_manager.h"
 #include <sstream>
 
 namespace datalog {

src/muz/rel/dl_lazy_table.h

@@ -21,8 +21,8 @@ Revision History:
 #ifndef DL_LAZY_TABLE_H_
 #define DL_LAZY_TABLE_H_
 
-#include "dl_base.h"
-#include "ref.h"
+#include "muz/rel/dl_base.h"
+#include "util/ref.h"
 
 namespace datalog {
     

src/muz/rel/dl_mk_explanations.cpp

@@ -19,12 +19,12 @@ Revision History:
 
 
 #include <sstream>
-#include"ast_pp.h"
-#include"ast_smt_pp.h"
-#include"dl_finite_product_relation.h"
-#include"dl_product_relation.h"
-#include"dl_sieve_relation.h"
-#include"dl_mk_explanations.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt_pp.h"
+#include "muz/rel/dl_finite_product_relation.h"
+#include "muz/rel/dl_product_relation.h"
+#include "muz/rel/dl_sieve_relation.h"
+#include "muz/rel/dl_mk_explanations.h"
 
 namespace datalog {
 

src/muz/rel/dl_mk_explanations.h

@@ -20,8 +20,8 @@ Revision History:
 #ifndef DL_MK_EXPLANATIONS_H_
 #define DL_MK_EXPLANATIONS_H_
 
-#include "dl_context.h"
-#include "dl_rule_transformer.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/rel/dl_mk_similarity_compressor.cpp

@@ -19,8 +19,8 @@ Revision History:
 
 #include<utility>
 #include<sstream>
-#include"dl_mk_similarity_compressor.h"
-#include"dl_relation_manager.h"
+#include "muz/rel/dl_mk_similarity_compressor.h"
+#include "muz/rel/dl_relation_manager.h"
 
 namespace datalog {
 

src/muz/rel/dl_mk_similarity_compressor.h

@@ -21,12 +21,12 @@ Revision History:
 
 #include<utility>
 
-#include"map.h"
-#include"obj_pair_hashtable.h"
+#include "util/map.h"
+#include "util/obj_pair_hashtable.h"
 
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"dl_rule_transformer.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/rel/dl_mk_simple_joins.cpp

@@ -20,10 +20,10 @@ Revision History:
 #include<utility>
 #include<sstream>
 #include<limits>
-#include"dl_mk_simple_joins.h"
-#include"dl_relation_manager.h"
-#include"ast_pp.h"
-#include"trace.h"
+#include "muz/rel/dl_mk_simple_joins.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "ast/ast_pp.h"
+#include "util/trace.h"
 
 
 namespace datalog {

src/muz/rel/dl_mk_simple_joins.h

@@ -19,12 +19,12 @@ Revision History:
 #ifndef DL_MK_SIMPLE_JOINS_H_
 #define DL_MK_SIMPLE_JOINS_H_
 
-#include"map.h"
-#include"obj_pair_hashtable.h"
+#include "util/map.h"
+#include "util/obj_pair_hashtable.h"
 
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"dl_rule_transformer.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/rel/dl_product_relation.cpp

@@ -42,11 +42,11 @@ Notes:
 --*/
 
 
-#include "dl_sieve_relation.h"
-#include "dl_table_relation.h"
-#include "dl_product_relation.h"
-#include "bool_rewriter.h"
-#include "ast_pp.h"
+#include "muz/rel/dl_sieve_relation.h"
+#include "muz/rel/dl_table_relation.h"
+#include "muz/rel/dl_product_relation.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/ast_pp.h"
 
 namespace datalog {
 

src/muz/rel/dl_product_relation.h

@@ -20,8 +20,8 @@ Revision History:
 #define DL_PRODUCT_RELATION_H_
 
 
-#include "dl_context.h"
-#include "dl_relation_manager.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_relation_manager.h"
 
 namespace datalog {
 

src/muz/rel/dl_relation_manager.cpp

@@ -19,14 +19,14 @@ Revision History:
 
 
 #include <sstream>
-#include"ast_pp.h"
-#include"dl_check_table.h"
-#include"dl_context.h"
-#include"dl_finite_product_relation.h"
-#include"dl_product_relation.h"
-#include"dl_sieve_relation.h"
-#include"dl_table_relation.h"
-#include"dl_relation_manager.h"
+#include "ast/ast_pp.h"
+#include "muz/rel/dl_check_table.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_finite_product_relation.h"
+#include "muz/rel/dl_product_relation.h"
+#include "muz/rel/dl_sieve_relation.h"
+#include "muz/rel/dl_table_relation.h"
+#include "muz/rel/dl_relation_manager.h"
 
 namespace datalog {
 

src/muz/rel/dl_relation_manager.h

@@ -20,9 +20,9 @@ Revision History:
 #define DL_RELATION_MANAGER_H_
 
 
-#include"map.h"
-#include"vector.h"
-#include"dl_base.h"
+#include "util/map.h"
+#include "util/vector.h"
+#include "muz/rel/dl_base.h"
 
 namespace datalog {
 

src/muz/rel/dl_sieve_relation.cpp

@@ -18,8 +18,8 @@ Revision History:
 --*/
 
 #include <sstream>
-#include"ast_pp.h"
-#include"dl_sieve_relation.h"
+#include "ast/ast_pp.h"
+#include "muz/rel/dl_sieve_relation.h"
 
 namespace datalog {
 

src/muz/rel/dl_sieve_relation.h

@@ -20,8 +20,8 @@ Revision History:
 #ifndef DL_SIEVE_RELATION_H_
 #define DL_SIEVE_RELATION_H_
 
-#include "dl_context.h"
-#include "dl_relation_manager.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_relation_manager.h"
 
 namespace datalog {
 

src/muz/rel/dl_sparse_table.cpp

@@ -18,9 +18,9 @@ Revision History:
 --*/
 
 #include<utility>
-#include"dl_context.h"
-#include"dl_util.h"
-#include"dl_sparse_table.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_util.h"
+#include "muz/rel/dl_sparse_table.h"
 
 namespace datalog {