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

re-organize muz_qe into separate units

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-08-28 21:20:24 -07:00
parent 4597872be8
commit 0d56499e2d
131 changed files with 994 additions and 20069 deletions

View file

@ -2,6 +2,7 @@
#include "ast_pp.h"
#include "arith_decl_plugin.h"
#include "dl_context.h"
#include "dl_register_engine.h"
#include "smt_params.h"
#include "reg_decl_plugins.h"
@ -12,8 +13,8 @@ static void dparse_string(char const* str) {
ast_manager m;
smt_params params;
reg_decl_plugins(m);
context ctx(m, params);
register_engine re;
context ctx(m, re, params);
parser* p = parser::create(ctx,m);
bool res=p->parse_string(str);
@ -39,8 +40,9 @@ static void dparse_file(char const* file) {
ast_manager m;
smt_params params;
reg_decl_plugins(m);
register_engine re;
context ctx(m, params);
context ctx(m, re, params);
parser* p = parser::create(ctx,m);
if (!p->parse_file(file)) {

View file

@ -3,6 +3,7 @@
#include "arith_decl_plugin.h"
#include "dl_context.h"
#include "smt_params.h"
#include "dl_register_engine.h"
using namespace datalog;
@ -26,9 +27,9 @@ static lbool dl_context_eval_unary_predicate(ast_manager & m, context & ctx, cha
static void dl_context_simple_query_test(params_ref & params) {
ast_manager m;
dl_decl_util decl_util(m);
register_engine re;
smt_params fparams;
context ctx(m, fparams);
context ctx(m, re, fparams);
ctx.updt_params(params);
/* lbool status = */ dl_context_eval_unary_predicate(m, ctx, "Z 64\n\nP(x:Z)\nP(\"a\").", "P");
@ -50,7 +51,8 @@ void dl_context_saturate_file(params_ref & params, const char * f) {
ast_manager m;
dl_decl_util decl_util(m);
smt_params fparams;
context ctx(m, fparams);
register_engine re;
context ctx(m, re, fparams);
ctx.updt_params(params);
datalog::parser * parser = datalog::parser::create(ctx, m);

View file

@ -1,7 +1,9 @@
#ifdef _WINDOWS
#include "dl_context.h"
#include "dl_register_engine.h"
#include "dl_finite_product_relation.h"
#include "dl_sparse_table.h"
#include "rel_context.h"
namespace datalog {
@ -21,8 +23,9 @@ namespace datalog {
void test_functional_columns(smt_params fparams, params_ref& params) {
ast_manager m;
context ctx(m, fparams);
rel_context& rctx = *ctx.get_rel_context();
register_engine re;
context ctx(m, re, fparams);
rel_context_base& rctx = *ctx.get_rel_context();
ctx.updt_params(params);
relation_manager & rmgr(rctx.get_rmanager());
@ -124,7 +127,8 @@ namespace datalog {
void test_finite_product_relation(smt_params fparams, params_ref& params) {
ast_manager m;
context ctx(m, fparams);
register_engine re;
context ctx(m, re, fparams);
ctx.updt_params(params);
dl_decl_util dl_util(m);
relation_manager & rmgr = ctx.get_rel_context()->get_rmanager();

View file

@ -2,9 +2,11 @@
#include "ast_pp.h"
#include "dl_table_relation.h"
#include "dl_context.h"
#include "dl_register_engine.h"
#include "smt_params.h"
#include "stopwatch.h"
#include "reg_decl_plugins.h"
#include "dl_relation_manager.h"
using namespace datalog;
@ -50,7 +52,8 @@ void dl_query_test(ast_manager & m, smt_params & fparams, params_ref& params,
dl_decl_util decl_util(m);
random_gen ran(0);
context ctx_q(m, fparams);
register_engine re;
context ctx_q(m, re, fparams);
params.set_bool("magic_sets_for_queries", use_magic_sets);
ctx_q.updt_params(params);
{
@ -135,7 +138,8 @@ void dl_query_test_wpa(smt_params & fparams, params_ref& params) {
dl_decl_util dl_util(m);
std::cerr << "Testing queries on " << problem_dir <<"\n";
context ctx(m, fparams);
register_engine re;
context ctx(m, re, fparams);
ctx.updt_params(params);
{
wpa_parser* p = wpa_parser::create(ctx, m);
@ -204,7 +208,8 @@ void tst_dl_query() {
std::cerr << "Testing queries on " << problem_file <<"\n";
context ctx_base(m, fparams);
register_engine re;
context ctx_base(m, re, fparams);
ctx_base.updt_params(params);
{
parser* p = parser::create(ctx_base,m);

View file

@ -1,5 +1,7 @@
#ifdef _WINDOWS
#include "dl_context.h"
#include "dl_register_engine.h"
#include "dl_relation_manager.h"
#include "dl_interval_relation.h"
#include "dl_bound_relation.h"
#include "dl_product_relation.h"
@ -10,7 +12,8 @@ namespace datalog {
static void test_interval_relation() {
smt_params params;
ast_manager ast_m;
context ctx(ast_m, params);
register_engine re;
context ctx(ast_m, re, params);
arith_util autil(ast_m);
relation_manager & m = ctx.get_rel_context()->get_rmanager();
m.register_plugin(alloc(interval_relation_plugin, m));
@ -113,7 +116,8 @@ namespace datalog {
smt_params params;
ast_manager ast_m;
context ctx(ast_m, params);
register_engine re;
context ctx(ast_m, re, params);
arith_util autil(ast_m);
relation_manager & m = ctx.get_rel_context()->get_rmanager();
m.register_plugin(alloc(bound_relation_plugin, m));

View file

@ -1,6 +1,8 @@
#ifdef _WINDOWS
#include "dl_context.h"
#include "dl_table.h"
#include "dl_register_engine.h"
#include "dl_relation_manager.h"
typedef datalog::table_base* (*mk_table_fn)(datalog::relation_manager& m, datalog::table_signature& sig);
@ -18,7 +20,8 @@ static void test_table(mk_table_fn mk_table) {
sig.push_back(4);
smt_params params;
ast_manager ast_m;
datalog::context ctx(ast_m, params);
datalog::register_engine re;
datalog::context ctx(ast_m, re, params);
datalog::relation_manager & m = ctx.get_rel_context()->get_rmanager();
m.register_plugin(alloc(datalog::bitvector_table_plugin, m));