mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

fix #1874 by removing nnf.skolemize option

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-10-14 18:17:34 -07:00
parent 70f3fa36c5
commit 5b51e69137
5 changed files with 47 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/sat/sat_solver.cpp
View file

@ -1106,6 +1106,10 @@ namespace sat {
m_restart_threshold = m_config.m_restart_initial;
}
if (reached_max_conflicts()) {
return l_undef;
}
// iff3_finder(*this)();
simplify_problem();
if (check_inconsistent()) return l_false;
@ -1718,17 +1722,6 @@ namespace sat {
#endif
}
unsigned solver::get_hash() const {
unsigned result = 0;
for (clause* cp : m_clauses) {
result = combine_hash(cp->size(), combine_hash(result, cp->id()));
}
for (clause* cp : m_learned) {
result = combine_hash(cp->size(), combine_hash(result, cp->id()));
}
return result;
}
bool solver::set_root(literal l, literal r) {
return !m_ext || m_ext->set_root(l, r);
}

2
src/sat/sat_solver.h
View file

@ -569,8 +569,6 @@ namespace sat {
private:
unsigned get_hash() const;
typedef hashtable<unsigned, u_hash, u_eq> index_set;
u_map<index_set> m_antecedents;