3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00

removed front-end-params

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2012-12-02 10:05:29 -08:00
parent 288a96610f
commit ffb7e26c75
91 changed files with 264 additions and 412 deletions

View file

@ -1,5 +1,5 @@
#include "arith_eq_solver.h"
#include "front_end_params.h"
#include "smt_params.h"
typedef rational numeral;
typedef vector<numeral> row;
@ -24,7 +24,7 @@ static void test_solve_integer_equations(
}
void tst_arith_simplifier_plugin() {
front_end_params params;
smt_params params;
ast_manager m;
arith_eq_solver asimp(m);

View file

@ -1,5 +1,5 @@
#include "memory_manager.h"
#include "front_end_params.h"
#include "smt_params.h"
#include "ast.h"
#include "arith_decl_plugin.h"
#include "bv_decl_plugin.h"
@ -9,7 +9,7 @@
void tst_check_assumptions()
{
memory::initialize(0);
front_end_params params;
smt_params params;
ast_manager mgr;
reg_decl_plugins(mgr);

View file

@ -2,7 +2,7 @@
#include "ast_pp.h"
#include "arith_decl_plugin.h"
#include "dl_context.h"
#include "front_end_params.h"
#include "smt_params.h"
#include "reg_decl_plugins.h"
using namespace datalog;
@ -10,7 +10,7 @@ using namespace datalog;
static void dparse_string(char const* str) {
ast_manager m;
front_end_params params;
smt_params params;
reg_decl_plugins(m);
context ctx(m, params);
@ -37,7 +37,7 @@ static void dparse_string(char const* str) {
static void dparse_file(char const* file) {
ast_manager m;
front_end_params params;
smt_params params;
reg_decl_plugins(m);
context ctx(m, params);

View file

@ -2,7 +2,7 @@
#include "ast_pp.h"
#include "arith_decl_plugin.h"
#include "dl_context.h"
#include "front_end_params.h"
#include "smt_params.h"
using namespace datalog;
@ -27,7 +27,7 @@ static void dl_context_simple_query_test(params_ref & params) {
ast_manager m;
dl_decl_util decl_util(m);
front_end_params fparams;
smt_params fparams;
context ctx(m, fparams);
ctx.updt_params(params);
@ -49,7 +49,7 @@ static void dl_context_simple_query_test(params_ref & params) {
void dl_context_saturate_file(params_ref & params, const char * f) {
ast_manager m;
dl_decl_util decl_util(m);
front_end_params fparams;
smt_params fparams;
context ctx(m, fparams);
ctx.updt_params(params);

View file

@ -19,7 +19,7 @@ namespace datalog {
};
void test_functional_columns(front_end_params fparams, params_ref& params) {
void test_functional_columns(smt_params fparams, params_ref& params) {
ast_manager m;
context ctx(m, fparams);
ctx.updt_params(params);
@ -121,7 +121,7 @@ namespace datalog {
}
}
void test_finite_product_relation(front_end_params fparams, params_ref& params) {
void test_finite_product_relation(smt_params fparams, params_ref& params) {
ast_manager m;
context ctx(m, fparams);
ctx.updt_params(params);
@ -338,7 +338,7 @@ namespace datalog {
using namespace datalog;
void tst_dl_product_relation() {
front_end_params fparams;
smt_params fparams;
params_ref params;
test_functional_columns(fparams, params);

View file

@ -2,7 +2,7 @@
#include "ast_pp.h"
#include "dl_table_relation.h"
#include "dl_context.h"
#include "front_end_params.h"
#include "smt_params.h"
#include "stopwatch.h"
#include "reg_decl_plugins.h"
@ -43,7 +43,7 @@ void dl_query_ask_for_last_arg(context & ctx, func_decl * pred, relation_fact &
}
}
void dl_query_test(ast_manager & m, front_end_params & fparams, params_ref& params,
void dl_query_test(ast_manager & m, smt_params & fparams, params_ref& params,
context & ctx_b, char const* problem_file, unsigned test_count,
bool use_magic_sets) {
@ -124,7 +124,7 @@ void dl_query_test(ast_manager & m, front_end_params & fparams, params_ref& para
}
}
void dl_query_test_wpa(front_end_params & fparams, params_ref& params) {
void dl_query_test_wpa(smt_params & fparams, params_ref& params) {
params.set_bool(":magic-sets-for-queries", true);
ast_manager m;
reg_decl_plugins(m);
@ -183,7 +183,7 @@ void dl_query_test_wpa(front_end_params & fparams, params_ref& params) {
}
void tst_dl_query() {
front_end_params fparams;
smt_params fparams;
params_ref params;
params.set_sym(":default-table", symbol("sparse"));
params.set_sym(":default-relation", symbol("tr_sparse"));

View file

@ -8,7 +8,7 @@
namespace datalog {
static void test_interval_relation() {
front_end_params params;
smt_params params;
ast_manager ast_m;
context ctx(ast_m, params);
arith_util autil(ast_m);
@ -111,7 +111,7 @@ namespace datalog {
std::cout << "bound relation\n";
front_end_params params;
smt_params params;
ast_manager ast_m;
context ctx(ast_m, params);
arith_util autil(ast_m);

View file

@ -14,7 +14,7 @@ namespace datalog {
arith_util a(m);
sort* int_sort = a.mk_int();
sort* real_sort = a.mk_real();
front_end_params params;
smt_params params;
context ctx(m, params);
relation_manager & rm = ctx.get_rmanager();
relation_signature sig1;

View file

@ -24,7 +24,7 @@ static void test_table(mk_table_fn mk_table) {
sig.push_back(4);
sig.push_back(8);
sig.push_back(4);
front_end_params params;
smt_params params;
ast_manager ast_m;
datalog::context ctx(ast_m, params);
datalog::relation_manager & m = ctx.get_rmanager();

View file

@ -1,6 +1,6 @@
#include "ast.h"
#include "front_end_params.h"
#include "smt_params.h"
#include "smt_context.h"
#include "arith_decl_plugin.h"
#include "bv_decl_plugin.h"
@ -11,7 +11,7 @@
void tst_model_retrieval()
{
memory::initialize(0);
front_end_params params;
smt_params params;
params.m_model = true;

View file

@ -1,5 +1,5 @@
#include "ast.h"
#include "front_end_params.h"
#include "smt_params.h"
#include "simplifier.h"
#include "qe.h"
#include "basic_simplifier_plugin.h"
@ -33,7 +33,7 @@ static void test_qe(ast_manager& m, lbool expected_outcome, expr* fml, char cons
// enable_trace("bv_bit_prop");
simplifier simp(m);
front_end_params params;
smt_params params;
// params.m_quant_elim = true;
std::cout << mk_pp(fml, m) << "\n";

View file

@ -1,5 +1,5 @@
#include "ast.h"
#include "front_end_params.h"
#include "smt_params.h"
#include "qe.h"
#include "arith_decl_plugin.h"
#include "ast_pp.h"
@ -28,7 +28,7 @@ static void validate_quant_solution(ast_manager& m, expr* fml, expr* guard, qe::
(*rep)(fml1);
expr_ref tmp(m);
tmp = m.mk_not(m.mk_implies(guard, fml1));
front_end_params fp;
smt_params fp;
smt::kernel solver(m, fp);
solver.assert_expr(tmp);
lbool res = solver.check();
@ -63,7 +63,7 @@ static void validate_quant_solutions(app* x, expr* fml, expr_ref_vector& guards)
std::cout << mk_pp(fml2, m) << "\n";
tmp = m.mk_not(m.mk_iff(fml2, tmp));
std::cout << mk_pp(tmp, m) << "\n";
front_end_params fp;
smt_params fp;
smt::kernel solver(m, fp);
solver.assert_expr(tmp);
lbool res = solver.check();
@ -78,7 +78,7 @@ static void validate_quant_solutions(app* x, expr* fml, expr_ref_vector& guards)
static void test_quant_solver(ast_manager& m, unsigned sz, app*const* xs, expr* fml, bool validate) {
front_end_params params;
smt_params params;
qe::expr_quant_elim qe(m, params);
qe::guarded_defs defs(m);
bool success = qe.solve_for_vars(sz, xs, fml, defs);
@ -98,8 +98,7 @@ static void test_quant_solver(ast_manager& m, unsigned sz, app*const* xs, expr*
static expr_ref parse_fml(ast_manager& m, char const* str) {
expr_ref result(m);
front_end_params fp;
cmd_context ctx(&fp, false, &m);
cmd_context ctx(false, &m);
ctx.set_ignore_check(true);
std::ostringstream buffer;
buffer << "(declare-const x Int)\n"

View file

@ -3,7 +3,7 @@
void tst_smt_context()
{
front_end_params params;
smt_params params;
ast_manager m;
reg_decl_plugins(m);

View file

@ -1,5 +1,5 @@
#include "expr_substitution.h"
#include "front_end_params.h"
#include "smt_params.h"
#include "substitution.h"
#include "unifier.h"
#include "bv_decl_plugin.h"
@ -10,7 +10,7 @@
void tst_substitution()
{
memory::initialize(0);
front_end_params params;
smt_params params;
params.m_model = true;
enable_trace("subst_bug");

View file

@ -6,7 +6,7 @@
void tst_theory_dl() {
ast_manager m;
front_end_params params;
smt_params params;
params.m_model = true;
datalog::dl_decl_util u(m);
smt::context ctx(m, params);