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

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

src/tactic/smtlogics/nra_tactic.cpp

@@ -16,16 +16,16 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"smt_tactic.h"
-#include"nnf_tactic.h"
-#include"qe_tactic.h"
-#include"nlqsat.h"
-#include"qfnra_nlsat_tactic.h"
-#include"qe_lite.h"
-#include"probe_arith.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "smt/tactic/smt_tactic.h"
+#include "tactic/core/nnf_tactic.h"
+#include "qe/qe_tactic.h"
+#include "qe/nlqsat.h"
+#include "nlsat/tactic/qfnra_nlsat_tactic.h"
+#include "qe/qe_lite.h"
+#include "tactic/arith/probe_arith.h"
 
 tactic * mk_nra_tactic(ast_manager & m, params_ref const& p) {
     params_ref p1 = p;

src/tactic/smtlogics/qfaufbv_tactic.cpp

@@ -16,16 +16,16 @@ Author:
 Notes:
 
 --*/
-#include"solve_eqs_tactic.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"bit_blaster_tactic.h"
-#include"elim_uncnstr_tactic.h"
-#include"max_bv_sharing_tactic.h"
-#include"bv_size_reduction_tactic.h"
-#include"ctx_simplify_tactic.h"
-#include"sat_tactic.h"
-#include"smt_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/bv/bit_blaster_tactic.h"
+#include "tactic/core/elim_uncnstr_tactic.h"
+#include "tactic/bv/max_bv_sharing_tactic.h"
+#include "tactic/bv/bv_size_reduction_tactic.h"
+#include "tactic/core/ctx_simplify_tactic.h"
+#include "sat/tactic/sat_tactic.h"
+#include "smt/tactic/smt_tactic.h"
 
 tactic * mk_qfaufbv_tactic(ast_manager & m, params_ref const & p) {
     params_ref main_p;

src/tactic/smtlogics/qfaufbv_tactic.h

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

src/tactic/smtlogics/qfauflia_tactic.cpp

@@ -16,13 +16,13 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"propagate_ineqs_tactic.h"
-#include"solve_eqs_tactic.h"
-#include"elim_uncnstr_tactic.h"
-#include"smt_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/arith/propagate_ineqs_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/elim_uncnstr_tactic.h"
+#include "smt/tactic/smt_tactic.h"
 
 tactic * mk_qfauflia_tactic(ast_manager & m, params_ref const & p) {
     params_ref main_p;

src/tactic/smtlogics/qfauflia_tactic.h

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

src/tactic/smtlogics/qfbv_tactic.cpp

@@ -16,19 +16,19 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"solve_eqs_tactic.h"
-#include"elim_uncnstr_tactic.h"
-#include"smt_tactic.h"
-#include"bit_blaster_tactic.h"
-#include"bv1_blaster_tactic.h"
-#include"max_bv_sharing_tactic.h"
-#include"bv_size_reduction_tactic.h"
-#include"aig_tactic.h"
-#include"sat_tactic.h"
-#include"ackermannize_bv_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/elim_uncnstr_tactic.h"
+#include "smt/tactic/smt_tactic.h"
+#include "tactic/bv/bit_blaster_tactic.h"
+#include "tactic/bv/bv1_blaster_tactic.h"
+#include "tactic/bv/max_bv_sharing_tactic.h"
+#include "tactic/bv/bv_size_reduction_tactic.h"
+#include "tactic/aig/aig_tactic.h"
+#include "sat/tactic/sat_tactic.h"
+#include "ackermannization/ackermannize_bv_tactic.h"
 
 #define MEMLIMIT 300
 

src/tactic/smtlogics/qfbv_tactic.h

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

src/tactic/smtlogics/qfidl_tactic.cpp

@@ -16,22 +16,22 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"propagate_ineqs_tactic.h"
-#include"solve_eqs_tactic.h"
-#include"elim_uncnstr_tactic.h"
-#include"normalize_bounds_tactic.h"
-#include"fix_dl_var_tactic.h"
-#include"smt_tactic.h"
-#include"lia2pb_tactic.h"
-#include"pb2bv_tactic.h"
-#include"diff_neq_tactic.h"
-#include"bit_blaster_tactic.h"
-#include"max_bv_sharing_tactic.h"
-#include"aig_tactic.h"
-#include"sat_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/arith/propagate_ineqs_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/elim_uncnstr_tactic.h"
+#include "tactic/arith/normalize_bounds_tactic.h"
+#include "tactic/arith/fix_dl_var_tactic.h"
+#include "smt/tactic/smt_tactic.h"
+#include "tactic/arith/lia2pb_tactic.h"
+#include "tactic/arith/pb2bv_tactic.h"
+#include "tactic/arith/diff_neq_tactic.h"
+#include "tactic/bv/bit_blaster_tactic.h"
+#include "tactic/bv/max_bv_sharing_tactic.h"
+#include "tactic/aig/aig_tactic.h"
+#include "sat/tactic/sat_tactic.h"
 
 #define BIG_PROBLEM 5000
 

src/tactic/smtlogics/qfidl_tactic.h

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

src/tactic/smtlogics/qflia_tactic.cpp

@@ -16,25 +16,25 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"propagate_ineqs_tactic.h"
-#include"normalize_bounds_tactic.h"
-#include"solve_eqs_tactic.h"
-#include"elim_uncnstr_tactic.h"
-#include"smt_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/arith/propagate_ineqs_tactic.h"
+#include "tactic/arith/normalize_bounds_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/elim_uncnstr_tactic.h"
+#include "smt/tactic/smt_tactic.h"
 // include"mip_tactic.h"
-#include"add_bounds_tactic.h"
-#include"pb2bv_tactic.h"
-#include"lia2pb_tactic.h"
-#include"ctx_simplify_tactic.h"
-#include"bit_blaster_tactic.h"
-#include"max_bv_sharing_tactic.h"
-#include"aig_tactic.h"
-#include"sat_tactic.h"
-#include"bound_manager.h"
-#include"probe_arith.h"
+#include "tactic/arith/add_bounds_tactic.h"
+#include "tactic/arith/pb2bv_tactic.h"
+#include "tactic/arith/lia2pb_tactic.h"
+#include "tactic/core/ctx_simplify_tactic.h"
+#include "tactic/bv/bit_blaster_tactic.h"
+#include "tactic/bv/max_bv_sharing_tactic.h"
+#include "tactic/aig/aig_tactic.h"
+#include "sat/tactic/sat_tactic.h"
+#include "tactic/arith/bound_manager.h"
+#include "tactic/arith/probe_arith.h"
 
 struct quasi_pb_probe : public probe {
     virtual result operator()(goal const & g) {

src/tactic/smtlogics/qflia_tactic.h

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

src/tactic/smtlogics/qflra_tactic.cpp

@@ -16,15 +16,15 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"solve_eqs_tactic.h"
-#include"elim_uncnstr_tactic.h"
-#include"smt_tactic.h"
-#include"recover_01_tactic.h"
-#include"ctx_simplify_tactic.h"
-#include"probe_arith.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/elim_uncnstr_tactic.h"
+#include "smt/tactic/smt_tactic.h"
+#include "tactic/arith/recover_01_tactic.h"
+#include "tactic/core/ctx_simplify_tactic.h"
+#include "tactic/arith/probe_arith.h"
 
 tactic * mk_qflra_tactic(ast_manager & m, params_ref const & p) {
     params_ref pivot_p;

src/tactic/smtlogics/qflra_tactic.h

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

src/tactic/smtlogics/qfnia_tactic.cpp

@@ -16,18 +16,18 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"solve_eqs_tactic.h"
-#include"elim_uncnstr_tactic.h"
-#include"smt_tactic.h"
-#include"bit_blaster_tactic.h"
-#include"max_bv_sharing_tactic.h"
-#include"sat_tactic.h"
-#include"nla2bv_tactic.h"
-#include"ctx_simplify_tactic.h"
-#include"cofactor_term_ite_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/elim_uncnstr_tactic.h"
+#include "smt/tactic/smt_tactic.h"
+#include "tactic/bv/bit_blaster_tactic.h"
+#include "tactic/bv/max_bv_sharing_tactic.h"
+#include "sat/tactic/sat_tactic.h"
+#include "tactic/arith/nla2bv_tactic.h"
+#include "tactic/core/ctx_simplify_tactic.h"
+#include "tactic/core/cofactor_term_ite_tactic.h"
 
 static tactic * mk_qfnia_bv_solver(ast_manager & m, params_ref const & p_ref) {
     params_ref p = p_ref;

src/tactic/smtlogics/qfnia_tactic.h

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

src/tactic/smtlogics/qfnra_tactic.cpp

@@ -16,12 +16,12 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"nla2bv_tactic.h"
-#include"smt_tactic.h"
-#include"qfnra_nlsat_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/arith/nla2bv_tactic.h"
+#include "smt/tactic/smt_tactic.h"
+#include "nlsat/tactic/qfnra_nlsat_tactic.h"
 
 static tactic * mk_qfnra_sat_solver(ast_manager& m, params_ref const& p, unsigned bv_size) {
     params_ref nra2sat_p = p;

src/tactic/smtlogics/qfnra_tactic.h

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

src/tactic/smtlogics/qfuf_tactic.cpp

@@ -17,12 +17,12 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"symmetry_reduce_tactic.h"
-#include"solve_eqs_tactic.h"
-#include"propagate_values_tactic.h"
-#include"smt_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/symmetry_reduce_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "smt/tactic/smt_tactic.h"
 
 tactic * mk_qfuf_tactic(ast_manager & m, params_ref const & p) {
     params_ref s2_p;

src/tactic/smtlogics/qfuf_tactic.h

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

src/tactic/smtlogics/qfufbv_ackr_model_converter.cpp

@@ -14,8 +14,8 @@
 
  Revision History:
 --*/
-#include"qfufbv_ackr_model_converter.h"
-#include"ackr_model_converter.h"
+#include "tactic/smtlogics/qfufbv_ackr_model_converter.h"
+#include "ackermannization/ackr_model_converter.h"
 
 model_converter * mk_qfufbv_ackr_model_converter(ast_manager & m, const ackr_info_ref& info, model_ref& abstr_model) {
    return mk_ackr_model_converter(m, info, abstr_model);

src/tactic/smtlogics/qfufbv_ackr_model_converter.h

@@ -17,8 +17,8 @@
 #ifndef QFUFBV_ACKR_MODEL_CONVERTER_H_
 #define QFUFBV_ACKR_MODEL_CONVERTER_H_
 
-#include"model_converter.h"
-#include"ackr_info.h"
+#include "tactic/model_converter.h"
+#include "ackermannization/ackr_info.h"
 
 model_converter * mk_qfufbv_ackr_model_converter(ast_manager & m, const ackr_info_ref& info, model_ref& abstr_model);
 

src/tactic/smtlogics/qfufbv_tactic.cpp

@@ -17,29 +17,29 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"solve_eqs_tactic.h"
-#include"elim_uncnstr_tactic.h"
-#include"smt_tactic.h"
-#include"max_bv_sharing_tactic.h"
-#include"bv_size_reduction_tactic.h"
-#include"reduce_args_tactic.h"
-#include"qfbv_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/elim_uncnstr_tactic.h"
+#include "smt/tactic/smt_tactic.h"
+#include "tactic/bv/max_bv_sharing_tactic.h"
+#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"model_smt2_pp.h"
-#include"cooperate.h"
-#include"lackr.h"
+#include "model/model_smt2_pp.h"
+#include "util/cooperate.h"
+#include "ackermannization/lackr.h"
 #include"ackermannization_params.hpp"
-#include"qfufbv_ackr_model_converter.h"
+#include "tactic/smtlogics/qfufbv_ackr_model_converter.h"
 ///////////////
-#include"inc_sat_solver.h"
-#include"qfaufbv_tactic.h"
-#include"qfbv_tactic.h"
-#include"tactic2solver.h"
-#include"bv_bound_chk_tactic.h"
+#include "sat/sat_solver/inc_sat_solver.h"
+#include "tactic/smtlogics/qfaufbv_tactic.h"
+#include "tactic/smtlogics/qfbv_tactic.h"
+#include "solver/tactic2solver.h"
+#include "tactic/bv/bv_bound_chk_tactic.h"
 ///////////////
 
 class qfufbv_ackr_tactic : public tactic {

src/tactic/smtlogics/qfufbv_tactic.h

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

src/tactic/smtlogics/qfufnra_tactic.cpp

@@ -16,18 +16,18 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"nl_purify_tactic.h"
-#include"qfufnra_tactic.h"
-#include"purify_arith_tactic.h"
-#include"solve_eqs_tactic.h"
-#include"elim_term_ite_tactic.h"
-#include"elim_uncnstr_tactic.h"
-#include"simplify_tactic.h"
-#include"nnf_tactic.h"
-#include"tseitin_cnf_tactic.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/nlsat_smt/nl_purify_tactic.h"
+#include "tactic/smtlogics/qfufnra_tactic.h"
+#include "tactic/arith/purify_arith_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/elim_term_ite_tactic.h"
+#include "tactic/core/elim_uncnstr_tactic.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/nnf_tactic.h"
+#include "tactic/core/tseitin_cnf_tactic.h"
 
 tactic * mk_qfufnra_tactic(ast_manager & m, params_ref const& p) {
     params_ref main_p = p;

src/tactic/smtlogics/qfufnra_tactic.h

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

src/tactic/smtlogics/quant_tactics.cpp

@@ -16,19 +16,19 @@ Author:
 Revision History:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"solve_eqs_tactic.h"
-#include"elim_uncnstr_tactic.h"
-#include"qe_tactic.h"
-#include"qe_lite.h"
-#include"qsat.h"
-#include"nlqsat.h"
-#include"ctx_simplify_tactic.h"
-#include"smt_tactic.h"
-#include"elim_term_ite_tactic.h"
-#include"probe_arith.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/elim_uncnstr_tactic.h"
+#include "qe/qe_tactic.h"
+#include "qe/qe_lite.h"
+#include "qe/qsat.h"
+#include "qe/nlqsat.h"
+#include "tactic/core/ctx_simplify_tactic.h"
+#include "smt/tactic/smt_tactic.h"
+#include "tactic/core/elim_term_ite_tactic.h"
+#include "tactic/arith/probe_arith.h"
 
 static tactic * mk_quant_preprocessor(ast_manager & m, bool disable_gaussian = false) {
     params_ref pull_ite_p;

src/tactic/smtlogics/quant_tactics.h

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