mirror of
https://github.com/Z3Prover/z3
synced 2025-04-14 21:08:46 +00:00
update scoring approach
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
99f2d916d5
commit
f009dfcc00
|
@ -1452,9 +1452,9 @@ namespace sat {
|
||||||
for (nary* n : m_nary[(~l).index()]) {
|
for (nary* n : m_nary[(~l).index()]) {
|
||||||
if (sz-- == 0) break;
|
if (sz-- == 0) break;
|
||||||
unsigned nonfixed = n->dec_size();
|
unsigned nonfixed = n->dec_size();
|
||||||
if (is_true(n->get_head())) continue;
|
// if (is_true(n->get_head())) continue;
|
||||||
if (inconsistent()) continue;
|
if (inconsistent()) continue;
|
||||||
if (nonfixed <= 1) {
|
if (nonfixed <= 1 && !is_true(n->get_head())) {
|
||||||
bool found_conflict = true;
|
bool found_conflict = true;
|
||||||
for (literal lit : *n) {
|
for (literal lit : *n) {
|
||||||
if (!is_fixed(lit)) {
|
if (!is_fixed(lit)) {
|
||||||
|
@ -1473,7 +1473,7 @@ namespace sat {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (m_search_mode == lookahead_mode::lookahead1) {
|
if (m_search_mode == lookahead_mode::lookahead1) {
|
||||||
SASSERT(nonfixed >= 2);
|
SASSERT(nonfixed >= 2);
|
||||||
switch (m_config.m_reward_type) {
|
switch (m_config.m_reward_type) {
|
||||||
case heule_schur_reward: {
|
case heule_schur_reward: {
|
||||||
|
|
Loading…
Reference in a new issue