mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-02-10 11:00:52 +00:00
Code Activity

Refactor counter::get_max_positive to use std::optional (#8289)

Browse source 
* Initial plan

* Refactor counter::get_max_positive to use std::optional

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

* Fix C++17 compatibility by replacing transform() with has_value()/value()

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

* Address code review: avoid calling get_max_positive twice

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>
This commit is contained in:
Copilot 2026-01-22 17:39:53 -08:00 • committed by GitHub
parent 6feb3391a2
commit 7f91a3321d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/muz/base/dl_util.cpp
View file

@ -486,7 +486,7 @@ namespace datalog {
DEBUG_CODE(
counter ctr;
ctr.count(permutation);
SASSERT(permutation.empty() || ctr.get_max_positive()==permutation.size()-1);
SASSERT(permutation.empty() || ctr.get_max_positive().value_or(0)==permutation.size()-1);
SASSERT(permutation.empty() || ctr.get_positive_count()==permutation.size());
);
unsigned sz = permutation.size();

6
src/muz/rel/dl_mk_explanations.cpp
View file

@ -585,7 +585,7 @@ namespace datalog {
}
counter ctr;
ctr.count(joined_col_cnt, tgt_cols);
if (ctr.get_max_counter_value()>1 || (joined_col_cnt && ctr.get_max_positive()!=joined_col_cnt-1)) {
if (ctr.get_max_counter_value()>1 || (joined_col_cnt && ctr.get_max_positive().value_or(0)!=joined_col_cnt-1)) {
return nullptr;
}
return alloc(intersection_filter_fn, *this);
@ -712,8 +712,8 @@ namespace datalog {
rule * mk_explanations::get_e_rule(rule * r) {
rule_counter ctr;
ctr.count_rule_vars(r);
unsigned max_var;
unsigned next_var = ctr.get_max_positive(max_var) ? (max_var+1) : 0;
auto max_var = ctr.get_max_positive();
unsigned next_var = max_var.has_value() ? (*max_var + 1) : 0;
unsigned head_var = next_var++;
app_ref e_head(get_e_lit(r->get_head(), head_var), m_manager);

6
src/muz/rel/dl_mk_similarity_compressor.cpp
View file

@ -382,9 +382,9 @@ namespace datalog {
rule_counter ctr;
ctr.count_rule_vars(r);
unsigned max_var_idx, new_var_idx_base;
if (ctr.get_max_positive(max_var_idx)) {
new_var_idx_base = max_var_idx+1;
unsigned new_var_idx_base;
if (auto max_var_idx = ctr.get_max_positive()) {
new_var_idx_base = *max_var_idx + 1;
}
else {
new_var_idx_base = 0;

10
src/muz/rel/dl_sparse_table.cpp
View file

@ -386,7 +386,7 @@ namespace datalog {
}
counter ctr;
ctr.count(key_len, key_cols);
if (ctr.get_max_counter_value()!=1 || ctr.get_max_positive()!=non_func_cols-1) {
if (ctr.get_max_counter_value()!=1 || ctr.get_max_positive().value_or(0)!=non_func_cols-1) {
return false;
}
SASSERT(ctr.get_positive_count() == non_func_cols);
@ -467,7 +467,7 @@ namespace datalog {
//Maybe we might keep a list of indexes that contain functional columns and on an update reset
//only those.
SASSERT(key_len == 0 ||
counter().count(key_len, key_cols).get_max_positive()<get_signature().first_functional());
counter().count(key_len, key_cols).get_max_positive().value_or(0)<get_signature().first_functional());
#endif
key_spec kspec;
kspec.append(key_len, key_cols);
@ -808,8 +808,8 @@ namespace datalog {
if (col_cnt == 0) {
return false;
}
return counter().count(col_cnt, cols1).get_max_positive()>=s1.first_functional()
|| counter().count(col_cnt, cols2).get_max_positive()>=s2.first_functional();
return counter().count(col_cnt, cols1).get_max_positive().value_or(0)>=s1.first_functional()
|| counter().count(col_cnt, cols2).get_max_positive().value_or(0)>=s2.first_functional();
}
@ -1138,7 +1138,7 @@ namespace datalog {
ctr.count(m_cols2);
m_joining_neg_non_functional = ctr.get_max_counter_value() == 1
&& ctr.get_positive_count() == neg_first_func
&& (neg_first_func == 0 || ctr.get_max_positive() == neg_first_func-1);
&& (neg_first_func == 0 || ctr.get_max_positive().value_or(0) == neg_first_func-1);
}
/**