mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-22 16:45:31 +00:00
Code Activity

debugging cardinality theory

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-11-05 09:39:28 -08:00
parent 27f3f7b735
commit 9467806a5c
8 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ast/card_decl_plugin.cpp
View file

@ -20,7 +20,7 @@ Revision History:
#include "card_decl_plugin.h"
card_decl_plugin::card_decl_plugin():
m_at_most_sym("at_most")
m_at_most_sym("at-most")
{}
func_decl * card_decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters, parameter const * parameters,
@ -29,11 +29,11 @@ func_decl * card_decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters,
ast_manager& m = *m_manager;
for (unsigned i = 0; i < arity; ++i) {
if (!m.is_bool(domain[i])) {
m.raise_exception("invalid non-Boolean sort applied to 'at_most_k'");
m.raise_exception("invalid non-Boolean sort applied to 'at-most'");
}
}
if (num_parameters != 1 || !parameters[0].is_int() || parameters[0].get_int() < 0) {
m.raise_exception("function 'at_most_k' expects one non-negative integer parameter");
m.raise_exception("function 'at-most' expects one non-negative integer parameter");
}
func_decl_info info(m_family_id, OP_AT_MOST_K, 1, parameters);
return m.mk_func_decl(m_at_most_sym, arity, domain, m.mk_bool_sort(), info);
@ -41,7 +41,7 @@ func_decl * card_decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters,
void card_decl_plugin::get_op_names(svector<builtin_name> & op_names, symbol const & logic) {
if (logic == symbol::null) {
op_names.push_back(builtin_name("at-most-k", OP_AT_MOST_K));
op_names.push_back(builtin_name(m_at_most_sym.bare_str(), OP_AT_MOST_K));
}
}

5
src/ast/card_decl_plugin.h
View file

@ -28,8 +28,6 @@ hence:
#define _CARD_DECL_PLUGIN_H_
#include"ast.h"
enum card_op_kind {
OP_AT_MOST_K,
@ -60,9 +58,6 @@ public:
virtual func_decl * mk_func_decl(decl_kind k, unsigned num_parameters, parameter const * parameters,
unsigned arity, sort * const * domain, sort * range);
virtual void get_op_names(svector<builtin_name> & op_names, symbol const & logic);
virtual void get_sort_names(svector<builtin_name> & sort_names, symbol const & logic);
virtual expr * get_some_value(sort * s);
virtual bool is_fully_interp(sort const * s) const;
};

4
src/ast/reg_decl_plugins.cpp
View file

@ -25,6 +25,7 @@ Revision History:
#include"dl_decl_plugin.h"
#include"seq_decl_plugin.h"
#include"float_decl_plugin.h"
#include"card_decl_plugin.h"
void reg_decl_plugins(ast_manager & m) {
if (!m.get_plugin(m.mk_family_id(symbol("arith")))) {
@ -48,4 +49,7 @@ void reg_decl_plugins(ast_manager & m) {
if (!m.get_plugin(m.mk_family_id(symbol("float")))) {
m.register_plugin(symbol("float"), alloc(float_decl_plugin));
}
if (!m.get_plugin(m.mk_family_id(symbol("card")))) {
m.register_plugin(symbol("card"), alloc(card_decl_plugin));
}
}

3
src/cmd_context/cmd_context.cpp
View file

@ -25,6 +25,7 @@ Notes:
#include"datatype_decl_plugin.h"
#include"seq_decl_plugin.h"
#include"float_decl_plugin.h"
#include"card_decl_plugin.h"
#include"ast_pp.h"
#include"var_subst.h"
#include"pp.h"
@ -529,6 +530,7 @@ bool cmd_context::logic_has_floats() const {
return !has_logic() || m_logic == "QF_FPA" || m_logic == "QF_FPABV";
}
bool cmd_context::logic_has_array_core(symbol const & s) const {
return
s == "QF_AX" ||
@ -571,6 +573,7 @@ void cmd_context::init_manager_core(bool new_manager) {
register_plugin(symbol("datatype"), alloc(datatype_decl_plugin), logic_has_datatype());
register_plugin(symbol("seq"), alloc(seq_decl_plugin), logic_has_seq());
register_plugin(symbol("float"), alloc(float_decl_plugin), logic_has_floats());
register_plugin(symbol("card"), alloc(card_decl_plugin), !has_logic());
}
else {
// the manager was created by an external module, we must register all plugins available in the manager.

6
src/smt/smt_setup.cpp
View file

@ -31,6 +31,7 @@ Revision History:
#include"theory_dummy.h"
#include"theory_dl.h"
#include"theory_seq_empty.h"
#include"theory_card.h"
namespace smt {
@ -790,6 +791,10 @@ namespace smt {
m_context.register_plugin(alloc(theory_seq_empty, m_manager));
}
void setup::setup_card() {
m_context.register_plugin(alloc(theory_card, m_manager));
}
void setup::setup_unknown() {
setup_arith();
setup_arrays();
@ -797,6 +802,7 @@ namespace smt {
setup_datatypes();
setup_dl();
setup_seq();
setup_card();
}
void setup::setup_unknown(static_features & st) {

2
src/smt/smt_setup.h
View file

@ -92,7 +92,7 @@ namespace smt {
void setup_arith();
void setup_dl();
void setup_seq();
void setup_instgen();
void setup_card();
void setup_i_arith();
void setup_mi_arith();
public:

16
src/opt/theory_card.cpp → src/smt/theory_card.cpp
View file

@ -67,7 +67,12 @@ namespace smt {
else {
bv = ctx.get_bool_var(arg);
}
ctx.set_var_theory(bv, get_id());
if (null_theory_var == ctx.get_var_theory(bv)) {
ctx.set_var_theory(bv, get_id());
}
else {
SASSERT(ctx.get_var_theory(bv) == get_id()); // TBD, fishy
}
add_watch(bv, c);
}
return true;
@ -122,11 +127,11 @@ namespace smt {
case l_true:
case l_undef: {
literal_vector& lits = get_lits();
lits.push_back(literal(v));
for (unsigned i = 0; i < atm->get_num_args() && lits.size() <= k + 1; ++i) {
lits.push_back(~literal(c->m_bv));
for (unsigned i = 0; i < atm->get_num_args() && lits.size() < k + 1; ++i) {
expr* arg = atm->get_arg(i);
if (ctx.get_assignment(arg) == l_true) {
lits.push_back(literal(ctx.get_bool_var(arg)));
lits.push_back(~literal(ctx.get_bool_var(arg)));
}
}
SASSERT(lits.size() == k + 1);
@ -143,7 +148,7 @@ namespace smt {
case l_false:
case l_undef: {
literal_vector& lits = get_lits();
lits.push_back(~literal(v));
lits.push_back(~literal(c->m_bv));
for (unsigned i = 0; i < atm->get_num_args(); ++i) {
expr* arg = atm->get_arg(i);
if (ctx.get_assignment(arg) == l_false) {
@ -266,6 +271,7 @@ namespace smt {
void theory_card::add_clause(literal_vector const& lits) {
context& ctx = get_context();
TRACE("card", ctx.display_literals_verbose(tout, lits.size(), lits.c_ptr()); tout << "\n";);
ctx.mk_th_axiom(get_id(), lits.size(), lits.c_ptr());
}

0
src/opt/theory_card.h → src/smt/theory_card.h
View file