mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-31 11:42:28 +00:00
Code Activity

Rename set.select to set.filter and OP_FINITE_SET_SELECT to OP_FINITE_SET_FILTER (#7989)

Browse source 
* Initial plan

* Rename set.select to set.filter and OP_FINITE_SET_SELECT to OP_FINITE_SET_FILTER

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:
Copilot 2025-10-18 17:16:32 +02:00 • committed by GitHub
parent ba5bc90d7c
commit eb10ab1633
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ast/finite_set_decl_plugin.cpp
View file

@ -68,7 +68,7 @@ void finite_set_decl_plugin::init() {
m_sigs[OP_FINITE_SET_SIZE] = alloc(polymorphism::psig, m, "set.size", 1, 1, &setA, intT);
m_sigs[OP_FINITE_SET_SUBSET] = alloc(polymorphism::psig, m, "set.subset", 1, 2, setAsetA, boolT);
m_sigs[OP_FINITE_SET_MAP] = alloc(polymorphism::psig, m, "set.map", 2, 2, arrABsetA, setB);
m_sigs[OP_FINITE_SET_SELECT] = alloc(polymorphism::psig, m, "set.select", 1, 2, arrABoolsetA, setA);
m_sigs[OP_FINITE_SET_FILTER] = alloc(polymorphism::psig, m, "set.filter", 1, 2, arrABoolsetA, setA);
m_sigs[OP_FINITE_SET_RANGE] = alloc(polymorphism::psig, m, "set.range", 0, 2, intintT, setInt);
m_sigs[OP_FINITE_SET_DIFF] = alloc(polymorphism::psig, m, "set.diff", 1, 2, setAsetA, A);
// m_sigs[OP_FINITE_SET_MAP_INVERSE] = alloc(polymorphism::psig, m, "set.map_inverse", 2, 3, arrABsetBsetA, A);
@ -158,7 +158,7 @@ func_decl * finite_set_decl_plugin::mk_func_decl(decl_kind k, unsigned num_param
case OP_FINITE_SET_SIZE:
case OP_FINITE_SET_SUBSET:
case OP_FINITE_SET_MAP:
case OP_FINITE_SET_SELECT:
case OP_FINITE_SET_FILTER:
case OP_FINITE_SET_RANGE:
case OP_FINITE_SET_DIFF:
return mk_finite_set_op(k, arity, domain, range);

12
src/ast/finite_set_decl_plugin.h
View file

@ -21,7 +21,7 @@ Operators:
set.size : (FiniteSet S) -> Int
set.subset : (FiniteSet S) (FiniteSet S) -> Bool
set.map : (S -> T) (FiniteSet S) -> (FiniteSet T)
set.select : (S -> Bool) (FiniteSet S) -> (FiniteSet S)
set.filter : (S -> Bool) (FiniteSet S) -> (FiniteSet S)
set.range : Int Int -> (FiniteSet Int)
set.diff : (FiniteSet S) (FiniteSet S) -> S
@ -45,7 +45,7 @@ enum finite_set_op_kind {
OP_FINITE_SET_SIZE,
OP_FINITE_SET_SUBSET,
OP_FINITE_SET_MAP,
OP_FINITE_SET_SELECT,
OP_FINITE_SET_FILTER,
OP_FINITE_SET_RANGE,
OP_FINITE_SET_DIFF,
OP_FINITE_SET_MAP_INVERSE,
@ -131,7 +131,7 @@ public:
bool is_size(expr const* n) const { return is_app_of(n, m_fid, OP_FINITE_SET_SIZE); }
bool is_subset(expr const* n) const { return is_app_of(n, m_fid, OP_FINITE_SET_SUBSET); }
bool is_map(expr const* n) const { return is_app_of(n, m_fid, OP_FINITE_SET_MAP); }
bool is_select(expr const* n) const { return is_app_of(n, m_fid, OP_FINITE_SET_SELECT); }
bool is_filter(expr const* n) const { return is_app_of(n, m_fid, OP_FINITE_SET_FILTER); }
bool is_range(expr const* n) const { return is_app_of(n, m_fid, OP_FINITE_SET_RANGE); }
MATCH_UNARY(is_singleton);
@ -142,7 +142,7 @@ public:
MATCH_BINARY(is_in);
MATCH_BINARY(is_subset);
MATCH_BINARY(is_map);
MATCH_BINARY(is_select);
MATCH_BINARY(is_filter);
MATCH_BINARY(is_range);
};
@ -191,8 +191,8 @@ public:
return m_manager.mk_app(m_fid, OP_FINITE_SET_MAP, arr, set);
}
app * mk_select(expr* arr, expr* set) {
return m_manager.mk_app(m_fid, OP_FINITE_SET_SELECT, arr, set);
app * mk_filter(expr* arr, expr* set) {
return m_manager.mk_app(m_fid, OP_FINITE_SET_FILTER, arr, set);
}
app * mk_range(expr* low, expr* high) {

6
src/ast/rewriter/finite_set_axioms.cpp
View file

@ -230,11 +230,11 @@ void finite_set_axioms::in_map_image_axiom(expr *x, expr *a) {
m_add_clause(clause);
}
// a := set.select(p, b)
// a := set.filter(p, b)
// (x in a) <=> (x in b) and p(x)
void finite_set_axioms::in_select_axiom(expr *x, expr *a) {
void finite_set_axioms::in_filter_axiom(expr *x, expr *a) {
expr* p = nullptr, *b = nullptr;
if (!u.is_select(a, p, b))
if (!u.is_filter(a, p, b))
return;
expr_ref x_in_a(u.mk_in(x, a), m);

4
src/ast/rewriter/finite_set_axioms.h
View file

@ -57,9 +57,9 @@ public:
// (x in b) => f(x) in a
void in_map_image_axiom(expr *x, expr *a);
// a := set.select(p, b)
// a := set.filter(p, b)
// (x in a) <=> (x in b) and p(x)
void in_select_axiom(expr *x, expr *a);
void in_filter_axiom(expr *x, expr *a);
// a := set.subset(b, c)
// (a) <=> (set.intersect(b, c) = b)

4
src/smt/theory_finite_set.cpp
View file

@ -561,8 +561,8 @@ namespace smt {
m_axioms.in_map_axiom(elem, set);
m_axioms.in_map_image_axiom(elem, set);
}
else if (u.is_select(set)) {
m_axioms.in_select_axiom(elem, set);
else if (u.is_filter(set)) {
m_axioms.in_filter_axiom(elem, set);
}
}

3
src/smt/theory_finite_set.h
View file

@ -53,7 +53,8 @@ Abstract:
-----------------------------------------------
x in v4 => f(x) in v3
x in v1 a tern, v1 ~ v3, v3 := (set.select p v4)
x in v1 is a term, v1 ~ v3, v3 == (set.filter p v4)
-----------------------------------------------
x in v3 <=> p(x) and x in v4

16
src/test/finite_set.cpp
View file

@ -85,7 +85,7 @@ static void tst_finite_set_basic() {
ENSURE(m.is_bool(subset_expr->get_sort()));
}
static void tst_finite_set_map_select() {
static void tst_finite_set_map_filter() {
ast_manager m;
reg_decl_plugins(m);
@ -116,15 +116,15 @@ static void tst_finite_set_map_select() {
ENSURE(fsets.is_map(mapped_set.get()));
ENSURE(fsets.is_finite_set(mapped_set->get_sort()));
// Create Array (Int Bool) sort for select
// Create Array (Int Bool) sort for filter
sort_ref arr_int_bool(autil.mk_array_sort(int_sort, bool_sort), m);
// Create a const array for select (conceptually represents predicate)
app_ref arr_select(autil.mk_const_array(arr_int_bool, m.mk_true()), m);
// Create a const array for filter (conceptually represents predicate)
app_ref arr_filter(autil.mk_const_array(arr_int_bool, m.mk_true()), m);
app_ref selected_set(fsets.mk_select(arr_select, range_set), m);
ENSURE(fsets.is_select(selected_set.get()));
ENSURE(selected_set->get_sort() == finite_set_int.get());
app_ref filtered_set(fsets.mk_filter(arr_filter, range_set), m);
ENSURE(fsets.is_filter(filtered_set.get()));
ENSURE(filtered_set->get_sort() == finite_set_int.get());
}
static void tst_finite_set_is_value() {
@ -221,7 +221,7 @@ static void tst_finite_set_is_fully_interp() {
void tst_finite_set() {
tst_finite_set_basic();
tst_finite_set_map_select();
tst_finite_set_map_filter();
tst_finite_set_is_value();
tst_finite_set_is_fully_interp();
}