mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-06-04 16:10:50 +00:00
Code Activity

Optimize bitwise_or_rows and simplify constructor initialization

Browse source 
Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-01-19 02:25:02 +00:00
parent e3c1610335
commit 1c6ffd2161
1 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/smt/theory_finite_set_lattice_refutation.cpp
View file

@ -25,7 +25,7 @@ namespace smt {
non_link_justifications(MAX_VARS * MAX_VARS, {nullptr, nullptr}), largest_var(0), non_link_justifications(MAX_VARS * MAX_VARS, {nullptr, nullptr}), largest_var(0),
max_size(MAX_VARS), ctx(ctx), t_lattice_refutation(t_lattice) { max_size(MAX_VARS), ctx(ctx), t_lattice_refutation(t_lattice) {
// Initialize the vectors // Initialize the vectors
link_dls.resize(MAX_VARS * MAX_VARS, static_cast<unsigned>(0)); link_dls.resize(MAX_VARS * MAX_VARS, 0);
for (int i = 0; i < MAX_VARS; i++) { for (int i = 0; i < MAX_VARS; i++) {
reachable[i].reset(); reachable[i].reset();
non_links[i].reset(); non_links[i].reset();
@ -53,26 +53,36 @@ namespace smt {
} }
bool reachability_matrix::bitwise_or_rows(int source_dest, int source) { bool reachability_matrix::bitwise_or_rows(int source_dest, int source) {
// Save old state before modification // Check if there's anything to add
uint_set old_reachable = reachable[source_dest]; bool has_new_elements = false;
for (unsigned dest : reachable[source]) {
if (!reachable[source_dest].contains(dest)) {
has_new_elements = true;
break;
}
}
// Push trail before modifying if (!has_new_elements) {
return false;
}
// Push trail before modifying (captures current state for undo)
ctx.push_trail(value_trail(reachable[source_dest])); ctx.push_trail(value_trail(reachable[source_dest]));
// Save elements before modification for conflict checking
uint_set old_reachable = reachable[source_dest];
// Compute union: reachable[source_dest] |= reachable[source] // Compute union: reachable[source_dest] |= reachable[source]
reachable[source_dest] |= reachable[source]; reachable[source_dest] |= reachable[source];
// Check if anything changed // Check for conflicts with newly added reachabilities
bool changes = !(old_reachable == reachable[source_dest]); for (unsigned dest : reachable[source_dest]) {
if (changes) { if (!old_reachable.contains(dest)) {
// Check for conflicts with newly added reachabilities check_reachability_conflict(source_dest, dest);
for (unsigned dest : reachable[source_dest]) {
if (!old_reachable.contains(dest)) {
check_reachability_conflict(source_dest, dest);
}
} }
} }
return changes;
return true;
} }
bool reachability_matrix::set_reachability(theory_var source, theory_var dest, enode_pair reachability_witness) { bool reachability_matrix::set_reachability(theory_var source, theory_var dest, enode_pair reachability_witness) {