mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-07 11:41:22 +00:00
Code Activity

reorder fields, rename overload name clash

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-08-25 16:01:39 -03:00
parent 64f4c9794d
commit 75a40d8f8e
7 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/smt/smt_internalizer.cpp
View file

@ -1311,7 +1311,7 @@ namespace smt {
The deletion event handler is ignored if binary clause optimization is applicable.
*/
clause * context::mk_clause(unsigned num_lits, literal * lits, justification * j, clause_kind k, clause_del_eh * del_eh) {
TRACE("mk_clause", tout << "creating clause:\n"; display_literals_verbose(tout, num_lits, lits); tout << "\n";);
TRACE("mk_clause", display_literals_verbose(tout << "creating clause: " << literal_vector(num_lits, lits) << "\n", num_lits, lits) << "\n";);
m_clause_proof.add(num_lits, lits, k, j);
switch (k) {
case CLS_AUX:

9
src/smt/theory_seq.cpp
View file

@ -3885,7 +3885,14 @@ std::ostream& theory_seq::display_disequation(std::ostream& out, ne const& e) co
out << "\n";
}
for (unsigned j = 0; j < e.ls().size(); ++j) {
out << e.ls(j) << " != " << e.rs(j) << "\n";
for (expr* t : e.ls(j)) {
out << mk_bounded_pp(t, m) << " ";
}
out << " != ";
for (expr* t : e.rs(j)) {
out << mk_bounded_pp(t, m) << " ";
}
out << "\n";
}
if (e.dep()) {
display_deps(out, e.dep());

2
src/smt/theory_seq.h
View file

@ -268,8 +268,8 @@ namespace smt {
};
class replay_unit_literal : public apply {
bool m_sign;
expr_ref m_e;
bool m_sign;
public:
replay_unit_literal(ast_manager& m, expr* e, bool sign) : m_e(e, m), m_sign(sign) {}
~replay_unit_literal() override {}

4
src/smt/theory_utvpi.h
View file

@ -263,10 +263,10 @@ namespace smt {
void enforce_parity();
void validate_model();
bool eval(expr* e);
void model_validate();
rational eval_num(expr* e);
bool check_z_consistency();

4
src/smt/theory_utvpi_def.h
View file

@ -777,11 +777,11 @@ namespace smt {
enforce_parity();
m_graph.set_to_zero(to_var(m_zero), neg(to_var(m_zero)));
compute_delta();
DEBUG_CODE(validate_model(););
DEBUG_CODE(model_validate(););
}
template<typename Ext>
void theory_utvpi<Ext>::validate_model() {
void theory_utvpi<Ext>::model_validate() {
context& ctx = get_context();
unsigned sz = m_atoms.size();
for (unsigned i = 0; i < sz; ++i) {