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

Added parameter to select string update function

Browse source
This commit is contained in:
CEisenhofer 2024-12-30 10:24:07 +01:00
parent 85c5feb0b2
commit b42217204a
3 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/ast/sls/sls_seq_plugin.cpp
View file

@ -95,6 +95,7 @@ Equality solving using stochastic Nelson.
#include "ast/sls/sls_seq_plugin.h" #include "ast/sls/sls_seq_plugin.h"
#include "ast/sls/sls_context.h" #include "ast/sls/sls_context.h"
#include "ast/ast_pp.h" #include "ast/ast_pp.h"
#include "params/sls_params.hpp"
namespace sls { namespace sls {
@ -114,6 +115,8 @@ namespace sls {
thrw(c.get_manager()) thrw(c.get_manager())
{ {
m_fid = seq.get_family_id(); m_fid = seq.get_family_id();
sls_params p(c.get_params());
m_str_update_strategy = p.str_update_strategy() == 0 ? EDIT_CHAR : EDIT_SUBSTR;
} }
void seq_plugin::propagate_literal(sat::literal lit) { void seq_plugin::propagate_literal(sat::literal lit) {
@ -672,6 +675,12 @@ namespace sls {
return d[n][m]; return d[n][m];
} }
void seq_plugin::add_edit_updates(ptr_vector<expr> const& w, zstring const& val, zstring const& val_other, uint_set const& chars) {
if (m_str_update_strategy == EDIT_CHAR)
add_char_edit_updates(w, val, val_other, chars);
else
add_substr_edit_updates(w, val, val_other, chars);
}
void seq_plugin::add_substr_edit_updates(ptr_vector<expr> const& w, zstring const& val, zstring const& val_other, uint_set const& chars) { void seq_plugin::add_substr_edit_updates(ptr_vector<expr> const& w, zstring const& val, zstring const& val_other, uint_set const& chars) {
// all consecutive subsequences of val_other // all consecutive subsequences of val_other
@ -701,7 +710,7 @@ namespace sls {
} }
} }
void seq_plugin::add_step_edit_updates(ptr_vector<expr> const& w, zstring const& val, zstring const& val_other, uint_set const& chars) { void seq_plugin::add_char_edit_updates(ptr_vector<expr> const& w, zstring const& val, zstring const& val_other, uint_set const& chars) {
for (auto x : w) { for (auto x : w) {
if (is_value(x)) if (is_value(x))
continue; continue;
@ -991,11 +1000,8 @@ namespace sls {
//verbose_stream() << "solve: " << diff << " " << a << " " << b << "\n"; //verbose_stream() << "solve: " << diff << " " << a << " " << b << "\n";
// add_step_edit_updates(L, a, b, b_chars); add_edit_updates(L, a, b, b_chars);
// add_step_edit_updates(R, b, a, a_chars); add_edit_updates(R, b, a, a_chars);
add_substr_edit_updates(L, a, b, b_chars);
add_substr_edit_updates(R, b, a, a_chars);
for (auto& [x, s, score] : m_str_updates) { for (auto& [x, s, score] : m_str_updates) {
a.reset(); a.reset();
@ -1474,13 +1480,13 @@ namespace sls {
if (idx > 0) if (idx > 0)
su = sa.extract(0, idx); su = sa.extract(0, idx);
su = su + sa.extract(idx + sb.length(), sa.length() - idx - sb.length()); su = su + sa.extract(idx + sb.length(), sa.length() - idx - sb.length());
m_str_updates.push_back({a, su, 1}); m_str_updates.push_back({ a, su, 1});
} }
if (!m_chars.empty() && !is_value(b)) { if (!m_chars.empty() && !is_value(b)) {
zstring sb1 = sb + zstring(m_chars[ctx.rand(m_chars.size())]); zstring sb1 = sb + zstring(m_chars[ctx.rand(m_chars.size())]);
zstring sb2 = zstring(m_chars[ctx.rand(m_chars.size())]) + sb; zstring sb2 = zstring(m_chars[ctx.rand(m_chars.size())]) + sb;
m_str_updates.push_back({b, sb1, 1}); m_str_updates.push_back({ b, sb1, 1});
m_str_updates.push_back({b, sb2, 1}); m_str_updates.push_back({ b, sb2, 1});
} }
} }
return apply_update(); return apply_update();
@ -1525,8 +1531,7 @@ namespace sls {
for (auto ch : value0) for (auto ch : value0)
chars.insert(ch); chars.insert(ch);
// add_step_edit_updates(es, value, value0, chars); add_edit_updates(es, value, value0, chars);
add_substr_edit_updates(es, value, value0, chars);
unsigned diff = edit_distance(value, value0); unsigned diff = edit_distance(value, value0);
for (auto& [x, s, score] : m_str_updates) { for (auto& [x, s, score] : m_str_updates) {

9
src/ast/sls/sls_seq_plugin.h
View file

@ -42,6 +42,11 @@ namespace sls {
ptr_vector<expr> lhs, rhs; ptr_vector<expr> lhs, rhs;
}; };
enum edit_distance_strategy {
EDIT_CHAR,
EDIT_SUBSTR,
};
seq_util seq; seq_util seq;
arith_util a; arith_util a;
seq_rewriter rw; seq_rewriter rw;
@ -49,6 +54,7 @@ namespace sls {
scoped_ptr_vector<eval> m_values; scoped_ptr_vector<eval> m_values;
indexed_uint_set m_chars; // set of characters in the problem indexed_uint_set m_chars; // set of characters in the problem
bool m_initialized = false; bool m_initialized = false;
edit_distance_strategy m_str_update_strategy;
struct str_update { struct str_update {
expr* e; expr* e;
@ -121,7 +127,8 @@ namespace sls {
void init_string_instance(ptr_vector<expr> const& es, string_instance& a); void init_string_instance(ptr_vector<expr> const& es, string_instance& a);
unsigned edit_distance_with_updates(string_instance const& a, string_instance const& b); unsigned edit_distance_with_updates(string_instance const& a, string_instance const& b);
unsigned edit_distance(zstring const& a, zstring const& b); unsigned edit_distance(zstring const& a, zstring const& b);
void add_step_edit_updates(ptr_vector<expr> const& w, zstring const& val, zstring const& val_other, uint_set const& chars); void add_edit_updates(ptr_vector<expr> const& w, zstring const& val, zstring const& val_other, uint_set const& chars);
void add_char_edit_updates(ptr_vector<expr> const& w, zstring const& val, zstring const& val_other, uint_set const& chars);
void add_substr_edit_updates(ptr_vector<expr> const& w, zstring const& val, zstring const& val_other, uint_set const& chars); void add_substr_edit_updates(ptr_vector<expr> const& w, zstring const& val, zstring const& val_other, uint_set const& chars);
// regex functionality // regex functionality

3
src/params/sls_params.pyg
View file

@ -24,5 +24,6 @@ def_module_params('sls',
('rescore', BOOL, 1, 'rescore/normalize top-level score every base restart interval'), ('rescore', BOOL, 1, 'rescore/normalize top-level score every base restart interval'),
('dt_axiomatic', BOOL, True, 'use axiomatic mode or model reduction for datatype solver'), ('dt_axiomatic', BOOL, True, 'use axiomatic mode or model reduction for datatype solver'),
('track_unsat', BOOL, 0, 'keep a list of unsat assertions as done in SAT - currently disabled internally'), ('track_unsat', BOOL, 0, 'keep a list of unsat assertions as done in SAT - currently disabled internally'),
('random_seed', UINT, 0, 'random seed') ('random_seed', UINT, 0, 'random seed'),
('str_update_strategy', UINT, 1, 'string update candidate selection: 0 - single character based update, 1 - subsequence based update')
)) ))