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

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

src/qe/nlarith_util.cpp

@@ -4,15 +4,15 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "ast.h"
-#include "nlarith_util.h"
-#include "arith_decl_plugin.h"
-#include "ast_pp.h"
-#include "qe.h"
-#include "expr_replacer.h"
-#include "arith_rewriter.h"
-#include "arith_simplifier_plugin.h"
-#include "expr_functors.h"
+#include "ast/ast.h"
+#include "qe/nlarith_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "qe/qe.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/rewriter/arith_rewriter.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
+#include "ast/expr_functors.h"
 
 namespace nlarith {
 

src/qe/nlarith_util.h

@@ -20,8 +20,8 @@ Notes:
 #ifndef NLARITH_UTIL_H_
 #define NLARITH_UTIL_H_
 
-#include "ast.h"
-#include "lbool.h"
+#include "ast/ast.h"
+#include "util/lbool.h"
 
 namespace nlarith {
 

src/qe/nlqsat.cpp

@@ -18,22 +18,22 @@ Revision History:
 
 --*/
 
-#include "nlqsat.h"
-#include "nlsat_solver.h"
-#include "nlsat_explain.h"
-#include "nlsat_assignment.h"
-#include "qsat.h"
-#include "quant_hoist.h"
-#include "goal2nlsat.h"
-#include "expr2var.h"
-#include "uint_set.h"
-#include "ast_util.h"
-#include "tseitin_cnf_tactic.h"
-#include "expr_safe_replace.h"
-#include "ast_pp.h"
-#include "for_each_expr.h"
-#include "rewriter.h"
-#include "rewriter_def.h"
+#include "qe/nlqsat.h"
+#include "nlsat/nlsat_solver.h"
+#include "nlsat/nlsat_explain.h"
+#include "nlsat/nlsat_assignment.h"
+#include "qe/qsat.h"
+#include "ast/rewriter/quant_hoist.h"
+#include "nlsat/tactic/goal2nlsat.h"
+#include "ast/expr2var.h"
+#include "util/uint_set.h"
+#include "ast/ast_util.h"
+#include "tactic/core/tseitin_cnf_tactic.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/ast_pp.h"
+#include "ast/for_each_expr.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
 
 
 namespace qe {

src/qe/nlqsat.h

@@ -21,7 +21,7 @@ Revision History:
 #ifndef QE_NLQSAT_H__
 #define QE_NLQSAT_H__
 
-#include "tactic.h"
+#include "tactic/tactic.h"
 
 
 tactic * mk_nlqsat_tactic(ast_manager & m, params_ref const& p = params_ref());

src/qe/qe.cpp

@@ -18,33 +18,33 @@ Revision History:
 
 --*/
 
-#include "qe.h"
-#include "smt_theory.h"
-#include "bv_decl_plugin.h"
-#include "smt_context.h"
-#include "theory_bv.h"
-#include "ast_ll_pp.h"
-#include "ast_pp.h"
-#include "ast_smt_pp.h"
-#include "expr_abstract.h"
-#include "var_subst.h"
-#include "for_each_expr.h"
-#include "dl_decl_plugin.h"
-#include "nlarith_util.h"
-#include "expr_replacer.h"
-#include "factor_rewriter.h"
-#include "expr_functors.h"
-#include "quant_hoist.h"
-#include "bool_rewriter.h"
-#include "th_rewriter.h"
-#include "smt_kernel.h"
-#include "model_evaluator.h"
-#include "has_free_vars.h"
-#include "rewriter_def.h"
-#include "cooperate.h"
-#include "tactical.h"
-#include "model_v2_pp.h"
-#include "obj_hashtable.h"
+#include "qe/qe.h"
+#include "smt/smt_theory.h"
+#include "ast/bv_decl_plugin.h"
+#include "smt/smt_context.h"
+#include "smt/theory_bv.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/expr_abstract.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/for_each_expr.h"
+#include "ast/dl_decl_plugin.h"
+#include "qe/nlarith_util.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/rewriter/factor_rewriter.h"
+#include "ast/expr_functors.h"
+#include "ast/rewriter/quant_hoist.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "smt/smt_kernel.h"
+#include "model/model_evaluator.h"
+#include "ast/has_free_vars.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "util/cooperate.h"
+#include "tactic/tactical.h"
+#include "model/model_v2_pp.h"
+#include "util/obj_hashtable.h"
 
 
 namespace qe {

src/qe/qe.h

@@ -21,15 +21,15 @@ Revision History:
 #ifndef QE_H_
 #define QE_H_
 
-#include "ast.h"
-#include "smt_params.h"
-#include "statistics.h"
-#include "lbool.h"
-#include "expr_functors.h"
-#include "simplifier.h"
-#include "rewriter.h"
-#include "model.h"
-#include "params.h"
+#include "ast/ast.h"
+#include "smt/params/smt_params.h"
+#include "util/statistics.h"
+#include "util/lbool.h"
+#include "ast/expr_functors.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/rewriter/rewriter.h"
+#include "model/model.h"
+#include "util/params.h"
 
 namespace qe {
 

src/qe/qe_arith.cpp

@@ -19,17 +19,17 @@ Revision History:
 
 --*/
 
-#include "qe_arith.h"
-#include "qe_mbp.h"
-#include "ast_util.h"
-#include "arith_decl_plugin.h"
-#include "ast_pp.h"
-#include "model_v2_pp.h"
-#include "th_rewriter.h"
-#include "expr_functors.h"
-#include "expr_safe_replace.h"
-#include "model_based_opt.h"
-#include "model_evaluator.h"
+#include "qe/qe_arith.h"
+#include "qe/qe_mbp.h"
+#include "ast/ast_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "model/model_v2_pp.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/expr_functors.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "math/simplex/model_based_opt.h"
+#include "model/model_evaluator.h"
 
 namespace qe {
     

src/qe/qe_arith.h

@@ -8,9 +8,9 @@ Copyright (c) 2015 Microsoft Corporation
 #ifndef QE_ARITH_H_
 #define QE_ARITH_H_
 
-#include "model.h"
-#include "arith_decl_plugin.h"
-#include "qe_mbp.h"
+#include "model/model.h"
+#include "ast/arith_decl_plugin.h"
+#include "qe/qe_mbp.h"
 
 namespace qe {
 

src/qe/qe_arith_plugin.cpp

@@ -18,21 +18,21 @@ Revision History:
 
 --*/
 
-#include "qe.h"
-#include "ast_pp.h"
-#include "expr_safe_replace.h"
-#include "bool_rewriter.h"
-#include "bv_decl_plugin.h"
-#include "arith_decl_plugin.h"
-#include "arith_eq_solver.h"
-#include "arith_rewriter.h"
-#include "th_rewriter.h"
-#include "factor_rewriter.h"
-#include "obj_pair_hashtable.h"
-#include "nlarith_util.h"
-#include "model_evaluator.h"
-#include "smt_kernel.h"
-#include "qe_arith.h"
+#include "qe/qe.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "smt/arith_eq_solver.h"
+#include "ast/rewriter/arith_rewriter.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/rewriter/factor_rewriter.h"
+#include "util/obj_pair_hashtable.h"
+#include "qe/nlarith_util.h"
+#include "model/model_evaluator.h"
+#include "smt/smt_kernel.h"
+#include "qe/qe_arith.h"
 
 namespace qe {
 

src/qe/qe_array_plugin.cpp

@@ -5,11 +5,11 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 
-#include "qe.h"
-#include "array_decl_plugin.h"
-#include "expr_safe_replace.h"
-#include "ast_pp.h"
-#include "arith_decl_plugin.h"
+#include "qe/qe.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/ast_pp.h"
+#include "ast/arith_decl_plugin.h"
 
 namespace qe {
     // ---------------------

src/qe/qe_arrays.cpp

@@ -18,13 +18,13 @@ Revision History:
 --*/
 
 
-#include "qe_arrays.h"
-#include "rewriter_def.h"
-#include "expr_functors.h"
-#include "expr_safe_replace.h"
-#include "lbool.h"
-#include "ast_util.h"
-#include "ast_pp.h"
+#include "qe/qe_arrays.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/expr_functors.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "util/lbool.h"
+#include "ast/ast_util.h"
+#include "ast/ast_pp.h"
 
 namespace qe {
 

src/qe/qe_arrays.h

@@ -21,8 +21,8 @@ Revision History:
 #ifndef __QE_ARRAYS_H_
 #define __QE_ARRAYS_H_
 
-#include "array_decl_plugin.h"
-#include "qe_mbp.h"
+#include "ast/array_decl_plugin.h"
+#include "qe/qe_mbp.h"
 
 namespace qe {
 

src/qe/qe_bool_plugin.cpp

@@ -24,10 +24,10 @@ Notes:
 
 --*/
 
-#include "qe.h"
-#include "expr_safe_replace.h"
-#include "ast_pp.h"
-#include "model_evaluator.h"
+#include "qe/qe.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/ast_pp.h"
+#include "model/model_evaluator.h"
 
 
 namespace qe {

src/qe/qe_bv_plugin.cpp

@@ -20,10 +20,10 @@ Notes:
 
 --*/
 
-#include "qe.h"
-#include "expr_safe_replace.h"
-#include "bv_decl_plugin.h"
-#include "model_evaluator.h"
+#include "qe/qe.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/bv_decl_plugin.h"
+#include "model/model_evaluator.h"
 
 namespace qe {
 

src/qe/qe_cmd.cpp

@@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "qe_cmd.h"
-#include "qe.h"
-#include "cmd_context.h"
-#include "parametric_cmd.h"
+#include "qe/qe_cmd.h"
+#include "qe/qe.h"
+#include "cmd_context/cmd_context.h"
+#include "cmd_context/parametric_cmd.h"
 
 class qe_cmd : public parametric_cmd {
     expr *                   m_target;

src/qe/qe_datatype_plugin.cpp

@@ -99,13 +99,13 @@ Copyright (c) 2015 Microsoft Corporation
 // maintain set of equations and disequations with x.
 //
 
-#include "qe.h"
-#include "datatype_decl_plugin.h"
-#include "expr_safe_replace.h"
-#include "obj_pair_hashtable.h"
-#include "for_each_expr.h"
-#include "ast_pp.h"
-#include "ast_ll_pp.h"
+#include "qe/qe.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "util/obj_pair_hashtable.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 
 namespace qe {
 

src/qe/qe_datatypes.cpp

@@ -17,14 +17,14 @@ Revision History:
 
 --*/
 
-#include "qe_arith.h"
-#include "ast_pp.h"
-#include "th_rewriter.h"
-#include "expr_functors.h"
-#include "model_v2_pp.h"
-#include "expr_safe_replace.h"
-#include "obj_pair_hashtable.h"
-#include "qe_datatypes.h"
+#include "qe/qe_arith.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/expr_functors.h"
+#include "model/model_v2_pp.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "util/obj_pair_hashtable.h"
+#include "qe/qe_datatypes.h"
 
 namespace qe {
     

src/qe/qe_datatypes.h

@@ -21,8 +21,8 @@ Revision History:
 #ifndef __QE_DATATYPES_H_
 #define __QE_DATATYPES_H_
 
-#include "datatype_decl_plugin.h"
-#include "qe_mbp.h"
+#include "ast/datatype_decl_plugin.h"
+#include "qe/qe_mbp.h"
 
 namespace qe {
 

src/qe/qe_dl_plugin.cpp

@@ -5,11 +5,11 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 
-#include "qe.h"
-#include "expr_safe_replace.h"
-#include "dl_decl_plugin.h"
-#include "obj_pair_hashtable.h"
-#include "ast_pp.h"
+#include "qe/qe.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/dl_decl_plugin.h"
+#include "util/obj_pair_hashtable.h"
+#include "ast/ast_pp.h"
 
 
 namespace qe {

src/qe/qe_lite.cpp

@@ -17,26 +17,26 @@ Revision History:
 
 
 --*/
-#include "qe_lite.h"
-#include "expr_abstract.h"
-#include "used_vars.h"
-#include "occurs.h"
-#include "rewriter_def.h"
-#include "ast_pp.h"
-#include "ast_ll_pp.h"
-#include "ast_smt2_pp.h"
-#include "tactical.h"
-#include "bool_rewriter.h"
-#include "var_subst.h"
-#include "uint_set.h"
-#include "ast_util.h"
-#include "th_rewriter.h"
-#include "for_each_expr.h"
-#include "expr_safe_replace.h"
-#include "cooperate.h"
-#include "datatype_decl_plugin.h"
+#include "qe/qe_lite.h"
+#include "ast/expr_abstract.h"
+#include "ast/used_vars.h"
+#include "ast/occurs.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "tactic/tactical.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/var_subst.h"
+#include "util/uint_set.h"
+#include "ast/ast_util.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/for_each_expr.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "util/cooperate.h"
+#include "ast/datatype_decl_plugin.h"
 
-#include "qe_vartest.h"
+#include "qe/qe_vartest.h"
 
 namespace eq {
     class der {

src/qe/qe_lite.h

@@ -21,9 +21,9 @@ Revision History:
 #ifndef QE_LITE_H_
 #define QE_LITE_H_
 
-#include "ast.h"
-#include "uint_set.h"
-#include "params.h"
+#include "ast/ast.h"
+#include "util/uint_set.h"
+#include "util/params.h"
 
 class tactic;
 

src/qe/qe_mbp.cpp

@@ -18,18 +18,18 @@ Revision History:
 
 --*/
 
-#include "qe_mbp.h"
-#include "qe_arith.h"
-#include "qe_arrays.h"
-#include "qe_datatypes.h"
-#include "expr_safe_replace.h"
-#include "ast_pp.h"
-#include "ast_util.h"
-#include "th_rewriter.h"
-#include "model_v2_pp.h"
-#include "expr_functors.h"
-#include "for_each_expr.h"
-#include "model_evaluator.h"
+#include "qe/qe_mbp.h"
+#include "qe/qe_arith.h"
+#include "qe/qe_arrays.h"
+#include "qe/qe_datatypes.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "model/model_v2_pp.h"
+#include "ast/expr_functors.h"
+#include "ast/for_each_expr.h"
+#include "model/model_evaluator.h"
 
 
 using namespace qe;

src/qe/qe_mbp.h

@@ -21,10 +21,10 @@ Revision History:
 #ifndef __QE_MBP_H__
 #define __QE_MBP_H__
 
-#include "ast.h"
-#include "params.h"
-#include "model.h"
-#include "model_based_opt.h"
+#include "ast/ast.h"
+#include "util/params.h"
+#include "model/model.h"
+#include "math/simplex/model_based_opt.h"
 
 
 namespace qe {

src/qe/qe_sat_tactic.cpp

@@ -20,16 +20,16 @@ Revision History:
 
 --*/
 
-#include "qe_sat_tactic.h"
-#include "quant_hoist.h"
-#include "ast_pp.h"
-#include "smt_kernel.h"
-#include "qe.h"
-#include "cooperate.h"
-#include "model_v2_pp.h"
-#include "expr_replacer.h"
-#include "th_rewriter.h"
-#include "expr_context_simplifier.h"
+#include "qe/qe_sat_tactic.h"
+#include "ast/rewriter/quant_hoist.h"
+#include "ast/ast_pp.h"
+#include "smt/smt_kernel.h"
+#include "qe/qe.h"
+#include "util/cooperate.h"
+#include "model/model_v2_pp.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "smt/expr_context_simplifier.h"
 
 // plugin registration.
 // solver specific projection operators.

src/qe/qe_sat_tactic.h

@@ -22,7 +22,7 @@ Revision History:
 #ifndef QE_SAT_H_
 #define QE_SAT_H_
 
-#include"tactic.h"
+#include "tactic/tactic.h"
 
 namespace qe {
         

src/qe/qe_tactic.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"tactical.h"
-#include"filter_model_converter.h"
-#include"cooperate.h"
-#include"qe.h"
+#include "tactic/tactical.h"
+#include "tactic/filter_model_converter.h"
+#include "util/cooperate.h"
+#include "qe/qe.h"
 
 class qe_tactic : public tactic {
     statistics               m_st;

src/qe/qe_tactic.h

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

src/qe/qe_vartest.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef QE_VARTEST_H_
 #define QE_VARTEST_H_
 
-#include "ast.h"
-#include "uint_set.h"
+#include "ast/ast.h"
+#include "util/uint_set.h"
 
 class is_variable_proc {
 public:

src/qe/qsat.cpp

@@ -20,23 +20,23 @@ Notes:
 
 --*/
 
-#include "smt_kernel.h"
-#include "qe_mbp.h"
-#include "smt_params.h"
-#include "ast_util.h"
-#include "quant_hoist.h"
-#include "ast_pp.h" 
-#include "model_v2_pp.h"
-#include "qsat.h"
-#include "expr_abstract.h"
-#include "qe.h"
-#include "label_rewriter.h"
-#include "expr_replacer.h"
-#include "th_rewriter.h"
-#include "model_evaluator.h"
-#include "smt_solver.h"
-#include "solver.h"
-#include "mus.h"
+#include "smt/smt_kernel.h"
+#include "qe/qe_mbp.h"
+#include "smt/params/smt_params.h"
+#include "ast/ast_util.h"
+#include "ast/rewriter/quant_hoist.h"
+#include "ast/ast_pp.h"
+#include "model/model_v2_pp.h"
+#include "qe/qsat.h"
+#include "ast/expr_abstract.h"
+#include "qe/qe.h"
+#include "ast/rewriter/label_rewriter.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "model/model_evaluator.h"
+#include "smt/smt_solver.h"
+#include "solver/solver.h"
+#include "solver/mus.h"
 
 namespace qe {
 

src/qe/qsat.h

@@ -21,9 +21,9 @@ Revision History:
 #ifndef QE_QSAT_H__
 #define QE_QSAT_H__
 
-#include "tactic.h"
-#include "filter_model_converter.h"
-#include "qe_mbp.h"
+#include "tactic/tactic.h"
+#include "tactic/filter_model_converter.h"
+#include "qe/qe_mbp.h"
 
 namespace qe {
 

src/qe/vsubst_tactic.cpp

@@ -40,12 +40,12 @@ Notes:
         a*a + b*b + c < 0  => c < 0
 
 --*/
-#include"tactic.h"
-#include"qe.h"
-#include"arith_decl_plugin.h"
-#include"for_each_expr.h"
-#include"extension_model_converter.h"
-#include"ast_smt2_pp.h"
+#include "tactic/tactic.h"
+#include "qe/qe.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/for_each_expr.h"
+#include "tactic/extension_model_converter.h"
+#include "ast/ast_smt2_pp.h"
 
 class vsubst_tactic : public tactic {
     params_ref m_params;

src/qe/vsubst_tactic.h

@@ -20,7 +20,7 @@ Notes:
 #ifndef VSUBST_TACTIC_H_
 #define VSUBST_TACTIC_H_
 
-#include"params.h"
+#include "util/params.h"
 class ast_manager;
 class tactic;