mirror of
https://github.com/Z3Prover/z3
synced 2025-10-30 11:12:28 +00:00
Fix finite_set sort cardinality computation for finite base sorts (#7997)
* Initial plan * Implement cardinality computation for finite_set sorts - Modified mk_sort in finite_set_decl_plugin.cpp to compute 2^|s| for finite base sorts - If base sort size > 30, mark finite_set sort as very_big - Added comprehensive tests to verify sort size calculations - All tests pass successfully Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com> * Update finite_set_decl_plugin.cpp * Fix unit tests for infinite base sorts Updated test to check is_infinite() instead of is_very_big() for FiniteSet(Int) since infinite element sorts now result in infinite FiniteSet sorts (not very_big). Also updated comment to clarify the behavior. 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> Co-authored-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
69e0793f6c
commit
bfe6670b73
2 changed files with 81 additions and 1 deletions
|
|
@ -85,7 +85,26 @@ sort * finite_set_decl_plugin::mk_sort(decl_kind k, unsigned num_parameters, par
|
|||
return nullptr;
|
||||
}
|
||||
sort * element_sort = to_sort(parameters[0].get_ast());
|
||||
sort_size sz = sort_size::mk_very_big();
|
||||
sort_size sz;
|
||||
|
||||
// Compute the size of the finite_set sort based on the element sort
|
||||
sort_size const& elem_sz = element_sort->get_num_elements();
|
||||
if (elem_sz.is_finite() && !elem_sz.is_very_big()) {
|
||||
uint64_t elem_size = elem_sz.size();
|
||||
// If elem_size > 30, the powerset would be > 2^30, so mark as very_big
|
||||
if (elem_size > 30) {
|
||||
sz = sort_size::mk_very_big();
|
||||
}
|
||||
else {
|
||||
// Compute 2^elem_size
|
||||
sz = sort_size(rational::power_of_two(static_cast<unsigned>(elem_size)));
|
||||
}
|
||||
}
|
||||
else {
|
||||
// If element sort is infinite or very_big, the finite_set has the same size
|
||||
sz = elem_sz;
|
||||
}
|
||||
|
||||
sort_info info(m_family_id, FINITE_SET_SORT, sz, num_parameters, parameters);
|
||||
return m_manager->mk_sort(symbol("FiniteSet"), info);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -217,9 +217,70 @@ static void tst_finite_set_is_fully_interp() {
|
|||
ENSURE(!m.is_fully_interp(finite_set_uninterp));
|
||||
}
|
||||
|
||||
static void tst_finite_set_sort_size() {
|
||||
ast_manager m;
|
||||
reg_decl_plugins(m);
|
||||
|
||||
finite_set_util fsets(m);
|
||||
|
||||
// Test 1: Bool sort (size 2) -> FiniteSet(Bool) should have size 2^2 = 4
|
||||
sort_ref bool_sort(m.mk_bool_sort(), m);
|
||||
parameter bool_param(bool_sort.get());
|
||||
sort_ref finite_set_bool(m.mk_sort(fsets.get_family_id(), FINITE_SET_SORT, 1, &bool_param), m);
|
||||
|
||||
sort_size const& bool_set_sz = finite_set_bool->get_num_elements();
|
||||
ENSURE(bool_set_sz.is_finite());
|
||||
ENSURE(!bool_set_sz.is_very_big());
|
||||
ENSURE(bool_set_sz.size() == 4); // 2^2 = 4
|
||||
|
||||
// Test 2: Create a finite sort with known size (e.g., BV with size 3)
|
||||
// BV[3] has 2^3 = 8 elements, so FiniteSet(BV[3]) should have 2^8 = 256 elements
|
||||
parameter bv_param(3);
|
||||
sort_ref bv3_sort(m.mk_sort(m.mk_family_id("bv"), 0, 1, &bv_param), m);
|
||||
parameter bv3_param(bv3_sort.get());
|
||||
sort_ref finite_set_bv3(m.mk_sort(fsets.get_family_id(), FINITE_SET_SORT, 1, &bv3_param), m);
|
||||
|
||||
sort_size const& bv3_set_sz = finite_set_bv3->get_num_elements();
|
||||
ENSURE(bv3_set_sz.is_finite());
|
||||
ENSURE(!bv3_set_sz.is_very_big());
|
||||
ENSURE(bv3_set_sz.size() == 256); // 2^8 = 256
|
||||
|
||||
// Test 3: BV with size 5 -> BV[5] has 2^5 = 32 elements
|
||||
// Since 32 > 30, FiniteSet(BV[5]) should be marked as very_big
|
||||
parameter bv5_param(5);
|
||||
sort_ref bv5_sort(m.mk_sort(m.mk_family_id("bv"), 0, 1, &bv5_param), m);
|
||||
parameter bv5_set_param(bv5_sort.get());
|
||||
sort_ref finite_set_bv5(m.mk_sort(fsets.get_family_id(), FINITE_SET_SORT, 1, &bv5_set_param), m);
|
||||
|
||||
sort_size const& bv5_set_sz = finite_set_bv5->get_num_elements();
|
||||
ENSURE(bv5_set_sz.is_very_big());
|
||||
|
||||
// Test 4: Int sort (infinite) -> FiniteSet(Int) should be infinite
|
||||
arith_util arith(m);
|
||||
sort_ref int_sort(arith.mk_int(), m);
|
||||
parameter int_param(int_sort.get());
|
||||
sort_ref finite_set_int(m.mk_sort(fsets.get_family_id(), FINITE_SET_SORT, 1, &int_param), m);
|
||||
|
||||
sort_size const& int_set_sz = finite_set_int->get_num_elements();
|
||||
ENSURE(int_set_sz.is_infinite());
|
||||
|
||||
// Test 5: BV with size 4 -> BV[4] has 2^4 = 16 elements
|
||||
// FiniteSet(BV[4]) should have 2^16 = 65536 elements
|
||||
parameter bv4_param(4);
|
||||
sort_ref bv4_sort(m.mk_sort(m.mk_family_id("bv"), 0, 1, &bv4_param), m);
|
||||
parameter bv4_set_param(bv4_sort.get());
|
||||
sort_ref finite_set_bv4(m.mk_sort(fsets.get_family_id(), FINITE_SET_SORT, 1, &bv4_set_param), m);
|
||||
|
||||
sort_size const& bv4_set_sz = finite_set_bv4->get_num_elements();
|
||||
ENSURE(bv4_set_sz.is_finite());
|
||||
ENSURE(!bv4_set_sz.is_very_big());
|
||||
ENSURE(bv4_set_sz.size() == 65536); // 2^16 = 65536
|
||||
}
|
||||
|
||||
void tst_finite_set() {
|
||||
tst_finite_set_basic();
|
||||
tst_finite_set_map_filter();
|
||||
tst_finite_set_is_value();
|
||||
tst_finite_set_is_fully_interp();
|
||||
tst_finite_set_sort_size();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue