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

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

src/nlsat/nlsat_assignment.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef NLSAT_ASSIGNMENT_H_
 #define NLSAT_ASSIGNMENT_H_
 
-#include"nlsat_types.h"
-#include"algebraic_numbers.h"
+#include "nlsat/nlsat_types.h"
+#include "math/polynomial/algebraic_numbers.h"
 
 namespace nlsat {
 

src/nlsat/nlsat_clause.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"nlsat_clause.h"
+#include "nlsat/nlsat_clause.h"
 
 namespace nlsat {
 

src/nlsat/nlsat_clause.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef NLSAT_CLAUSE_H_
 #define NLSAT_CLAUSE_H_
 
-#include"nlsat_types.h"
-#include"vector.h"
+#include "nlsat/nlsat_types.h"
+#include "util/vector.h"
 
 namespace nlsat {
 

src/nlsat/nlsat_evaluator.cpp

@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#include"nlsat_evaluator.h"
-#include"nlsat_solver.h"
+#include "nlsat/nlsat_evaluator.h"
+#include "nlsat/nlsat_solver.h"
 
 namespace nlsat {
 

src/nlsat/nlsat_evaluator.h

@@ -20,9 +20,9 @@ Revision History:
 #ifndef NLSAT_EVALUATOR_H_
 #define NLSAT_EVALUATOR_H_
 
-#include"nlsat_types.h"
-#include"nlsat_assignment.h"
-#include"nlsat_interval_set.h"
+#include "nlsat/nlsat_types.h"
+#include "nlsat/nlsat_assignment.h"
+#include "nlsat/nlsat_interval_set.h"
 
 namespace nlsat {
 

src/nlsat/nlsat_explain.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include"nlsat_explain.h"
-#include"nlsat_assignment.h"
-#include"nlsat_evaluator.h"
-#include"algebraic_numbers.h"
-#include"ref_buffer.h"
+#include "nlsat/nlsat_explain.h"
+#include "nlsat/nlsat_assignment.h"
+#include "nlsat/nlsat_evaluator.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "util/ref_buffer.h"
 
 namespace nlsat {
 

src/nlsat/nlsat_explain.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef NLSAT_EXPLAIN_H_
 #define NLSAT_EXPLAIN_H_
 
-#include"nlsat_solver.h"
-#include"nlsat_scoped_literal_vector.h"
-#include"polynomial_cache.h"
-#include"algebraic_numbers.h"
+#include "nlsat/nlsat_solver.h"
+#include "nlsat/nlsat_scoped_literal_vector.h"
+#include "math/polynomial/polynomial_cache.h"
+#include "math/polynomial/algebraic_numbers.h"
 
 namespace nlsat {
     class evaluator;

src/nlsat/nlsat_interval_set.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"nlsat_interval_set.h"
-#include"algebraic_numbers.h"
-#include"buffer.h"
+#include "nlsat/nlsat_interval_set.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "util/buffer.h"
 
 namespace nlsat {
 

src/nlsat/nlsat_interval_set.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef NLSAT_INTERVAL_SET_H_
 #define NLSAT_INTERVAL_SET_H_
 
-#include"nlsat_types.h"
+#include "nlsat/nlsat_types.h"
 
 namespace nlsat {
 

src/nlsat/nlsat_justification.h

@@ -20,8 +20,8 @@ Revision History:
 #ifndef NLSAT_JUSTIFICATION_H_
 #define NLSAT_JUSTIFICATION_H_
 
-#include"nlsat_types.h"
-#include"tptr.h"
+#include "nlsat/nlsat_types.h"
+#include "util/tptr.h"
 
 namespace nlsat {
 

src/nlsat/nlsat_scoped_literal_vector.h

@@ -20,7 +20,7 @@ Revision History:
 #ifndef NLSAT_SCOPED_LITERAL_VECTOR_H_
 #define NLSAT_SCOPED_LITERAL_VECTOR_H_
 
-#include"nlsat_solver.h"
+#include "nlsat/nlsat_solver.h"
 
 namespace nlsat {
 

src/nlsat/nlsat_solver.cpp

@@ -18,19 +18,19 @@ Author:
 Revision History:
 
 --*/
-#include"nlsat_solver.h"
-#include"nlsat_clause.h"
-#include"nlsat_assignment.h"
-#include"nlsat_justification.h"
-#include"nlsat_evaluator.h"
-#include"nlsat_explain.h"
-#include"algebraic_numbers.h"
-#include"z3_exception.h"
-#include"chashtable.h"
-#include"id_gen.h"
-#include"dependency.h"
-#include"polynomial_cache.h"
-#include"permutation.h"
+#include "nlsat/nlsat_solver.h"
+#include "nlsat/nlsat_clause.h"
+#include "nlsat/nlsat_assignment.h"
+#include "nlsat/nlsat_justification.h"
+#include "nlsat/nlsat_evaluator.h"
+#include "nlsat/nlsat_explain.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "util/z3_exception.h"
+#include "util/chashtable.h"
+#include "util/id_gen.h"
+#include "util/dependency.h"
+#include "math/polynomial/polynomial_cache.h"
+#include "util/permutation.h"
 #include"nlsat_params.hpp"
 
 #define NLSAT_EXTRA_VERBOSE

src/nlsat/nlsat_solver.h

@@ -21,10 +21,10 @@ Revision History:
 #ifndef NLSAT_SOLVER_H_
 #define NLSAT_SOLVER_H_
 
-#include"nlsat_types.h"
-#include"params.h"
-#include"statistics.h"
-#include"rlimit.h"
+#include "nlsat/nlsat_types.h"
+#include "util/params.h"
+#include "util/statistics.h"
+#include "util/rlimit.h"
 
 namespace nlsat {
 

src/nlsat/nlsat_types.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"nlsat_types.h"
-#include"debug.h"
-#include"hash.h"
-#include"polynomial.h"
+#include "nlsat/nlsat_types.h"
+#include "util/debug.h"
+#include "util/hash.h"
+#include "math/polynomial/polynomial.h"
  
 namespace nlsat {
 

src/nlsat/nlsat_types.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef NLSAT_TYPES_H_
 #define NLSAT_TYPES_H_
 
-#include"polynomial.h"
-#include"buffer.h"
-#include"sat_types.h"
-#include"z3_exception.h"
+#include "math/polynomial/polynomial.h"
+#include "util/buffer.h"
+#include "sat/sat_types.h"
+#include "util/z3_exception.h"
 
 namespace algebraic_numbers {
     class anum;

src/nlsat/tactic/goal2nlsat.cpp

@@ -21,17 +21,17 @@ Author:
 Notes:
 
 --*/
-#include"goal2nlsat.h"
-#include"goal.h"
-#include"goal_util.h"
-#include"nlsat_solver.h"
-#include"expr2polynomial.h"
-#include"expr2var.h"
-#include"arith_decl_plugin.h"
-#include"tactic.h"
-#include"ast_pp.h"
-#include"polynomial.h"
-#include"algebraic_numbers.h"
+#include "nlsat/tactic/goal2nlsat.h"
+#include "tactic/goal.h"
+#include "tactic/goal_util.h"
+#include "nlsat/nlsat_solver.h"
+#include "ast/expr2polynomial.h"
+#include "ast/expr2var.h"
+#include "ast/arith_decl_plugin.h"
+#include "tactic/tactic.h"
+#include "ast/ast_pp.h"
+#include "math/polynomial/polynomial.h"
+#include "math/polynomial/algebraic_numbers.h"
 
 struct goal2nlsat::imp {
     struct nlsat_expr2polynomial : public expr2polynomial {

src/nlsat/tactic/goal2nlsat.h

@@ -24,8 +24,8 @@ Notes:
 #ifndef GOAL2NLSAT_H_
 #define GOAL2NLSAT_H_
 
-#include"nlsat_types.h"
-#include"model_converter.h"
+#include "nlsat/nlsat_types.h"
+#include "tactic/model_converter.h"
 
 class goal;
 class expr2var;

src/nlsat/tactic/nlsat_tactic.cpp

@@ -16,16 +16,16 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"goal2nlsat.h"
-#include"nlsat_solver.h"
-#include"model.h"
-#include"expr2var.h"
-#include"arith_decl_plugin.h"
-#include"ast_smt2_pp.h"
-#include"z3_exception.h"
-#include"algebraic_numbers.h"
-#include"ast_pp.h"
+#include "tactic/tactical.h"
+#include "nlsat/tactic/goal2nlsat.h"
+#include "nlsat/nlsat_solver.h"
+#include "model/model.h"
+#include "ast/expr2var.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_smt2_pp.h"
+#include "util/z3_exception.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "ast/ast_pp.h"
 
 class nlsat_tactic : public tactic {
     struct expr_display_var_proc : public nlsat::display_var_proc {

src/nlsat/tactic/nlsat_tactic.h

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

src/nlsat/tactic/qfnra_nlsat_tactic.cpp

@@ -16,18 +16,18 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
+#include "tactic/tactical.h"
 
-#include"tseitin_cnf_tactic.h"
-#include"degree_shift_tactic.h"
-#include"purify_arith_tactic.h"
-#include"nlsat_tactic.h"
-#include"factor_tactic.h"
-#include"simplify_tactic.h"
-#include"elim_uncnstr_tactic.h"
-#include"propagate_values_tactic.h"
-#include"solve_eqs_tactic.h"
-#include"elim_term_ite_tactic.h"
+#include "tactic/core/tseitin_cnf_tactic.h"
+#include "tactic/arith/degree_shift_tactic.h"
+#include "tactic/arith/purify_arith_tactic.h"
+#include "nlsat/tactic/nlsat_tactic.h"
+#include "tactic/arith/factor_tactic.h"
+#include "tactic/core/simplify_tactic.h"
+#include "tactic/core/elim_uncnstr_tactic.h"
+#include "tactic/core/propagate_values_tactic.h"
+#include "tactic/core/solve_eqs_tactic.h"
+#include "tactic/core/elim_term_ite_tactic.h"
 
 tactic * mk_qfnra_nlsat_tactic(ast_manager & m, params_ref const & p) {
     params_ref main_p = p;

src/nlsat/tactic/qfnra_nlsat_tactic.h

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