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

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

src/tactic/sls/bvsls_opt_engine.cpp

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#include "nnf.h"
-#include "bvsls_opt_engine.h"
+#include "ast/normal_forms/nnf.h"
+#include "tactic/sls/bvsls_opt_engine.h"
 
 bvsls_opt_engine::bvsls_opt_engine(ast_manager & m, params_ref const & p) :
     sls_engine(m, p),

src/tactic/sls/bvsls_opt_engine.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef BVSLS_OPT_ENGINE_H_
 #define BVSLS_OPT_ENGINE_H_
 
-#include "sls_engine.h"
+#include "tactic/sls/sls_engine.h"
 
 class bvsls_opt_engine : public sls_engine {
     sls_tracker   & m_hard_tracker;

src/tactic/sls/sls_engine.cpp

@@ -18,17 +18,17 @@ Notes:
 --*/
 #include<float.h> // Need DBL_MAX
 
-#include"map.h"
-#include"ast_smt2_pp.h"
-#include"ast_pp.h"
-#include"var_subst.h"
-#include"model_pp.h"
-#include"tactic.h"
-#include"cooperate.h"
-#include"luby.h"
+#include "util/map.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/var_subst.h"
+#include "model/model_pp.h"
+#include "tactic/tactic.h"
+#include "util/cooperate.h"
+#include "util/luby.h"
 
 #include"sls_params.hpp"
-#include"sls_engine.h"
+#include "tactic/sls/sls_engine.h"
 
 
 sls_engine::sls_engine(ast_manager & m, params_ref const & p) :

src/tactic/sls/sls_engine.h

@@ -19,14 +19,14 @@ Notes:
 #ifndef SLS_ENGINE_H_
 #define SLS_ENGINE_H_
 
-#include"stopwatch.h"
-#include"lbool.h"
-#include"model_converter.h"
-#include"goal.h"
+#include "util/stopwatch.h"
+#include "util/lbool.h"
+#include "tactic/model_converter.h"
+#include "tactic/goal.h"
 
-#include"sls_tracker.h"
-#include"sls_evaluator.h"
-#include"statistics.h"
+#include "tactic/sls/sls_tracker.h"
+#include "tactic/sls/sls_evaluator.h"
+#include "util/statistics.h"
 
 class sls_engine {
 public:

src/tactic/sls/sls_evaluator.h

@@ -20,10 +20,10 @@ Notes:
 #ifndef SLS_EVALUATOR_H_
 #define SLS_EVALUATOR_H_
 
-#include"model_evaluator.h"
+#include "model/model_evaluator.h"
 
-#include"sls_powers.h"
-#include"sls_tracker.h"
+#include "tactic/sls/sls_powers.h"
+#include "tactic/sls/sls_tracker.h"
 
 class sls_evaluator {
     ast_manager         & m_manager;

src/tactic/sls/sls_powers.h

@@ -20,7 +20,7 @@ Notes:
 #ifndef SLS_POWERS_H_
 #define SLS_POWERS_H_
 
-#include"mpz.h"
+#include "util/mpz.h"
 
 class powers : public u_map<mpz*> {
     unsynch_mpz_manager & m;

src/tactic/sls/sls_tactic.cpp

@@ -16,19 +16,19 @@ Author:
 Notes:
 
 --*/
-#include"nnf.h"
-#include"solve_eqs_tactic.h"
-#include"bv_size_reduction_tactic.h"
-#include"max_bv_sharing_tactic.h"
-#include"simplify_tactic.h"
-#include"propagate_values_tactic.h"
-#include"ctx_simplify_tactic.h"
-#include"elim_uncnstr_tactic.h"
-#include"nnf_tactic.h"
-#include"stopwatch.h"
-#include"sls_tactic.h"
+#include "ast/normal_forms/nnf.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/bv/bv_size_reduction_tactic.h"
+#include "tactic/bv/max_bv_sharing_tactic.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/core/ctx_simplify_tactic.h"
+#include "tactic/core/elim_uncnstr_tactic.h"
+#include "tactic/core/nnf_tactic.h"
+#include "util/stopwatch.h"
+#include "tactic/sls/sls_tactic.h"
 #include"sls_params.hpp"
-#include"sls_engine.h"
+#include "tactic/sls/sls_engine.h"
 
 class sls_tactic : public tactic {    
     ast_manager    & m;

src/tactic/sls/sls_tactic.h

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

src/tactic/sls/sls_tracker.h

@@ -21,13 +21,13 @@ Notes:
 #define SLS_TRACKER_H_
 
 #include<math.h>
-#include"for_each_expr.h"
-#include"ast_smt2_pp.h"
-#include"bv_decl_plugin.h"
-#include"model.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/bv_decl_plugin.h"
+#include "model/model.h"
 
 #include"sls_params.hpp"
-#include"sls_powers.h"
+#include "tactic/sls/sls_powers.h"
 
 class sls_tracker {
     ast_manager         & m_manager;