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

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

src/opt/maxres.cpp

@@ -52,18 +52,18 @@ Notes:
 
 --*/
 
-#include "solver.h"
-#include "maxsmt.h"
-#include "maxres.h"
-#include "ast_pp.h"
-#include "mus.h"
-#include "mss.h"
-#include "inc_sat_solver.h"
-#include "opt_context.h"
-#include "pb_decl_plugin.h"
+#include "solver/solver.h"
+#include "opt/maxsmt.h"
+#include "opt/maxres.h"
+#include "ast/ast_pp.h"
+#include "solver/mus.h"
+#include "opt/mss.h"
+#include "sat/sat_solver/inc_sat_solver.h"
+#include "opt/opt_context.h"
+#include "ast/pb_decl_plugin.h"
 #include "opt_params.hpp"
-#include "ast_util.h"
-#include "smt_solver.h"
+#include "ast/ast_util.h"
+#include "smt/smt_solver.h"
 
 using namespace opt;
 

src/opt/maxsmt.cpp

@@ -18,16 +18,16 @@ Notes:
 --*/
 
 #include <typeinfo>
-#include "maxsmt.h"
-#include "maxres.h"
-#include "wmax.h"
-#include "ast_pp.h"
-#include "uint_set.h"
-#include "opt_context.h"
-#include "theory_wmaxsat.h"
-#include "theory_pb.h"
-#include "ast_util.h"
-#include "pb_decl_plugin.h"
+#include "opt/maxsmt.h"
+#include "opt/maxres.h"
+#include "opt/wmax.h"
+#include "ast/ast_pp.h"
+#include "util/uint_set.h"
+#include "opt/opt_context.h"
+#include "smt/theory_wmaxsat.h"
+#include "smt/theory_pb.h"
+#include "ast/ast_util.h"
+#include "ast/pb_decl_plugin.h"
 
 
 namespace opt {

src/opt/maxsmt.h

@@ -19,15 +19,15 @@ Notes:
 #ifndef OPT_MAXSMT_H_
 #define OPT_MAXSMT_H_
 
-#include"ast.h"
-#include"params.h"
-#include"solver.h"
-#include"filter_model_converter.h"
-#include"statistics.h"
-#include"smt_context.h"
-#include"smt_theory.h"
-#include"theory_wmaxsat.h"
-#include"opt_solver.h"
+#include "ast/ast.h"
+#include "util/params.h"
+#include "solver/solver.h"
+#include "tactic/filter_model_converter.h"
+#include "util/statistics.h"
+#include "smt/smt_context.h"
+#include "smt/smt_theory.h"
+#include "smt/theory_wmaxsat.h"
+#include "opt/opt_solver.h"
 
 namespace opt {
 

src/opt/mss.cpp

@@ -18,10 +18,10 @@ Notes:
 
 --*/
 
-#include "solver.h"
-#include "mss.h"
-#include "ast_pp.h"
-#include "model_smt2_pp.h"
+#include "solver/solver.h"
+#include "opt/mss.h"
+#include "ast/ast_pp.h"
+#include "model/model_smt2_pp.h"
 
 namespace opt {
 

src/opt/opt_cmds.cpp

@@ -21,16 +21,16 @@ Notes:
     - Deal with push/pop (later)
 
 --*/
-#include "opt_cmds.h"
-#include "cmd_context.h"
-#include "ast_pp.h"
-#include "opt_context.h"
-#include "cancel_eh.h"
-#include "scoped_ctrl_c.h"
-#include "scoped_timer.h"
-#include "parametric_cmd.h"
+#include "opt/opt_cmds.h"
+#include "cmd_context/cmd_context.h"
+#include "ast/ast_pp.h"
+#include "opt/opt_context.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/scoped_timer.h"
+#include "cmd_context/parametric_cmd.h"
 #include "opt_params.hpp"
-#include "model_smt2_pp.h"
+#include "model/model_smt2_pp.h"
 
 static opt::context& get_opt(cmd_context& cmd, opt::context* opt) {
     if (opt) {

src/opt/opt_cmds.h

@@ -18,8 +18,8 @@ Notes:
 #ifndef OPT_CMDS_H_
 #define OPT_CMDS_H_
 
-#include "ast.h"
-#include "opt_context.h"
+#include "ast/ast.h"
+#include "opt/opt_context.h"
 
 class cmd_context;
 

src/opt/opt_context.cpp

@@ -17,32 +17,32 @@ Notes:
 
 --*/
 
-#include "opt_context.h"
-#include "ast_pp.h"
-#include "opt_solver.h"
+#include "opt/opt_context.h"
+#include "ast/ast_pp.h"
+#include "opt/opt_solver.h"
 #include "opt_params.hpp"
-#include "for_each_expr.h"
-#include "goal.h"
-#include "tactic.h"
-#include "lia2card_tactic.h"
-#include "elim01_tactic.h"
-#include "solve_eqs_tactic.h"
-#include "simplify_tactic.h"
-#include "propagate_values_tactic.h"
-#include "solve_eqs_tactic.h"
-#include "elim_uncnstr_tactic.h"
-#include "tactical.h"
-#include "model_smt2_pp.h"
-#include "card2bv_tactic.h"
-#include "eq2bv_tactic.h"
-#include "dt2bv_tactic.h"
-#include "inc_sat_solver.h"
-#include "bv_decl_plugin.h"
-#include "pb_decl_plugin.h"
-#include "ast_smt_pp.h"
-#include "filter_model_converter.h"
-#include "ast_pp_util.h"
-#include "qsat.h"
+#include "ast/for_each_expr.h"
+#include "tactic/goal.h"
+#include "tactic/tactic.h"
+#include "tactic/arith/lia2card_tactic.h"
+#include "tactic/arith/elim01_tactic.h"
+#include "tactic/core/solve_eqs_tactic.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 "tactic/tactical.h"
+#include "model/model_smt2_pp.h"
+#include "tactic/arith/card2bv_tactic.h"
+#include "tactic/arith/eq2bv_tactic.h"
+#include "tactic/bv/dt2bv_tactic.h"
+#include "sat/sat_solver/inc_sat_solver.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/pb_decl_plugin.h"
+#include "ast/ast_smt_pp.h"
+#include "tactic/filter_model_converter.h"
+#include "ast/ast_pp_util.h"
+#include "qe/qsat.h"
 
 namespace opt {
 

src/opt/opt_context.h

@@ -18,17 +18,17 @@ Notes:
 #ifndef OPT_CONTEXT_H_
 #define OPT_CONTEXT_H_
 
-#include "ast.h"
-#include "opt_solver.h"
-#include "opt_pareto.h"
-#include "optsmt.h"
-#include "maxsmt.h"
-#include "model_converter.h"
-#include "tactic.h"
-#include "arith_decl_plugin.h"
-#include "bv_decl_plugin.h"
-#include "cmd_context.h"
-#include "qsat.h"
+#include "ast/ast.h"
+#include "opt/opt_solver.h"
+#include "opt/opt_pareto.h"
+#include "opt/optsmt.h"
+#include "opt/maxsmt.h"
+#include "tactic/model_converter.h"
+#include "tactic/tactic.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "cmd_context/cmd_context.h"
+#include "qe/qsat.h"
 
 namespace opt {
 

src/opt/opt_pareto.cpp

@@ -18,9 +18,9 @@ Notes:
    
 --*/
 
-#include "opt_pareto.h"
-#include "ast_pp.h"
-#include "model_smt2_pp.h"
+#include "opt/opt_pareto.h"
+#include "ast/ast_pp.h"
+#include "model/model_smt2_pp.h"
 
 namespace opt {
 

src/opt/opt_pareto.h

@@ -20,8 +20,8 @@ Notes:
 #ifndef OPT_PARETO_H_
 #define OPT_PARETO_H_
 
-#include "solver.h"
-#include "model.h"
+#include "solver/solver.h"
+#include "model/model.h"
 
 namespace opt {
    

src/opt/opt_sls_solver.h

@@ -20,11 +20,11 @@ Notes:
 #ifndef OPT_SLS_SOLVER_H_
 #define OPT_SLS_SOLVER_H_
 
-#include "solver_na2as.h"
-#include "card2bv_tactic.h"
-#include "nnf_tactic.h"
-#include "pb_sls.h"
-#include "bvsls_opt_engine.h"
+#include "solver/solver_na2as.h"
+#include "tactic/arith/card2bv_tactic.h"
+#include "tactic/core/nnf_tactic.h"
+#include "opt/pb_sls.h"
+#include "tactic/sls/bvsls_opt_engine.h"
 
 
 namespace opt {

src/opt/opt_solver.cpp

@@ -19,20 +19,20 @@ Notes:
    
 --*/
 #include <typeinfo>
-#include "reg_decl_plugins.h"
-#include "opt_solver.h"
-#include "smt_context.h"
-#include "theory_arith.h"
-#include "theory_diff_logic.h"
-#include "theory_dense_diff_logic.h"
-#include "theory_pb.h"
-#include "theory_lra.h"
-#include "ast_pp.h"
-#include "ast_smt_pp.h"
+#include "ast/reg_decl_plugins.h"
+#include "opt/opt_solver.h"
+#include "smt/smt_context.h"
+#include "smt/theory_arith.h"
+#include "smt/theory_diff_logic.h"
+#include "smt/theory_dense_diff_logic.h"
+#include "smt/theory_pb.h"
+#include "smt/theory_lra.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt_pp.h"
 #include "pp_params.hpp"
 #include "opt_params.hpp"
-#include "model_smt2_pp.h"
-#include "stopwatch.h"
+#include "model/model_smt2_pp.h"
+#include "util/stopwatch.h"
 
 namespace opt {
 

src/opt/opt_solver.h

@@ -21,16 +21,16 @@ Notes:
 #ifndef OPT_SOLVER_H_
 #define OPT_SOLVER_H_
 
-#include"inf_rational.h"
-#include"inf_eps_rational.h"
-#include"ast.h"
-#include"params.h"
-#include"solver_na2as.h"
-#include"smt_kernel.h"
-#include"smt_params.h"
-#include"smt_types.h"
-#include"theory_opt.h"
-#include"filter_model_converter.h"
+#include "util/inf_rational.h"
+#include "util/inf_eps_rational.h"
+#include "ast/ast.h"
+#include "util/params.h"
+#include "solver/solver_na2as.h"
+#include "smt/smt_kernel.h"
+#include "smt/params/smt_params.h"
+#include "smt/smt_types.h"
+#include "smt/theory_opt.h"
+#include "tactic/filter_model_converter.h"
 
 namespace opt {
 

src/opt/optsmt.cpp

@@ -29,14 +29,14 @@ Notes:
 --*/
 
 #include <typeinfo>
-#include "optsmt.h"
-#include "opt_solver.h"
-#include "arith_decl_plugin.h"
-#include "theory_arith.h"
-#include "ast_pp.h"
-#include "ast_util.h"
-#include "model_pp.h"
-#include "th_rewriter.h"
+#include "opt/optsmt.h"
+#include "opt/opt_solver.h"
+#include "ast/arith_decl_plugin.h"
+#include "smt/theory_arith.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
+#include "model/model_pp.h"
+#include "ast/rewriter/th_rewriter.h"
 #include "opt_params.hpp"
 
 namespace opt {

src/opt/optsmt.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef OPTSMT_H_
 #define OPTSMT_H_
 
-#include "opt_solver.h"
+#include "opt/opt_solver.h"
 
 namespace opt {
     /**

src/opt/pb_sls.cpp

@@ -16,11 +16,11 @@ Author:
 Notes:
 
 --*/
-#include "pb_sls.h"
-#include "smt_literal.h"
-#include "ast_pp.h"
-#include "th_rewriter.h"
-#include "sat_types.h"
+#include "opt/pb_sls.h"
+#include "smt/smt_literal.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "sat/sat_types.h"
 
 namespace smt {
 

src/opt/pb_sls.h

@@ -19,11 +19,11 @@ Notes:
 #ifndef PB_SLS_H_
 #define PB_SLS_H_
 
-#include "pb_decl_plugin.h"
-#include "model.h"
-#include "lbool.h"
-#include "params.h"
-#include "statistics.h"
+#include "ast/pb_decl_plugin.h"
+#include "model/model.h"
+#include "util/lbool.h"
+#include "util/params.h"
+#include "util/statistics.h"
 
 namespace smt {
 

src/opt/sortmax.cpp

@@ -16,15 +16,15 @@ Author:
 Notes:
 
 --*/
-#include "maxsmt.h"
-#include "uint_set.h"
-#include "ast_pp.h"
-#include "model_smt2_pp.h"
-#include "smt_theory.h"
-#include "smt_context.h"
-#include "opt_context.h"
-#include "sorting_network.h"
-#include "filter_model_converter.h"
+#include "opt/maxsmt.h"
+#include "util/uint_set.h"
+#include "ast/ast_pp.h"
+#include "model/model_smt2_pp.h"
+#include "smt/smt_theory.h"
+#include "smt/smt_context.h"
+#include "opt/opt_context.h"
+#include "util/sorting_network.h"
+#include "tactic/filter_model_converter.h"
 
 namespace opt {
 

src/opt/wmax.cpp

@@ -16,14 +16,14 @@ Author:
 Notes:
 
 --*/
-#include "wmax.h"
-#include "uint_set.h"
-#include "ast_pp.h"
-#include "model_smt2_pp.h"
-#include "smt_theory.h"
-#include "smt_context.h"
-#include "theory_wmaxsat.h"
-#include "opt_context.h"
+#include "opt/wmax.h"
+#include "util/uint_set.h"
+#include "ast/ast_pp.h"
+#include "model/model_smt2_pp.h"
+#include "smt/smt_theory.h"
+#include "smt/smt_context.h"
+#include "smt/theory_wmaxsat.h"
+#include "opt/opt_context.h"
 
 namespace opt {
     // ----------------------------------------------------------

src/opt/wmax.h

@@ -20,7 +20,7 @@ Notes:
 #ifndef WMAX_H_
 #define WMAX_H_
 
-#include "maxsmt.h"
+#include "opt/maxsmt.h"
 
 namespace opt {
     maxsmt_solver_base* mk_wmax(maxsat_context& c, weights_t & ws, expr_ref_vector const& soft);