mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-22 02:57:50 +00:00
Code Activity

Merge pull request #1183 from agurfinkel/spacer-z3

Browse source 
removing pragmas to make travis happy
This commit is contained in:
Nikolaj Bjorner 2017-07-31 21:44:00 -07:00 • committed by GitHub
commit 9a78bec8a8
36 changed files with 323 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/model/model_evaluator.h
View file

@ -22,7 +22,9 @@ Revision History:
#include "ast/ast.h" #include "ast/ast.h"
#include "ast/rewriter/rewriter_types.h" #include "ast/rewriter/rewriter_types.h"
#include "util/params.h" #include "util/params.h"
class model; class model;
class model_core;
typedef rewriter_exception model_evaluator_exception; typedef rewriter_exception model_evaluator_exception;
@ -46,7 +48,7 @@ public:
void cleanup(params_ref const & p = params_ref()); void cleanup(params_ref const & p = params_ref());
void reset(params_ref const & p = params_ref()); void reset(params_ref const & p = params_ref());
unsigned get_num_steps() const; unsigned get_num_steps() const;
}; };

6
src/muz/spacer/spacer_context.h
View file

@ -28,8 +28,10 @@ Notes:
#undef max #undef max
#endif #endif
#include <queue> #include <queue>
#include "spacer_manager.h"
#include "spacer_prop_solver.h" #include "muz/spacer/spacer_manager.h"
#include "muz/spacer/spacer_prop_solver.h"
#include "fixedpoint_params.hpp" #include "fixedpoint_params.hpp"
namespace datalog { namespace datalog {

14
src/muz/spacer/spacer_itp_solver.cpp
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 ()

6
src/muz/spacer/spacer_itp_solver.h
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:

54
src/muz/spacer/spacer_legacy_frames.cpp
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 {

55
src/muz/spacer/spacer_legacy_mbp.cpp
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)

52
src/muz/spacer/spacer_legacy_mev.cpp
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 {

20
src/muz/spacer/spacer_legacy_mev.h
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 {

19
src/muz/spacer/spacer_manager.cpp
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 {

23
src/muz/spacer/spacer_manager.h
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;
} }

13
src/muz/spacer/spacer_marshal.cpp
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)

3
src/muz/spacer/spacer_marshal.h
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);

2
src/muz/spacer/spacer_matrix.cpp
View file

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

3
src/muz/spacer/spacer_matrix.h
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 {

26
src/muz/spacer/spacer_mev_array.cpp
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"

8
src/muz/spacer/spacer_mev_array.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

2
src/muz/spacer/spacer_min_cut.cpp
View file

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

3
src/muz/spacer/spacer_min_cut.h
View file

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

8
src/muz/spacer/spacer_proof_utils.cpp
View file

@ -16,11 +16,11 @@ Revision History:
--*/ --*/
#include "spacer_proof_utils.h" #include "muz/spacer/spacer_proof_utils.h"
#include "ast_util.h" #include "ast/ast_util.h"
#include "ast_pp.h" #include "ast/ast_pp.h"
#include "proof_checker.h" #include "ast/proof_checker/proof_checker.h"
namespace spacer { namespace spacer {

2
src/muz/spacer/spacer_proof_utils.h
View file

@ -18,7 +18,7 @@ Revision History:
#ifndef _SPACER_PROOF_UTILS_H_ #ifndef _SPACER_PROOF_UTILS_H_
#define _SPACER_PROOF_UTILS_H_ #define _SPACER_PROOF_UTILS_H_
#include "ast.h" #include "ast/ast.h"
namespace spacer { namespace spacer {
/* /*

31
src/muz/spacer/spacer_prop_solver.cpp
View file

@ -18,19 +18,23 @@ Revision History:
--*/ --*/
#include <sstream> #include "ast/ast_smt2_pp.h"
#include "model.h" #include "ast/datatype_decl_plugin.h"
#include "spacer_util.h" #include "ast/bv_decl_plugin.h"
#include "spacer_prop_solver.h"
#include "ast_smt2_pp.h" #include "ast/rewriter/expr_replacer.h"
#include "dl_util.h"
#include "model_pp.h" #include "smt/params/smt_params.h"
#include "smt_params.h"
#include "datatype_decl_plugin.h" #include "model/model.h"
#include "bv_decl_plugin.h" #include "model/model_pp.h"
#include "spacer_farkas_learner.h"
#include "ast_smt2_pp.h" #include "muz/base/dl_util.h"
#include "expr_replacer.h"
#include "muz/spacer/spacer_util.h"
#include "muz/spacer/spacer_farkas_learner.h"
#include "muz/spacer/spacer_prop_solver.h"
#include "fixedpoint_params.hpp" #include "fixedpoint_params.hpp"
namespace spacer { namespace spacer {
@ -260,7 +264,6 @@ lbool prop_solver::check_assumptions(const expr_ref_vector & _hard,
else { m_ctx->assert_expr(bg[i]); } else { m_ctx->assert_expr(bg[i]); }
unsigned soft_sz = soft.size(); unsigned soft_sz = soft.size();
#pragma unused(soft_sz)
lbool res = internal_check_assumptions(hard, soft); lbool res = internal_check_assumptions(hard, soft);
if (!m_use_push_bg) { m_ctx->pop(1); } if (!m_use_push_bg) { m_ctx->pop(1); }

17
src/muz/spacer/spacer_prop_solver.h
View file

@ -23,14 +23,15 @@ Revision History:
#include <map> #include <map>
#include <string> #include <string>
#include <utility> #include <utility>
#include "ast.h"
#include "obj_hashtable.h" #include "ast/ast.h"
#include "smt_kernel.h" #include "util/obj_hashtable.h"
#include "util.h" #include "smt/smt_kernel.h"
#include "vector.h" #include "util/util.h"
#include "spacer_manager.h" #include "util/vector.h"
#include "spacer_smt_context_manager.h" #include "muz/spacer/spacer_manager.h"
#include "spacer_itp_solver.h" #include "muz/spacer/spacer_smt_context_manager.h"
#include "muz/spacer/spacer_itp_solver.h"
struct fixedpoint_params; struct fixedpoint_params;

32
src/muz/spacer/spacer_qe_project.cpp
View file

@ -21,20 +21,24 @@ Revision History:
--*/ --*/
#include "spacer_qe_project.h" #include "ast/arith_decl_plugin.h"
#include "qe_vartest.h" #include "ast/ast_pp.h"
#include "qe.h" #include "ast/expr_functors.h"
#include "arith_decl_plugin.h" #include "ast/expr_substitution.h"
#include "ast_pp.h"
#include "th_rewriter.h" #include "ast/rewriter/expr_replacer.h"
#include "expr_functors.h" #include "ast/rewriter/expr_safe_replace.h"
#include "expr_substitution.h" #include "ast/rewriter/th_rewriter.h"
#include "expr_replacer.h"
#include "model_pp.h" #include "model/model_evaluator.h"
#include "expr_safe_replace.h" #include "model/model_pp.h"
#include "model_evaluator.h"
#include "qe_lite.h" #include "qe/qe.h"
#include "spacer_mev_array.h" #include "qe/qe_vartest.h"
#include "qe/qe_lite.h"
#include "muz/spacer/spacer_mev_array.h"
#include "muz/spacer/spacer_qe_project.h"
namespace namespace
{ {

4
src/muz/spacer/spacer_qe_project.h
View file

@ -20,8 +20,8 @@ Notes:
#ifndef SPACER_QE_PROJECT_H_ #ifndef SPACER_QE_PROJECT_H_
#define SPACER_QE_PROJECT_H_ #define SPACER_QE_PROJECT_H_
#include "model.h" #include "model/model.h"
#include "expr_map.h" #include "ast/expr_map.h"
namespace qe { namespace qe {
/** /**

18
src/muz/spacer/spacer_smt_context_manager.cpp
View file

@ -17,16 +17,16 @@ Revision History:
--*/ --*/
#include "spacer_smt_context_manager.h"
#include "has_free_vars.h"
#include "ast_pp.h"
#include "ast_smt_pp.h"
#include <sstream>
#include "smt_params.h"
#include "ast_pp_util.h" #include "ast/ast_pp.h"
#include "smt_context.h" #include "ast/ast_pp_util.h"
#include "spacer_util.h" #include "ast/ast_smt_pp.h"
#include "smt/smt_context.h"
#include "smt/params/smt_params.h"
#include "muz/spacer/spacer_util.h"
#include "muz/spacer/spacer_smt_context_manager.h"
namespace spacer { namespace spacer {

10
src/muz/spacer/spacer_smt_context_manager.h
View file

@ -20,11 +20,11 @@ Revision History:
#ifndef _SPACER_SMT_CONTEXT_MANAGER_H_ #ifndef _SPACER_SMT_CONTEXT_MANAGER_H_
#define _SPACER_SMT_CONTEXT_MANAGER_H_ #define _SPACER_SMT_CONTEXT_MANAGER_H_
#include "smt_kernel.h" #include "util/stopwatch.h"
#include "func_decl_dependencies.h"
#include "dl_util.h" #include "smt/smt_kernel.h"
#include "spacer_virtual_solver.h" #include "muz/base/dl_util.h"
#include "stopwatch.h" #include "muz/spacer/spacer_virtual_solver.h"
namespace spacer { namespace spacer {

17
src/muz/spacer/spacer_sym_mux.cpp
View file

@ -17,14 +17,15 @@ Revision History:
--*/ --*/
#include <sstream> #include "ast/ast_pp.h"
#include "ast_pp.h" #include "ast/for_each_expr.h"
#include "for_each_expr.h" #include "ast/rewriter/rewriter.h"
#include "model.h" #include "ast/rewriter/rewriter_def.h"
#include "rewriter.h"
#include "rewriter_def.h" #include "model/model.h"
#include "spacer_util.h"
#include "spacer_sym_mux.h" #include "muz/spacer/spacer_util.h"
#include "muz/spacer/spacer_sym_mux.h"
using namespace spacer; using namespace spacer;

6
src/muz/spacer/spacer_sym_mux.h
View file

@ -20,9 +20,9 @@ Revision History:
#ifndef _SYM_MUX_H_ #ifndef _SYM_MUX_H_
#define _SYM_MUX_H_ #define _SYM_MUX_H_
#include "ast.h" #include "ast/ast.h"
#include "map.h" #include "util/map.h"
#include "vector.h" #include "util/vector.h"
#include <vector> #include <vector>
class model_core; class model_core;

15
src/muz/spacer/spacer_unsat_core_learner.cpp
View file

@ -15,19 +15,16 @@ Revision History:
--*/ --*/
#include "spacer_unsat_core_learner.h"
#include "spacer_unsat_core_plugin.h"
#include "proof_utils.h"
#include "for_each_expr.h"
#include <unordered_map> #include <unordered_map>
#include "muz/spacer/spacer_unsat_core_learner.h"
#include "muz/spacer/spacer_unsat_core_plugin.h"
#include "ast/for_each_expr.h"
namespace spacer namespace spacer
{ {
#pragma mark - proof iterators
# pragma mark - main methods
unsat_core_learner::~unsat_core_learner() unsat_core_learner::~unsat_core_learner()
{ {
std::for_each(m_plugins.begin(), m_plugins.end(), delete_proc<unsat_core_plugin>()); std::for_each(m_plugins.begin(), m_plugins.end(), delete_proc<unsat_core_plugin>());
@ -262,7 +259,6 @@ void unsat_core_learner::finalize()
} }
} }
#pragma mark - API
bool unsat_core_learner::is_a_marked(proof* p) bool unsat_core_learner::is_a_marked(proof* p)
{ {
@ -290,7 +286,6 @@ void unsat_core_learner::set_closed(proof* p, bool value)
m_unsat_core.push_back(lemma); m_unsat_core.push_back(lemma);
} }
# pragma mark - checking for b_symbols
class collect_pure_proc { class collect_pure_proc {
func_decl_set& m_symbs; func_decl_set& m_symbs;

6
src/muz/spacer/spacer_unsat_core_learner.h
View file

@ -18,9 +18,9 @@ Revision History:
#ifndef _SPACER_UNSAT_CORE_LEARNER_H_ #ifndef _SPACER_UNSAT_CORE_LEARNER_H_
#define _SPACER_UNSAT_CORE_LEARNER_H_ #define _SPACER_UNSAT_CORE_LEARNER_H_
#include "ast.h" #include "ast/ast.h"
#include "spacer_util.h" #include "muz/spacer/spacer_util.h"
#include "spacer_proof_utils.h" #include "muz/spacer/spacer_proof_utils.h"
namespace spacer { namespace spacer {

33
src/muz/spacer/spacer_unsat_core_plugin.cpp
View file

@ -15,24 +15,25 @@ Revision History:
--*/ --*/
#include "spacer_unsat_core_plugin.h"
#include "spacer_unsat_core_learner.h"
#include "smt_farkas_util.h"
#include "bool_rewriter.h"
#include "arith_decl_plugin.h"
#include <set> #include <set>
#include "smt_solver.h"
#include "solver.h"
#include <limits> #include <limits>
#include "spacer_proof_utils.h"
#include "spacer_matrix.h" #include "ast/rewriter/bool_rewriter.h"
#include "ast/arith_decl_plugin.h"
#include "solver/solver.h"
#include "smt/smt_farkas_util.h"
#include "smt/smt_solver.h"
#include "muz/spacer/spacer_proof_utils.h"
#include "muz/spacer/spacer_matrix.h"
#include "muz/spacer/spacer_unsat_core_plugin.h"
#include "muz/spacer/spacer_unsat_core_learner.h"
namespace spacer namespace spacer
{ {
#pragma mark - unsat_core_plugin_lemma
void unsat_core_plugin_lemma::compute_partial_core(proof* step) void unsat_core_plugin_lemma::compute_partial_core(proof* step)
{ {
@ -105,7 +106,6 @@ void unsat_core_plugin_lemma::add_lowest_split_to_core(proof* step) const
} }
#pragma mark - unsat_core_plugin_farkas_lemma
void unsat_core_plugin_farkas_lemma::compute_partial_core(proof* step) void unsat_core_plugin_farkas_lemma::compute_partial_core(proof* step)
{ {
ast_manager &m = m_learner.m; ast_manager &m = m_learner.m;
@ -285,7 +285,6 @@ void unsat_core_plugin_farkas_lemma::compute_linear_combination(const vector<rat
} }
} }
#pragma mark - unsat_core_plugin_farkas_optimized
void unsat_core_plugin_farkas_lemma_optimized::compute_partial_core(proof* step) void unsat_core_plugin_farkas_lemma_optimized::compute_partial_core(proof* step)
{ {
SASSERT(m_learner.is_a_marked(step)); SASSERT(m_learner.is_a_marked(step));
@ -444,7 +443,6 @@ void unsat_core_plugin_farkas_lemma::compute_linear_combination(const vector<rat
res = mk_not(m, negated_linear_combination); //TODO: rewrite the get-method to return nonnegated stuff? res = mk_not(m, negated_linear_combination); //TODO: rewrite the get-method to return nonnegated stuff?
} }
#pragma mark - unsat_core_plugin_farkas_bounded
void unsat_core_plugin_farkas_lemma_bounded::finalize() void unsat_core_plugin_farkas_lemma_bounded::finalize()
{ {
@ -557,7 +555,7 @@ void unsat_core_plugin_farkas_lemma::compute_linear_combination(const vector<rat
app_ref sum(m); app_ref sum(m);
sum = util.mk_int(0); sum = util.mk_int(0);
for (int k=0; k < n; ++k) for (unsigned k=0; k < n; ++k)
{ {
sum = util.mk_add(sum, util.mk_mul(coeffs[i][k].get(), bounded_vectors[j][k].get())); sum = util.mk_add(sum, util.mk_mul(coeffs[i][k].get(), bounded_vectors[j][k].get()));
} }
@ -579,7 +577,7 @@ void unsat_core_plugin_farkas_lemma::compute_linear_combination(const vector<rat
{ {
ptr_vector<app> literals; ptr_vector<app> literals;
vector<rational> coefficients; vector<rational> coefficients;
for (int j=0; j < matrix.num_cols(); ++j) for (unsigned j=0; j < matrix.num_cols(); ++j)
{ {
expr_ref evaluation(m); expr_ref evaluation(m);
@ -601,7 +599,6 @@ void unsat_core_plugin_farkas_lemma::compute_linear_combination(const vector<rat
} }
} }
#pragma mark - unsat_core_plugin_min_cut
unsat_core_plugin_min_cut::unsat_core_plugin_min_cut(unsat_core_learner& learner, ast_manager& m) : unsat_core_plugin(learner), m(m){} unsat_core_plugin_min_cut::unsat_core_plugin_min_cut(unsat_core_learner& learner, ast_manager& m) : unsat_core_plugin(learner), m(m){}
void unsat_core_plugin_min_cut::compute_partial_core(proof* step) void unsat_core_plugin_min_cut::compute_partial_core(proof* step)

4
src/muz/spacer/spacer_unsat_core_plugin.h
View file

@ -18,8 +18,8 @@ Revision History:
#ifndef _SPACER_UNSAT_CORE_PLUGIN_H_ #ifndef _SPACER_UNSAT_CORE_PLUGIN_H_
#define _SPACER_UNSAT_CORE_PLUGIN_H_ #define _SPACER_UNSAT_CORE_PLUGIN_H_
#include "ast.h" #include "ast/ast.h"
#include "spacer_min_cut.h" #include "muz/spacer/spacer_min_cut.h"
namespace spacer { namespace spacer {

66
src/muz/spacer/spacer_util.cpp
View file

@ -27,43 +27,43 @@ Notes:
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
#include "ast.h" #include "ast/ast.h"
#include "occurs.h" #include "ast/occurs.h"
#include "array_decl_plugin.h" #include "ast/ast_pp.h"
#include "ast_pp.h" #include "ast/rewriter/bool_rewriter.h"
#include "bool_rewriter.h" #include "muz/base/dl_util.h"
#include "dl_util.h" #include "ast/for_each_expr.h"
#include "for_each_expr.h" #include "smt/params/smt_params.h"
#include "smt_params.h" #include "model/model.h"
#include "model.h" #include "model/model_evaluator.h"
#include "model_evaluator.h" #include "util/ref_vector.h"
#include "ref_vector.h" #include "ast/rewriter/rewriter.h"
#include "rewriter.h" #include "ast/rewriter/rewriter_def.h"
#include "rewriter_def.h" #include "util/util.h"
#include "util.h" #include "muz/spacer/spacer_manager.h"
#include "spacer_manager.h" #include "muz/spacer/spacer_util.h"
#include "spacer_util.h" #include "ast/rewriter/expr_replacer.h"
#include "arith_decl_plugin.h" #include "model/model_smt2_pp.h"
#include "expr_replacer.h" #include "ast/scoped_proof.h"
#include "model_smt2_pp.h" #include "qe/qe_lite.h"
#include "scoped_proof.h" #include "muz/spacer/spacer_qe_project.h"
#include "qe_lite.h" #include "model/model_pp.h"
#include "spacer_qe_project.h" #include "ast/rewriter/expr_safe_replace.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/arith_decl_plugin.h"
#include "ast/datatype_decl_plugin.h"
#include "ast/bv_decl_plugin.h"
#include "spacer_legacy_mev.h" #include "muz/spacer/spacer_legacy_mev.h"
#include "qe_mbp.h" #include "qe/qe_mbp.h"
#include "tactical.h" #include "tactic/tactical.h"
#include "propagate_values_tactic.h" #include "tactic/core/propagate_values_tactic.h"
#include "propagate_ineqs_tactic.h" #include "tactic/arith/propagate_ineqs_tactic.h"
#include "arith_bounds_tactic.h" #include "tactic/arith/arith_bounds_tactic.h"
#include "obj_equiv_class.h" #include "muz/spacer/obj_equiv_class.h"
namespace spacer { namespace spacer {

26
src/muz/spacer/spacer_util.h
View file

@ -22,20 +22,20 @@ Revision History:
#ifndef _SPACER_UTIL_H_ #ifndef _SPACER_UTIL_H_
#define _SPACER_UTIL_H_ #define _SPACER_UTIL_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"
#include "model.h" #include "model/model.h"
#include "stopwatch.h" #include "util/stopwatch.h"
#include "spacer_antiunify.h" #include "muz/spacer/spacer_antiunify.h"
class model; class model;
class model_core; class model_core;

14
src/muz/spacer/spacer_virtual_solver.cpp
View file

@ -17,15 +17,15 @@ Notes:
--*/ --*/
#include "spacer_virtual_solver.h" #include "muz/spacer/spacer_virtual_solver.h"
#include "ast_util.h" #include "ast/ast_util.h"
#include "ast_pp_util.h" #include "ast/ast_pp_util.h"
#include "spacer_util.h" #include "muz/spacer/spacer_util.h"
#include "bool_rewriter.h" #include "ast/rewriter/bool_rewriter.h"
#include "proof_checker.h" #include "ast/proof_checker/proof_checker.h"
#include "scoped_proof.h" #include "ast/scoped_proof.h"
namespace spacer { namespace spacer {
virtual_solver::virtual_solver(virtual_solver_factory &factory, virtual_solver::virtual_solver(virtual_solver_factory &factory,

12
src/muz/spacer/spacer_virtual_solver.h
View file

@ -18,12 +18,12 @@ Notes:
--*/ --*/
#ifndef SPACER_VIRTUAL_SOLVER_H_ #ifndef SPACER_VIRTUAL_SOLVER_H_
#define SPACER_VIRTUAL_SOLVER_H_ #define SPACER_VIRTUAL_SOLVER_H_
#include"ast.h" #include"ast/ast.h"
#include"params.h" #include"util/params.h"
#include"solver_na2as.h" #include"solver/solver_na2as.h"
#include"smt_kernel.h" #include"smt/smt_kernel.h"
#include"smt_params.h" #include"smt/params/smt_params.h"
#include"stopwatch.h" #include"util/stopwatch.h"
namespace spacer { namespace spacer {
class virtual_solver_factory; class virtual_solver_factory;