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

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

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;