3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-08 10:25:18 +00:00

remove some dependencies on parameter file

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-09-12 20:22:26 -07:00
parent 8ab04fb05b
commit 10e203da43
8 changed files with 19 additions and 11 deletions

View file

@ -289,6 +289,13 @@ namespace datalog {
bool context::magic_sets_for_queries() const { return m_params->magic_sets_for_queries(); }
bool context::eager_emptiness_checking() const { return m_params->eager_emptiness_checking(); }
bool context::bit_blast() const { return m_params->bit_blast(); }
bool context::karr() const { return m_params->karr(); }
bool context::scale() const { return m_params->scale(); }
bool context::magic() const { return m_params->magic(); }
bool context::quantify_arrays() const { return m_params->quantify_arrays(); }
bool context::instantiate_quantifiers() const { return m_params->instantiate_quantifiers(); }
void context::register_finite_sort(sort * s, sort_kind k) {
m_pinned.push_back(s);

View file

@ -262,6 +262,12 @@ namespace datalog {
bool explanations_on_relation_level() const;
bool magic_sets_for_queries() const;
bool eager_emptiness_checking() const;
bool bit_blast() const;
bool karr() const;
bool scale() const;
bool magic() const;
bool quantify_arrays() const;
bool instantiate_quantifiers() const;
void register_finite_sort(sort * s, sort_kind k);

View file

@ -254,7 +254,7 @@ namespace datalog {
rule_set * operator()(rule_set const & source) {
// TODO pc
if (!m_context.get_params().bit_blast()) {
if (!m_context.bit_blast()) {
return 0;
}
rule_manager& rm = m_context.get_rule_manager();

View file

@ -39,7 +39,6 @@ Revision History:
#include"dl_mk_karr_invariants.h"
#include"dl_mk_backwards.h"
#include"dl_mk_loop_counter.h"
#include"fixedpoint_params.hpp"
namespace datalog {
@ -197,7 +196,7 @@ namespace datalog {
}
rule_set * mk_karr_invariants::operator()(rule_set const & source) {
if (!m_ctx.get_params().karr()) {
if (!m_ctx.karr()) {
return 0;
}
rule_set::iterator it = source.begin(), end = source.end();

View file

@ -54,7 +54,6 @@ Revision History:
#include"dl_mk_magic_symbolic.h"
#include"dl_context.h"
#include"fixedpoint_params.hpp"
namespace datalog {
@ -68,7 +67,7 @@ namespace datalog {
mk_magic_symbolic::~mk_magic_symbolic() { }
rule_set * mk_magic_symbolic::operator()(rule_set const & source) {
if (!m_ctx.get_params().magic()) {
if (!m_ctx.magic()) {
return 0;
}
context& ctx = source.get_context();

View file

@ -300,8 +300,7 @@ namespace datalog {
}
rule_set * mk_quantifier_abstraction::operator()(rule_set const & source) {
TRACE("dl", tout << "quantify " << source.get_num_rules() << " " << m_ctx.get_params().quantify_arrays() << "\n";);
if (!m_ctx.get_params().quantify_arrays()) {
if (!m_ctx.quantify_arrays()) {
return 0;
}
unsigned sz = source.get_num_rules();

View file

@ -26,7 +26,6 @@ Revision History:
#include "dl_mk_quantifier_instantiation.h"
#include "dl_context.h"
#include "pattern_inference.h"
#include "fixedpoint_params.hpp"
namespace datalog {
@ -251,8 +250,7 @@ namespace datalog {
}
rule_set * mk_quantifier_instantiation::operator()(rule_set const & source) {
TRACE("dl", tout << m_ctx.get_params().instantiate_quantifiers() << "\n";);
if (!m_ctx.get_params().instantiate_quantifiers()) {
if (!m_ctx.instantiate_quantifiers()) {
return 0;
}
bool has_quantifiers = false;

View file

@ -115,7 +115,7 @@ namespace datalog {
}
rule_set * mk_scale::operator()(rule_set const & source) {
if (!m_ctx.get_params().scale()) {
if (!m_ctx.scale()) {
return 0;
}
rule_manager& rm = source.get_rule_manager();