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

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

src/math/polynomial/algebraic_numbers.cpp

@@ -16,17 +16,17 @@ Author:
 Notes:
 
 --*/
-#include"algebraic_numbers.h"
-#include"upolynomial.h"
-#include"mpbq.h"
-#include"basic_interval.h"
-#include"cooperate.h"
-#include"sexpr2upolynomial.h"
-#include"scoped_ptr_vector.h"
-#include"mpbqi.h"
-#include"timeit.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "math/polynomial/upolynomial.h"
+#include "util/mpbq.h"
+#include "util/basic_interval.h"
+#include "util/cooperate.h"
+#include "math/polynomial/sexpr2upolynomial.h"
+#include "util/scoped_ptr_vector.h"
+#include "util/mpbqi.h"
+#include "util/timeit.h"
 #include"algebraic_params.hpp"
-#include"common_msgs.h"
+#include "util/common_msgs.h"
 
 namespace algebraic_numbers {
 

src/math/polynomial/algebraic_numbers.h

@@ -19,16 +19,16 @@ Notes:
 #ifndef ALGEBRAIC_NUMBERS_H_
 #define ALGEBRAIC_NUMBERS_H_
 
-#include"rational.h"
-#include"mpq.h"
-#include"polynomial.h"
-#include"z3_exception.h"
-#include"scoped_numeral.h"
-#include"scoped_numeral_vector.h"
-#include"tptr.h"
-#include"statistics.h"
-#include"params.h"
-#include"rlimit.h"
+#include "util/rational.h"
+#include "util/mpq.h"
+#include "math/polynomial/polynomial.h"
+#include "util/z3_exception.h"
+#include "util/scoped_numeral.h"
+#include "util/scoped_numeral_vector.h"
+#include "util/tptr.h"
+#include "util/statistics.h"
+#include "util/params.h"
+#include "util/rlimit.h"
 
 class small_object_allocator;
 class mpbq_manager;

src/math/polynomial/polynomial.cpp

@@ -16,24 +16,24 @@ Author:
 Notes:
 
 --*/
-#include"polynomial.h"
-#include"vector.h"
-#include"chashtable.h"
-#include"small_object_allocator.h"
-#include"id_gen.h"
-#include"buffer.h"
-#include"scoped_ptr_vector.h"
-#include"cooperate.h"
-#include"upolynomial_factorization.h"
-#include"polynomial_primes.h"
-#include"permutation.h"
-#include"algebraic_numbers.h"
-#include"mpzzp.h"
-#include"timeit.h"
-#include"linear_eq_solver.h"
-#include"scoped_numeral_buffer.h"
-#include"ref_buffer.h"
-#include"common_msgs.h"
+#include "math/polynomial/polynomial.h"
+#include "util/vector.h"
+#include "util/chashtable.h"
+#include "util/small_object_allocator.h"
+#include "util/id_gen.h"
+#include "util/buffer.h"
+#include "util/scoped_ptr_vector.h"
+#include "util/cooperate.h"
+#include "math/polynomial/upolynomial_factorization.h"
+#include "math/polynomial/polynomial_primes.h"
+#include "util/permutation.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "util/mpzzp.h"
+#include "util/timeit.h"
+#include "math/polynomial/linear_eq_solver.h"
+#include "util/scoped_numeral_buffer.h"
+#include "util/ref_buffer.h"
+#include "util/common_msgs.h"
 
 namespace polynomial {
 

src/math/polynomial/polynomial.h

@@ -19,16 +19,16 @@ Notes:
 #ifndef POLYNOMIAL_H_
 #define POLYNOMIAL_H_
 
-#include"mpz.h"
-#include"rational.h"
-#include"obj_ref.h"
-#include"ref_vector.h"
-#include"z3_exception.h"
-#include"scoped_numeral.h"
-#include"scoped_numeral_vector.h"
-#include"params.h"
-#include"mpbqi.h"
-#include"rlimit.h"
+#include "util/mpz.h"
+#include "util/rational.h"
+#include "util/obj_ref.h"
+#include "util/ref_vector.h"
+#include "util/z3_exception.h"
+#include "util/scoped_numeral.h"
+#include "util/scoped_numeral_vector.h"
+#include "util/params.h"
+#include "util/mpbqi.h"
+#include "util/rlimit.h"
 
 class small_object_allocator;
 

src/math/polynomial/polynomial_cache.cpp

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#include"polynomial_cache.h"
-#include"chashtable.h"
+#include "math/polynomial/polynomial_cache.h"
+#include "util/chashtable.h"
 
 namespace polynomial {
 

src/math/polynomial/polynomial_cache.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef POLYNOMIAL_CACHE_H_
 #define POLYNOMIAL_CACHE_H_
 
-#include"polynomial.h"
+#include "math/polynomial/polynomial.h"
 
 namespace polynomial {
 

src/math/polynomial/polynomial_var2value.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef POLYNOMIAL_VAR2VALUE_H_
 #define POLYNOMIAL_VAR2VALUE_H_
 
-#include"polynomial.h"
-#include"scoped_numeral_vector.h"
+#include "math/polynomial/polynomial.h"
+#include "util/scoped_numeral_vector.h"
 
 namespace polynomial {
 

src/math/polynomial/rpolynomial.cpp

@@ -16,9 +16,9 @@ Author:
 Notes:
 
 --*/
-#include"rpolynomial.h"
-#include"tptr.h"
-#include"buffer.h"
+#include "math/polynomial/rpolynomial.h"
+#include "util/tptr.h"
+#include "util/buffer.h"
 
 namespace rpolynomial {
 

src/math/polynomial/rpolynomial.h

@@ -19,12 +19,12 @@ Notes:
 #ifndef RPOLYNOMIAL_H_
 #define RPOLYNOMIAL_H_
 
-#include"mpz.h"
-#include"rational.h"
-#include"obj_ref.h"
-#include"ref_vector.h"
-#include"z3_exception.h"
-#include"polynomial.h"
+#include "util/mpz.h"
+#include "util/rational.h"
+#include "util/obj_ref.h"
+#include "util/ref_vector.h"
+#include "util/z3_exception.h"
+#include "math/polynomial/polynomial.h"
 
 namespace rpolynomial {
     

src/math/polynomial/sexpr2upolynomial.cpp

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#include"sexpr2upolynomial.h"
-#include"sexpr.h"
+#include "math/polynomial/sexpr2upolynomial.h"
+#include "util/sexpr.h"
 
 sexpr2upolynomial_exception::sexpr2upolynomial_exception(char const * msg, sexpr const * s):
     cmd_exception(msg, s->get_line(), s->get_pos()) {

src/math/polynomial/sexpr2upolynomial.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef SEXPR2UPOLYNOMIAL_H_
 #define SEXPR2UPOLYNOMIAL_H_
 
-#include"upolynomial.h"
-#include"cmd_context_types.h"
+#include "math/polynomial/upolynomial.h"
+#include "util/cmd_context_types.h"
 class sexpr;
 
 class sexpr2upolynomial_exception : public cmd_exception {

src/math/polynomial/upolynomial.cpp

@@ -21,12 +21,12 @@ Author:
 Notes:
 
 --*/
-#include"upolynomial.h"
-#include"upolynomial_factorization.h"
-#include"polynomial_primes.h"
-#include"buffer.h"
-#include"cooperate.h"
-#include"common_msgs.h"
+#include "math/polynomial/upolynomial.h"
+#include "math/polynomial/upolynomial_factorization.h"
+#include "math/polynomial/polynomial_primes.h"
+#include "util/buffer.h"
+#include "util/cooperate.h"
+#include "util/common_msgs.h"
 
 namespace upolynomial {
 

src/math/polynomial/upolynomial.h

@@ -24,12 +24,12 @@ Notes:
 #ifndef UPOLYNOMIAL_H_
 #define UPOLYNOMIAL_H_
 
-#include"mpzzp.h"
-#include"rational.h"
-#include"polynomial.h"
-#include"z3_exception.h"
-#include"mpbq.h"
-#include"rlimit.h"
+#include "util/mpzzp.h"
+#include "util/rational.h"
+#include "math/polynomial/polynomial.h"
+#include "util/z3_exception.h"
+#include "util/mpbq.h"
+#include "util/rlimit.h"
 #define FACTOR_VERBOSE_LVL 1000
 
 namespace upolynomial {

src/math/polynomial/upolynomial_factorization.cpp

@@ -22,10 +22,10 @@ Notes:
    [3] Henri Cohen. A Course in Computational Algebraic Number Theory. Springer Verlag, 1993.
 
 --*/
-#include"trace.h"
-#include"util.h"
-#include"upolynomial_factorization_int.h"
-#include"prime_generator.h"
+#include "util/trace.h"
+#include "util/util.h"
+#include "math/polynomial/upolynomial_factorization_int.h"
+#include "util/prime_generator.h"
 
 using namespace std;
 

src/math/polynomial/upolynomial_factorization.h

@@ -25,10 +25,10 @@ Notes:
 #ifndef UPOLYNOMIAL_FACTORIZATION_H_
 #define UPOLYNOMIAL_FACTORIZATION_H_
 
-#include"upolynomial.h"
-#include"polynomial.h"
-#include"bit_vector.h"
-#include"z3_exception.h"
+#include "math/polynomial/upolynomial.h"
+#include "math/polynomial/polynomial.h"
+#include "util/bit_vector.h"
+#include "util/z3_exception.h"
 
 namespace upolynomial {
     typedef manager::scoped_numeral scoped_numeral;

src/math/polynomial/upolynomial_factorization_int.h

@@ -26,7 +26,7 @@ Notes:
 #ifndef UPOLYNOMIAL_FACTORIZATION_INT_H_
 #define UPOLYNOMIAL_FACTORIZATION_INT_H_
 
-#include"upolynomial_factorization.h"
+#include "math/polynomial/upolynomial_factorization.h"
 
 namespace upolynomial {
     // copy p from some manager to zp_p in Z_p[x]