3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 21:38:44 +00:00

more includes

This commit is contained in:
Arie Gurfinkel 2017-07-31 17:57:21 -04:00
parent 66108085fa
commit ecd85b314c
14 changed files with 152 additions and 146 deletions

View file

@ -16,13 +16,13 @@ Author:
Notes: Notes:
--*/ --*/
#include"spacer_itp_solver.h" #include"muz/spacer/spacer_itp_solver.h"
#include"ast.h" #include"ast/ast.h"
#include"spacer_util.h" #include"muz/spacer/spacer_util.h"
#include"spacer_farkas_learner.h" #include"muz/spacer/spacer_farkas_learner.h"
#include"expr_replacer.h" #include"ast/rewriter/expr_replacer.h"
#include "spacer_unsat_core_learner.h" #include"muz/spacer/spacer_unsat_core_learner.h"
#include "spacer_unsat_core_plugin.h" #include"muz/spacer/spacer_unsat_core_plugin.h"
namespace spacer { namespace spacer {
void itp_solver::push () void itp_solver::push ()

View file

@ -19,9 +19,9 @@ Notes:
#ifndef SPACER_ITP_SOLVER_H_ #ifndef SPACER_ITP_SOLVER_H_
#define SPACER_ITP_SOLVER_H_ #define SPACER_ITP_SOLVER_H_
#include "solver.h" #include"solver/solver.h"
#include "expr_substitution.h" #include"ast/expr_substitution.h"
#include"stopwatch.h" #include"util/stopwatch.h"
namespace spacer { namespace spacer {
class itp_solver : public solver { class itp_solver : public solver {
private: private:

View file

@ -3,38 +3,38 @@
Legacy implementations of frames. To be removed. Legacy implementations of frames. To be removed.
*/ */
#include "spacer_context.h"
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
#include "dl_util.h" #include "muz/spacer/spacer_context.h"
#include "rewriter.h" #include "muz/base/dl_util.h"
#include "rewriter_def.h" #include "ast/rewriter/rewriter.h"
#include "var_subst.h" #include "ast/rewriter/rewriter_def.h"
#include "util.h" #include "ast/rewriter/var_subst.h"
#include "spacer_prop_solver.h" #include "util/util.h"
#include "spacer_context.h" #include "muz/spacer/spacer_prop_solver.h"
#include "spacer_generalizers.h" #include "muz/spacer/spacer_context.h"
#include "for_each_expr.h" #include "muz/spacer/spacer_generalizers.h"
#include "dl_rule_set.h" #include "ast/for_each_expr.h"
#include "unit_subsumption_tactic.h" #include "muz/base/dl_rule_set.h"
#include "model_smt2_pp.h" #include "smt/tactic/unit_subsumption_tactic.h"
#include "model/model_smt2_pp.h"
#include "dl_mk_rule_inliner.h" #include "dl_mk_rule_inliner.h"
#include "ast_smt2_pp.h" #include "ast/ast_smt2_pp.h"
#include "ast_ll_pp.h" #include "ast/ast_ll_pp.h"
#include "ast_util.h" #include "ast/ast_util.h"
#include "proof_checker.h" #include "ast/proof_checker/proof_checker.h"
#include "smt_value_sort.h" #include "smt/smt_value_sort.h"
#include "proof_utils.h" #include "muz/base/proof_utils.h"
#include "scoped_proof.h" #include "ast/scoped_proof.h"
#include "spacer_qe_project.h" #include "muz/spacer/spacer_qe_project.h"
#include "blast_term_ite_tactic.h" #include "tactic/core/blast_term_ite_tactic.h"
#include "timeit.h" #include "util/timeit.h"
#include "luby.h" #include "util/luby.h"
#include "expr_safe_replace.h" #include "ast/rewriter/expr_safe_replace.h"
#include "expr_abstract.h" #include "ast/expr_abstract.h"
#include "obj_equiv_class.h" #include "muz/spacer/obj_equiv_class.h"
namespace spacer { namespace spacer {

View file

@ -17,35 +17,36 @@ Notes:
--*/ --*/
#include <sstream> #include <sstream>
#include "arith_simplifier_plugin.h"
#include "array_decl_plugin.h"
#include "ast_pp.h"
#include "basic_simplifier_plugin.h"
#include "bv_simplifier_plugin.h"
#include "bool_rewriter.h"
#include "dl_util.h"
#include "for_each_expr.h"
#include "smt_params.h"
#include "model.h"
#include "ref_vector.h"
#include "rewriter.h"
#include "rewriter_def.h"
#include "util.h"
#include "spacer_manager.h"
#include "spacer_util.h"
#include "arith_decl_plugin.h"
#include "expr_replacer.h"
#include "model_smt2_pp.h"
#include "scoped_proof.h"
#include "qe_lite.h"
#include "spacer_qe_project.h"
#include "model_pp.h"
#include "expr_safe_replace.h"
#include "datatype_decl_plugin.h" #include "ast/array_decl_plugin.h"
#include "bv_decl_plugin.h" #include "ast/ast_pp.h"
#include "ast/simplifier/arith_simplifier_plugin.h"
#include "ast/simplifier/basic_simplifier_plugin.h"
#include "ast/simplifier/bv_simplifier_plugin.h"
#include "ast/rewriter/bool_rewriter.h"
#include "muz/base/dl_util.h"
#include "ast/for_each_expr.h"
#include "smt/params/smt_params.h"
#include "model/model.h"
#include "util/ref_vector.h"
#include "ast/rewriter/rewriter.h"
#include "ast/rewriter/rewriter_def.h"
#include "util/util.h"
#include "muz/spacer/spacer_manager.h"
#include "muz/spacer/spacer_util.h"
#include "ast/arith_decl_plugin.h"
#include "ast/rewriter/expr_replacer.h"
#include "model/model_smt2_pp.h"
#include "ast/scoped_proof.h"
#include "qe/qe_lite.h"
#include "muz/spacer/spacer_qe_project.h"
#include "model/model_pp.h"
#include "ast/rewriter/expr_safe_replace.h"
#include "spacer_legacy_mev.h" #include "ast/datatype_decl_plugin.h"
#include "ast/bv_decl_plugin.h"
#include "muz/spacer/spacer_legacy_mev.h"
namespace spacer { namespace spacer {
void qe_project(ast_manager& m, app_ref_vector& vars, expr_ref& fml, model_ref& M, expr_map& map) void qe_project(ast_manager& m, app_ref_vector& vars, expr_ref& fml, model_ref& M, expr_map& map)

View file

@ -5,34 +5,34 @@ Copyright (c) 2017 Arie Gurfinkel
*/ */
#include <sstream> #include <sstream>
#include "arith_simplifier_plugin.h" #include "ast/simplifier/arith_simplifier_plugin.h"
#include "array_decl_plugin.h" #include "ast/array_decl_plugin.h"
#include "ast_pp.h" #include "ast/ast_pp.h"
#include "basic_simplifier_plugin.h" #include "ast/simplifier/basic_simplifier_plugin.h"
#include "bv_simplifier_plugin.h" #include "ast/simplifier/bv_simplifier_plugin.h"
#include "bool_rewriter.h" #include "ast/rewriter/bool_rewriter.h"
#include "dl_util.h" #include "muz/base/dl_util.h"
#include "for_each_expr.h" #include "ast/for_each_expr.h"
#include "smt_params.h" #include "smt/params/smt_params.h"
#include "model.h" #include "model/model.h"
#include "ref_vector.h" #include "util/ref_vector.h"
#include "rewriter.h" #include "ast/rewriter/rewriter.h"
#include "rewriter_def.h" #include "ast/rewriter/rewriter_def.h"
#include "util.h" #include "util/util.h"
#include "spacer_manager.h" #include "muz/spacer/spacer_manager.h"
#include "spacer_legacy_mev.h" #include "muz/spacer/spacer_legacy_mev.h"
#include "spacer_util.h" #include "muz/spacer/spacer_util.h"
#include "arith_decl_plugin.h" #include "arith_decl_plugin.h"
#include "expr_replacer.h" #include "ast/rewriter/expr_replacer.h"
#include "model_smt2_pp.h" #include "model/model_smt2_pp.h"
#include "scoped_proof.h" #include "ast/scoped_proof.h"
#include "qe_lite.h" #include "qe/qe_lite.h"
#include "spacer_qe_project.h" #include "muz/spacer/spacer_qe_project.h"
#include "model_pp.h" #include "model/model_pp.h"
#include "expr_safe_replace.h" #include "ast/rewriter/expr_safe_replace.h"
#include "datatype_decl_plugin.h" #include "ast/datatype_decl_plugin.h"
#include "bv_decl_plugin.h" #include "ast/bv_decl_plugin.h"
namespace old { namespace old {

View file

@ -6,16 +6,16 @@ Copyright (c) 2017 Arie Gurfinkel
#ifndef OLD_MEV_H #ifndef OLD_MEV_H
#define OLD_MEV_H #define OLD_MEV_H
#include "ast.h" #include "ast/ast.h"
#include "ast_pp.h" #include "ast/ast_pp.h"
#include "obj_hashtable.h" #include "util/obj_hashtable.h"
#include "ref_vector.h" #include "util/ref_vector.h"
#include "simplifier.h" #include "ast/simplifier/simplifier.h"
#include "trace.h" #include "util/trace.h"
#include "vector.h" #include "util/vector.h"
#include "arith_decl_plugin.h" #include "ast/arith_decl_plugin.h"
#include "array_decl_plugin.h" #include "ast/array_decl_plugin.h"
#include "bv_decl_plugin.h" #include "ast/bv_decl_plugin.h"
namespace old { namespace old {
class model_evaluator { class model_evaluator {

View file

@ -19,15 +19,16 @@ Revision History:
--*/ --*/
#include <sstream> #include <sstream>
#include "spacer_manager.h"
#include "ast_smt2_pp.h" #include "muz/spacer/spacer_manager.h"
#include "for_each_expr.h" #include "ast/ast_smt2_pp.h"
#include "has_free_vars.h" #include "ast/for_each_expr.h"
#include "expr_replacer.h" #include "ast/has_free_vars.h"
#include "expr_abstract.h" #include "ast/rewriter/expr_replacer.h"
#include "model2expr.h" #include "ast/expr_abstract.h"
#include "model_smt2_pp.h" #include "model/model2expr.h"
#include "model_converter.h" #include "model/model_smt2_pp.h"
#include "tactic/model_converter.h"
namespace spacer { namespace spacer {

View file

@ -23,19 +23,20 @@ Revision History:
#include <utility> #include <utility>
#include <map> #include <map>
#include "bool_rewriter.h"
#include "expr_replacer.h"
#include "expr_substitution.h"
#include "map.h"
#include "ref_vector.h"
#include "smt_kernel.h"
#include "spacer_util.h"
#include "spacer_sym_mux.h"
#include "spacer_farkas_learner.h"
#include "spacer_smt_context_manager.h"
#include "dl_rule.h"
#include <vector> #include <vector>
#include "ast/rewriter/bool_rewriter.h"
#include "ast/rewriter/expr_replacer.h"
#include "ast/expr_substitution.h"
#include "util/map.h"
#include "util/ref_vector.h"
#include "smt/smt_kernel.h"
#include "muz/spacer/spacer_util.h"
#include "muz/spacer/spacer_sym_mux.h"
#include "muz/spacer/spacer_farkas_learner.h"
#include "muz/spacer/spacer_smt_context_manager.h"
#include "muz/base/dl_rule.h"
namespace smt { namespace smt {
class context; class context;
} }

View file

@ -9,14 +9,15 @@ Abstract:
marshaling and unmarshaling of expressions marshaling and unmarshaling of expressions
--*/ --*/
#include "spacer_marshal.h" #include "muz/spacer/spacer_marshal.h"
#include <sstream> #include <sstream>
#include "cmd_context.h"
#include "smt2parser.h" #include "cmd_context/cmd_context.h"
#include "vector.h" #include "parsers/smt2/smt2parser.h"
#include "ast_smt_pp.h" #include "util/vector.h"
#include "ast_pp.h" #include "ast/ast_smt_pp.h"
#include "ast/ast_pp.h"
namespace spacer { namespace spacer {
std::ostream &marshal(std::ostream &os, expr_ref e, ast_manager &m) std::ostream &marshal(std::ostream &os, expr_ref e, ast_manager &m)

View file

@ -13,9 +13,10 @@ Abstract:
#define _SPACER_MARSHAL_H_ #define _SPACER_MARSHAL_H_
#include <string> #include <string>
#include "ast.h"
#include <iostream> #include <iostream>
#include "ast/ast.h"
namespace spacer { namespace spacer {
std::ostream &marshal(std::ostream &os, expr_ref e, ast_manager &m); std::ostream &marshal(std::ostream &os, expr_ref e, ast_manager &m);
std::string marshal(expr_ref e, ast_manager &m); std::string marshal(expr_ref e, ast_manager &m);

View file

@ -15,7 +15,7 @@ Revision History:
--*/ --*/
#include "spacer_matrix.h" #include "muz/spacer/spacer_matrix.h"
namespace spacer namespace spacer
{ {

View file

@ -18,7 +18,8 @@ Revision History:
#ifndef _SPACER_MATRIX_H_ #ifndef _SPACER_MATRIX_H_
#define _SPACER_MATRIX_H_ #define _SPACER_MATRIX_H_
#include "ast.h" #include "util/rational.h"
#include "util/vector.h"
namespace spacer { namespace spacer {

View file

@ -14,20 +14,20 @@ Author:
Revision History: Revision History:
--*/ --*/
#include"model.h" #include"model/model.h"
#include"model_evaluator_params.hpp" #include"model_evaluator_params.hpp"
#include"rewriter_types.h" #include"ast/rewriter/rewriter_types.h"
#include"model_evaluator.h" #include"model/model_evaluator.h"
#include"spacer_mev_array.h" #include"muz/spacer/spacer_mev_array.h"
#include"bool_rewriter.h" #include"ast/rewriter/bool_rewriter.h"
#include"arith_rewriter.h" #include"ast/rewriter/arith_rewriter.h"
#include"bv_rewriter.h" #include"ast/rewriter/bv_rewriter.h"
#include"datatype_rewriter.h" #include"ast/rewriter/datatype_rewriter.h"
#include"array_rewriter.h" #include"ast/rewriter/array_rewriter.h"
#include"rewriter_def.h" #include"ast/rewriter/rewriter_def.h"
#include"cooperate.h" #include"util/cooperate.h"
#include"ast_pp.h" #include"ast/ast_pp.h"
#include"func_interp.h" #include"model/func_interp.h"

View file

@ -18,10 +18,10 @@ Revision History:
#ifndef _SPACER_MEV_ARRAY_H_ #ifndef _SPACER_MEV_ARRAY_H_
#define _SPACER_MEV_ARRAY_H_ #define _SPACER_MEV_ARRAY_H_
#include"ast.h" #include"ast/ast.h"
#include"rewriter_types.h" #include"ast/rewriter/rewriter_types.h"
#include"params.h" #include"util/params.h"
#include "array_decl_plugin.h" #include"ast/array_decl_plugin.h"
/** /**
* based on model_evaluator in muz/pdr/pdr_util.h * based on model_evaluator in muz/pdr/pdr_util.h