mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-24 20:16:00 +00:00
Code Activity

review and updates

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2022-12-08 14:36:40 -08:00
parent 8c81b64f0f
commit ed5ce1ce5f
1 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/sat/smt/xor_gaussian.cpp
View file

@ -486,12 +486,10 @@ gret EGaussian::init_adjust_matrix() {
// conflict // conflict
if (row.rhs()) { if (row.rhs()) {
m_solver.s().set_conflict(); m_solver.s().set_conflict();
TRACE("xor", tout << "-> empty clause during init_adjust_matrix";); TRACE("xor", tout << "-> empty clause during init_adjust_matrix\n-> conflict on row: " << row_i << "\n");
TRACE("xor", tout << "-> conflict on row: " << row_i;);
return gret::confl; return gret::confl;
} }
TRACE("xor", tout << "-> empty on row: " << row_i;); TRACE("xor", tout << "-> empty on row: " << row_i << "\n-> Satisfied XORs set for row: " << row_i << "\n");
TRACE("xor", tout << "-> Satisfied XORs set for row: " << row_i;);
satisfied_xors[row_i] = true; satisfied_xors[row_i] = true;
break; break;
@ -502,11 +500,11 @@ gret EGaussian::init_adjust_matrix() {
bool xorEqualFalse = !m_mat[row_i].rhs(); bool xorEqualFalse = !m_mat[row_i].rhs();
tmp_clause[0] = literal(tmp_clause[0].var(), xorEqualFalse); tmp_clause[0] = literal(tmp_clause[0].var(), xorEqualFalse);
SASSERT(m_solver.s().value(tmp_clause[0].var()) == l_undef); SASSERT(m_solver.s().value(tmp_clause[0].var()) == l_undef);
// NSB code review: assign_unit?
m_solver.s().assign_scoped(tmp_clause[0]); m_solver.s().assign_scoped(tmp_clause[0]);
TRACE("xor", tout << "-> UNIT during adjust: " << tmp_clause[0];); TRACE("xor", tout << "-> UNIT during adjust: " << tmp_clause[0] << "\n-> Satisfied XORs set for row: " << row_i << "\n");
TRACE("xor", tout << "-> Satisfied XORs set for row: " << row_i;);
satisfied_xors[row_i] = true; satisfied_xors[row_i] = true;
SASSERT(check_row_satisfied(row_i)); SASSERT(check_row_satisfied(row_i));
@ -542,8 +540,9 @@ gret EGaussian::init_adjust_matrix() {
SASSERT(non_resp_var != UINT32_MAX); SASSERT(non_resp_var != UINT32_MAX);
// insert watch list // insert watch list
TRACE("xor", tout << "-> watch 1: resp var " << tmp_clause[0].var()+1 << " for row " << row_i << "\n";); TRACE("xor",
TRACE("xor", tout << "-> watch 2: non-resp var " << non_resp_var+1 << " for row " << row_i << "\n";); tout << "-> watch 1: resp var " << tmp_clause[0].var()+1 << " for row " << row_i << "\n";
tout << "-> watch 2: non-resp var " << non_resp_var+1 << " for row " << row_i << "\n");
m_solver.m_gwatches[tmp_clause[0].var()].push_back( m_solver.m_gwatches[tmp_clause[0].var()].push_back(
gauss_watched(row_i, matrix_no)); // insert basic variable gauss_watched(row_i, matrix_no)); // insert basic variable
m_solver.m_gwatches[non_resp_var].push_back( m_solver.m_gwatches[non_resp_var].push_back(
@ -672,7 +671,7 @@ bool EGaussian::find_truths(
case gret::prop: { case gret::prop: {
find_truth_ret_prop++; find_truth_ret_prop++;
TRACE("xor", tout << "--> propagation";); TRACE("xor", tout << "--> propagation\n");
ws[j++] = ws[i]; ws[j++] = ws[i];
xor_reasons[row_n].m_must_recalc = true; xor_reasons[row_n].m_must_recalc = true;
@ -688,7 +687,7 @@ bool EGaussian::find_truths(
var_has_resp_row[var] = true; var_has_resp_row[var] = true;
} }
TRACE("xor", tout << "--> Satisfied XORs set for row: " << row_n;); TRACE("xor", tout << "--> Satisfied XORs set for row: " << row_n << "\n");
satisfied_xors[row_n] = true; satisfied_xors[row_n] = true;
SASSERT(check_row_satisfied(row_n)); SASSERT(check_row_satisfied(row_n));
return true; return true;
@ -704,8 +703,8 @@ bool EGaussian::find_truths(
/// clear watchlist, because only one responsible value in watchlist /// clear watchlist, because only one responsible value in watchlist
SASSERT(new_resp_var != var); SASSERT(new_resp_var != var);
clear_gwatches(new_resp_var); clear_gwatches(new_resp_var);
TRACE("xor", tout << "Cleared watchlist for new resp var: " << new_resp_var+1;); TRACE("xor", tout << "Cleared watchlist for new resp var: " << new_resp_var+1 << "\n";
TRACE("xor", tout << "After clear...";); tout << "After clear...\n");
} }
SASSERT(new_resp_var != var); SASSERT(new_resp_var != var);
DEBUG_CODE(check_row_not_in_watch(new_resp_var, row_n);); DEBUG_CODE(check_row_not_in_watch(new_resp_var, row_n););
@ -735,7 +734,7 @@ bool EGaussian::find_truths(
// this row already true // this row already true
case gret::nothing_satisfied: case gret::nothing_satisfied:
TRACE("xor", tout << "--> satisfied";); TRACE("xor", tout << "--> satisfied\n");
find_truth_ret_satisfied++; find_truth_ret_satisfied++;
ws[j++] = ws[i]; ws[j++] = ws[i];
@ -744,7 +743,7 @@ bool EGaussian::find_truths(
var_has_resp_row[var] = true; var_has_resp_row[var] = true;
} }
TRACE("xor", tout << "--> Satisfied XORs set for row: " << row_n;); TRACE("xor", tout << "--> Satisfied XORs set for row: " << row_n << "\n");
satisfied_xors[row_n] = true; satisfied_xors[row_n] = true;
SASSERT(check_row_satisfied(row_n)); SASSERT(check_row_satisfied(row_n));
return true; return true;
@ -838,16 +837,14 @@ void EGaussian::eliminate_column(unsigned p, gauss_data& gqd) {
unsigned new_resp_row_n = gqd.new_resp_row; unsigned new_resp_row_n = gqd.new_resp_row;
unsigned new_resp_col = m_var_to_column[gqd.new_resp_var]; unsigned new_resp_col = m_var_to_column[gqd.new_resp_var];
unsigned row_size = m_mat.num_rows(); unsigned row_size = m_mat.num_rows();
unsigned row_i = 0;
elim_called++; elim_called++;
m_mat.display_dense(std::cout) << "\n"; m_mat.display_dense(std::cout) << "\n";
TRACE("xor", m_mat.display_dense(tout) << "\n"); TRACE("xor", m_mat.display_dense(tout) << "\n");
while (row_i < row_size) { for (unsigned row_i = 0; row_i < row_size; ++row_i) {
//Row has a '1' in eliminating column, and it's not the row responsible // Row has a '1' in eliminating column, and it's not the row responsible
PackedRow row = m_mat[row_i]; PackedRow row = m_mat[row_i];
if (new_resp_row_n != row_i && row[new_resp_col]) { if (new_resp_row_n != row_i && row[new_resp_col]) {
@ -857,7 +854,7 @@ void EGaussian::eliminate_column(unsigned p, gauss_data& gqd) {
SASSERT(row[orig_non_resp_col]); SASSERT(row[orig_non_resp_col]);
TRACE("xor", tout << "--> This row " << row_i TRACE("xor", tout << "--> This row " << row_i
<< " is being watched on var: " << orig_non_resp_var + 1 << " is being watched on var: " << orig_non_resp_var + 1
<< " i.e. it must contain '1' for this var's column";); << " i.e. it must contain '1' for this var's column\n");
SASSERT(!satisfied_xors[row_i]); SASSERT(!satisfied_xors[row_i]);
row.xor_in(*(m_mat.begin() + new_resp_row_n)); row.xor_in(*(m_mat.begin() + new_resp_row_n));
@ -896,7 +893,7 @@ void EGaussian::eliminate_column(unsigned p, gauss_data& gqd) {
switch (ret) { switch (ret) {
case gret::confl: { case gret::confl: {
elim_ret_confl++; elim_ret_confl++;
TRACE("xor", tout << "---> conflict during eliminate_column's fixup";); TRACE("xor", tout << "---> conflict during eliminate_column's fixup\n");
m_solver.m_gwatches[p].push_back(gauss_watched(row_i, matrix_no)); m_solver.m_gwatches[p].push_back(gauss_watched(row_i, matrix_no));
// update in this row non-basic variable // update in this row non-basic variable
@ -911,7 +908,7 @@ void EGaussian::eliminate_column(unsigned p, gauss_data& gqd) {
} }
case gret::prop: { case gret::prop: {
elim_ret_prop++; elim_ret_prop++;
TRACE("xor", tout << "---> propagation during eliminate_column's fixup";); TRACE("xor", tout << "---> propagation during eliminate_column's fixup\n");
// if conflicted already, just update non-basic variable // if conflicted already, just update non-basic variable
if (gqd.status == gauss_res::confl) { if (gqd.status == gauss_res::confl) {
@ -934,7 +931,7 @@ void EGaussian::eliminate_column(unsigned p, gauss_data& gqd) {
update_cols_vals_set(ret_lit_prop); update_cols_vals_set(ret_lit_prop);
gqd.status = gauss_res::prop; gqd.status = gauss_res::prop;
TRACE("xor", tout << "---> Satisfied XORs set for row: " << row_i;); TRACE("xor", tout << "---> Satisfied XORs set for row: " << row_i << "\n");
satisfied_xors[row_i] = true; satisfied_xors[row_i] = true;
SASSERT(check_row_satisfied(row_i)); SASSERT(check_row_satisfied(row_i));
break; break;
@ -961,7 +958,7 @@ void EGaussian::eliminate_column(unsigned p, gauss_data& gqd) {
m_solver.m_gwatches[p].push_back(gauss_watched(row_i, matrix_no)); m_solver.m_gwatches[p].push_back(gauss_watched(row_i, matrix_no));
row_to_var_non_resp[row_i] = p; row_to_var_non_resp[row_i] = p;
TRACE("xor", tout << "---> Satisfied XORs set for row: " << row_i;); TRACE("xor", tout << "---> Satisfied XORs set for row: " << row_i << "\n");
satisfied_xors[row_i] = true; satisfied_xors[row_i] = true;
SASSERT(check_row_satisfied(row_i)); SASSERT(check_row_satisfied(row_i));
break; break;
@ -971,10 +968,9 @@ void EGaussian::eliminate_column(unsigned p, gauss_data& gqd) {
break; break;
} }
} else { } else {
TRACE("xor", tout << "--> OK, this row " << row_i << " still contains '1', can still be responsible";); TRACE("xor", tout << "--> OK, this row " << row_i << " still contains '1', can still be responsible\n");
} }
} }
row_i++;
m_mat.display_dense(std::cout) << "\n"; m_mat.display_dense(std::cout) << "\n";
TRACE("xor", m_mat.display_dense(tout) << "\n"); TRACE("xor", m_mat.display_dense(tout) << "\n");