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

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

src/math/automata/automaton.cpp

@@ -18,6 +18,6 @@ Revision History:
 
 --*/
 
-#include "automaton.h"
+#include "math/automata/automaton.h"
 
 template class automaton<unsigned>;

src/math/automata/automaton.h

@@ -22,9 +22,9 @@ Revision History:
 #define AUTOMATON_H_
 
 
-#include "util.h"
-#include "vector.h"
-#include "uint_set.h"
+#include "util/util.h"
+#include "util/vector.h"
+#include "util/uint_set.h"
 
 template<class T>
 class default_value_manager {

src/math/automata/boolean_algebra.h

@@ -21,7 +21,7 @@ Revision History:
 #ifndef BOOLEAN_ALGEBRA_H_
 #define BOOLEAN_ALGEBRA_H_
 
-#include "util.h"
+#include "util/util.h"
 
 template<class T>
 class positive_boolean_algebra {

src/math/automata/symbolic_automata.h

@@ -22,8 +22,8 @@ Revision History:
 #define SYMBOLIC_AUTOMATA_H_
 
 
-#include "automaton.h"
-#include "boolean_algebra.h"
+#include "math/automata/automaton.h"
+#include "math/automata/boolean_algebra.h"
 
 
 template<class T, class M = default_value_manager<T> >

src/math/automata/symbolic_automata_def.h

@@ -22,8 +22,8 @@ Revision History:
 #define SYMBOLIC_AUTOMATA_DEF_H_
 
 
-#include "symbolic_automata.h"
-#include "hashtable.h"
+#include "math/automata/symbolic_automata.h"
+#include "util/hashtable.h"
 
 
 

src/math/euclid/euclidean_solver.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"euclidean_solver.h"
-#include"numeral_buffer.h"
-#include"heap.h"
+#include "math/euclid/euclidean_solver.h"
+#include "util/numeral_buffer.h"
+#include "util/heap.h"
 
 struct euclidean_solver::imp {
     typedef unsigned                             var; 

src/math/euclid/euclidean_solver.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef EUCLIDEAN_SOLVER_H_
 #define EUCLIDEAN_SOLVER_H_
 
-#include"mpq.h"
-#include"vector.h"
+#include "util/mpq.h"
+#include "util/vector.h"
 
 class euclidean_solver {
     struct imp;

src/math/grobner/grobner.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"grobner.h"
-#include"ast_pp.h"
-#include"ref_util.h"
+#include "math/grobner/grobner.h"
+#include "ast/ast_pp.h"
+#include "util/ref_util.h"
 
 // #define PROFILE_GB
 

src/math/grobner/grobner.h

@@ -19,12 +19,12 @@ Revision History:
 #ifndef GROBNER_H_
 #define GROBNER_H_
 
-#include"ast.h"
-#include"arith_decl_plugin.h"
-#include"heap.h"
-#include"obj_hashtable.h"
-#include"region.h"
-#include"dependency.h"
+#include "ast/ast.h"
+#include "ast/arith_decl_plugin.h"
+#include "util/heap.h"
+#include "util/obj_hashtable.h"
+#include "util/region.h"
+#include "util/dependency.h"
 
 
 struct grobner_stats {

src/math/hilbert/heap_trie.h

@@ -37,11 +37,11 @@ Notes:
 #ifndef HEAP_TRIE_H_
 #define HEAP_TRIE_H_
 
-#include "map.h"
-#include "vector.h"
-#include "buffer.h"
-#include "statistics.h"
-#include "small_object_allocator.h"
+#include "util/map.h"
+#include "util/vector.h"
+#include "util/buffer.h"
+#include "util/statistics.h"
+#include "util/small_object_allocator.h"
 
 
 template<typename Key, typename KeyLE, typename KeyHash, typename Value>

src/math/hilbert/hilbert_basis.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 
-#include "hilbert_basis.h"
-#include "heap.h"
-#include "map.h"
-#include "heap_trie.h"
-#include "stopwatch.h"
+#include "math/hilbert/hilbert_basis.h"
+#include "util/heap.h"
+#include "util/map.h"
+#include "math/hilbert/heap_trie.h"
+#include "util/stopwatch.h"
 
 
 typedef int_hashtable<int_hash, default_eq<int> > int_table;

src/math/hilbert/hilbert_basis.h

@@ -28,11 +28,11 @@ Revision History:
 #ifndef HILBERT_BASIS_H_
 #define HILBERT_BASIS_H_
 
-#include "rational.h"
-#include "lbool.h"
-#include "statistics.h"
-#include "checked_int64.h"
-#include "rlimit.h"
+#include "util/rational.h"
+#include "util/lbool.h"
+#include "util/statistics.h"
+#include "util/checked_int64.h"
+#include "util/rlimit.h"
 
 typedef vector<rational> rational_vector;
 

src/math/interval/interval.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef INTERVAL_H_
 #define INTERVAL_H_
 
-#include"mpq.h"
-#include"ext_numeral.h"
-#include"rlimit.h"
+#include "util/mpq.h"
+#include "util/ext_numeral.h"
+#include "util/rlimit.h"
 
 /**
    \brief Default configuration for interval manager.

src/math/interval/interval_def.h

@@ -19,12 +19,12 @@ Revision History:
 #ifndef INTERVAL_DEF_H_
 #define INTERVAL_DEF_H_
 
-#include"interval.h"
-#include"debug.h"
-#include"trace.h"
-#include"scoped_numeral.h"
-#include"cooperate.h"
-#include"common_msgs.h"
+#include "math/interval/interval.h"
+#include "util/debug.h"
+#include "util/trace.h"
+#include "util/scoped_numeral.h"
+#include "util/cooperate.h"
+#include "util/common_msgs.h"
 
 #define DEFAULT_PI_PRECISION 2
 

src/math/interval/interval_mpq.cpp

@@ -16,6 +16,6 @@ Author:
 Revision History:
 
 --*/
-#include"interval_def.h"
+#include "math/interval/interval_def.h"
 
 template class interval_manager<im_default_config>;

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]

src/math/realclosure/mpz_matrix.cpp

@@ -28,8 +28,8 @@ Author:
 Notes:
 
 --*/
-#include"mpz_matrix.h"
-#include"buffer.h"
+#include "math/realclosure/mpz_matrix.h"
+#include "util/buffer.h"
 
 mpz_matrix_manager::mpz_matrix_manager(unsynch_mpz_manager & nm, small_object_allocator & a):
     m_nm(nm),

src/math/realclosure/mpz_matrix.h

@@ -31,7 +31,7 @@ Notes:
 #ifndef MPZ_MATRIX_H_
 #define MPZ_MATRIX_H_
 
-#include"mpz.h"
+#include "util/mpz.h"
 
 /**
    \brief A mxn matrix. 

src/math/realclosure/realclosure.cpp

@@ -19,17 +19,17 @@ Author:
 Notes:
 
 --*/
-#include"realclosure.h"
+#include "math/realclosure/realclosure.h"
 #include"rcf_params.hpp"
-#include"array.h"
-#include"mpbq.h"
-#include"mpz_matrix.h"
-#include"interval_def.h"
-#include"obj_ref.h"
-#include"ref_vector.h"
-#include"ref_buffer.h"
-#include"cooperate.h"
-#include"common_msgs.h"
+#include "util/array.h"
+#include "util/mpbq.h"
+#include "math/realclosure/mpz_matrix.h"
+#include "math/interval/interval_def.h"
+#include "util/obj_ref.h"
+#include "util/ref_vector.h"
+#include "util/ref_buffer.h"
+#include "util/cooperate.h"
+#include "util/common_msgs.h"
 
 #ifndef REALCLOSURE_INI_BUFFER_SIZE
 #define REALCLOSURE_INI_BUFFER_SIZE 32

src/math/realclosure/realclosure.h

@@ -22,13 +22,13 @@ Notes:
 #ifndef REALCLOSURE_H_
 #define REALCLOSURE_H_
 
-#include"mpq.h"
-#include"params.h"
-#include"scoped_numeral.h"
-#include"scoped_numeral_vector.h"
-#include"interval.h"
-#include"z3_exception.h"
-#include"rlimit.h"
+#include "util/mpq.h"
+#include "util/params.h"
+#include "util/scoped_numeral.h"
+#include "util/scoped_numeral_vector.h"
+#include "math/interval/interval.h"
+#include "util/z3_exception.h"
+#include "util/rlimit.h"
 
 namespace realclosure {
     class num;

src/math/simplex/model_based_opt.h

@@ -21,9 +21,9 @@ Revision History:
 #ifndef __MODEL_BASED_OPT_H__
 #define __MODEL_BASED_OPT_H__
 
-#include "util.h"
-#include "rational.h"
-#include"inf_eps_rational.h"
+#include "util/util.h"
+#include "util/rational.h"
+#include "util/inf_eps_rational.h"
 
 namespace opt {
    

src/math/simplex/network_flow.h

@@ -28,9 +28,9 @@ Notes:
 #ifndef NETWORK_FLOW_H_
 #define NETWORK_FLOW_H_
 
-#include"inf_rational.h"
-#include"diff_logic.h"
-#include"spanning_tree.h"
+#include "util/inf_rational.h"
+#include "smt/diff_logic.h"
+#include "smt/spanning_tree.h"
 
 namespace smt {
 

src/math/simplex/network_flow_def.h

@@ -20,9 +20,9 @@ Notes:
 #ifndef NETWORK_FLOW_DEF_H_
 #define NETWORK_FLOW_DEF_H_
 
-#include"network_flow.h"
-#include"uint_set.h"
-#include"spanning_tree_def.h"
+#include "math/simplex/network_flow.h"
+#include "util/uint_set.h"
+#include "smt/spanning_tree_def.h"
 
 namespace smt {
 

src/math/simplex/simplex.cpp

@@ -17,9 +17,9 @@ Notes:
 
 --*/
 
-#include"simplex.h"
-#include"sparse_matrix_def.h"
-#include"simplex_def.h"
+#include "math/simplex/simplex.h"
+#include "math/simplex/sparse_matrix_def.h"
+#include "math/simplex/simplex_def.h"
 namespace simplex {
     template class simplex<mpz_ext>;
     template class simplex<mpq_ext>;

src/math/simplex/simplex.h

@@ -32,11 +32,11 @@ Notes:
 #ifndef SIMPLEX_H_
 #define SIMPLEX_H_
 
-#include "sparse_matrix.h"
-#include "mpq_inf.h"
-#include "heap.h"
-#include "lbool.h"
-#include "uint_set.h"
+#include "math/simplex/sparse_matrix.h"
+#include "util/mpq_inf.h"
+#include "util/heap.h"
+#include "util/lbool.h"
+#include "util/uint_set.h"
 
 namespace simplex {
 

src/math/simplex/sparse_matrix.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef SPARSE_MATRIX_H_
 #define SPARSE_MATRIX_H_
 
-#include "mpq_inf.h"
-#include "statistics.h"
+#include "util/mpq_inf.h"
+#include "util/statistics.h"
 
 namespace simplex {
 

src/math/simplex/sparse_matrix_def.h

@@ -21,8 +21,8 @@ Notes:
 #ifndef SPARSE_MATRIX_DEF_H_
 #define SPARSE_MATRIX_DEF_H_
 
-#include "sparse_matrix.h"
-#include "uint_set.h"
+#include "math/simplex/sparse_matrix.h"
+#include "util/uint_set.h"
 
 namespace simplex {
 

src/math/subpaving/subpaving.cpp

@@ -22,13 +22,13 @@ Author:
 Revision History:
 
 --*/
-#include"subpaving.h"
-#include"subpaving_types.h"
-#include"subpaving_mpq.h"
-#include"subpaving_mpf.h"
-#include"subpaving_hwf.h"
-#include"subpaving_mpff.h"
-#include"subpaving_mpfx.h"
+#include "math/subpaving/subpaving.h"
+#include "math/subpaving/subpaving_types.h"
+#include "math/subpaving/subpaving_mpq.h"
+#include "math/subpaving/subpaving_mpf.h"
+#include "math/subpaving/subpaving_hwf.h"
+#include "math/subpaving/subpaving_mpff.h"
+#include "math/subpaving/subpaving_mpfx.h"
 
 namespace subpaving {
 

src/math/subpaving/subpaving.h

@@ -25,10 +25,10 @@ Revision History:
 #ifndef SUBPAVING_H_
 #define SUBPAVING_H_
 
-#include"mpq.h"
-#include"subpaving_types.h"
-#include"params.h"
-#include"statistics.h"
+#include "util/mpq.h"
+#include "math/subpaving/subpaving_types.h"
+#include "util/params.h"
+#include "util/statistics.h"
 
 template<typename fmanager> class f2n;
 class mpf_manager;

src/math/subpaving/subpaving_hwf.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"subpaving_hwf.h"
-#include"subpaving_t_def.h"
+#include "math/subpaving/subpaving_hwf.h"
+#include "math/subpaving/subpaving_t_def.h"
 
 // force template instantiation
 template class subpaving::context_t<subpaving::config_hwf>;

src/math/subpaving/subpaving_hwf.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef SUBPAVING_HWF_H_
 #define SUBPAVING_HWF_H_
 
-#include"subpaving_t.h"
-#include"f2n.h"
-#include"hwf.h"
+#include "math/subpaving/subpaving_t.h"
+#include "util/f2n.h"
+#include "util/hwf.h"
 
 namespace subpaving {
 

src/math/subpaving/subpaving_mpf.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"subpaving_mpf.h"
-#include"subpaving_t_def.h"
+#include "math/subpaving/subpaving_mpf.h"
+#include "math/subpaving/subpaving_t_def.h"
 
 // force template instantiation
 template class subpaving::context_t<subpaving::config_mpf>;

src/math/subpaving/subpaving_mpf.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef SUBPAVING_MPF_H_
 #define SUBPAVING_MPF_H_
 
-#include"subpaving_t.h"
-#include"mpf.h"
-#include"f2n.h"
+#include "math/subpaving/subpaving_t.h"
+#include "util/mpf.h"
+#include "util/f2n.h"
 
 namespace subpaving {
 

src/math/subpaving/subpaving_mpff.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"subpaving_mpff.h"
-#include"subpaving_t_def.h"
+#include "math/subpaving/subpaving_mpff.h"
+#include "math/subpaving/subpaving_t_def.h"
 
 // force template instantiation
 template class subpaving::context_t<subpaving::config_mpff>;

src/math/subpaving/subpaving_mpff.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef SUBPAVING_MPFF_H_
 #define SUBPAVING_MPFF_H_
 
-#include"subpaving_t.h"
-#include"mpff.h"
+#include "math/subpaving/subpaving_t.h"
+#include "util/mpff.h"
 
 namespace subpaving {
 

src/math/subpaving/subpaving_mpfx.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"subpaving_mpfx.h"
-#include"subpaving_t_def.h"
+#include "math/subpaving/subpaving_mpfx.h"
+#include "math/subpaving/subpaving_t_def.h"
 
 // force template instantiation
 template class subpaving::context_t<subpaving::config_mpfx>;

src/math/subpaving/subpaving_mpfx.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef SUBPAVING_MPFX_H_
 #define SUBPAVING_MPFX_H_
 
-#include"subpaving_t.h"
-#include"mpfx.h"
+#include "math/subpaving/subpaving_t.h"
+#include "util/mpfx.h"
 
 namespace subpaving {
 

src/math/subpaving/subpaving_mpq.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"subpaving_mpq.h"
-#include"subpaving_t_def.h"
+#include "math/subpaving/subpaving_mpq.h"
+#include "math/subpaving/subpaving_t_def.h"
 
 // force template instantiation
 template class subpaving::context_t<subpaving::config_mpq>;

src/math/subpaving/subpaving_mpq.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef SUBPAVING_MPQ_H_
 #define SUBPAVING_MPQ_H_
 
-#include"subpaving_t.h"
-#include"mpq.h"
+#include "math/subpaving/subpaving_t.h"
+#include "util/mpq.h"
 
 namespace subpaving {
 

src/math/subpaving/subpaving_t.h

@@ -20,18 +20,18 @@ Revision History:
 #define SUBPAVING_T_H_
 
 #include<iostream>
-#include"tptr.h"
-#include"small_object_allocator.h"
-#include"chashtable.h"
-#include"parray.h"
-#include"interval.h"
-#include"scoped_numeral_vector.h"
-#include"subpaving_types.h"
-#include"params.h"
-#include"statistics.h"
-#include"lbool.h"
-#include"id_gen.h"
-#include"rlimit.h"
+#include "util/tptr.h"
+#include "util/small_object_allocator.h"
+#include "util/chashtable.h"
+#include "util/parray.h"
+#include "math/interval/interval.h"
+#include "util/scoped_numeral_vector.h"
+#include "math/subpaving/subpaving_types.h"
+#include "util/params.h"
+#include "util/statistics.h"
+#include "util/lbool.h"
+#include "util/id_gen.h"
+#include "util/rlimit.h"
 #ifdef _MSC_VER
 #pragma warning(disable : 4200)
 #pragma warning(disable : 4355)

src/math/subpaving/subpaving_t_def.h

@@ -16,12 +16,12 @@ Author:
 Revision History:
 
 --*/
-#include"subpaving_t.h"
-#include"interval_def.h"
-#include"buffer.h"
-#include"cooperate.h"
-#include"z3_exception.h"
-#include"common_msgs.h"
+#include "math/subpaving/subpaving_t.h"
+#include "math/interval/interval_def.h"
+#include "util/buffer.h"
+#include "util/cooperate.h"
+#include "util/z3_exception.h"
+#include "util/common_msgs.h"
 
 namespace subpaving {
 

src/math/subpaving/tactic/expr2subpaving.cpp

@@ -17,14 +17,14 @@ Author:
 Notes:
 
 --*/
-#include"expr2subpaving.h"
-#include"expr2var.h"
-#include"ref_util.h"
-#include"z3_exception.h"
-#include"cooperate.h"
-#include"arith_decl_plugin.h"
-#include"scoped_numeral_buffer.h"
-#include"common_msgs.h"
+#include "math/subpaving/tactic/expr2subpaving.h"
+#include "ast/expr2var.h"
+#include "util/ref_util.h"
+#include "util/z3_exception.h"
+#include "util/cooperate.h"
+#include "ast/arith_decl_plugin.h"
+#include "util/scoped_numeral_buffer.h"
+#include "util/common_msgs.h"
 
 struct expr2subpaving::imp {
     struct frame {

src/math/subpaving/tactic/expr2subpaving.h

@@ -20,8 +20,8 @@ Notes:
 #ifndef EXPR2SUBPAVING_H_
 #define EXPR2SUBPAVING_H_
 
-#include"ast.h"
-#include"subpaving.h"
+#include "ast/ast.h"
+#include "math/subpaving/subpaving.h"
 
 class expr2var;
 

src/math/subpaving/tactic/subpaving_tactic.cpp

@@ -16,16 +16,16 @@ Author:
 Revision History:
 
 --*/
-#include"tactical.h"
-#include"simplify_tactic.h"
-#include"expr2subpaving.h"
-#include"expr2var.h"
-#include"arith_decl_plugin.h"
-#include"ast_smt2_pp.h"
-#include"hwf.h"
-#include"mpff.h"
-#include"mpfx.h"
-#include"f2n.h"
+#include "tactic/tactical.h"
+#include "tactic/core/simplify_tactic.h"
+#include "math/subpaving/tactic/expr2subpaving.h"
+#include "ast/expr2var.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_smt2_pp.h"
+#include "util/hwf.h"
+#include "util/mpff.h"
+#include "util/mpfx.h"
+#include "util/f2n.h"
 
 class subpaving_tactic : public tactic {
 

src/math/subpaving/tactic/subpaving_tactic.h

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