Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple regex membership heuristic #139

Merged
merged 11 commits into from
May 1, 2024
Merged

Multiple regex membership heuristic #139

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a7383e3
specific handling of only regex stuff
jurajsic May 1, 2024
914a49e
small fix
jurajsic May 1, 2024
0d3b63f
replace trivial disequations with regex memebership immediately
jurajsic May 1, 2024
f517667
handle trivial (dis)eqs in multiple regex membership heuristic
jurajsic May 1, 2024
becf8c1
ignore len vars
jurajsic May 1, 2024
da892c5
sort by regex loop size and not by automata size
jurajsic May 1, 2024
e2f30a8
add comments
jurajsic May 1, 2024
0c80964
small fix
jurajsic May 1, 2024
60c4a76
small fix
jurajsic May 1, 2024
644ec39
move lambda computing loops sum to its own function
jurajsic May 1, 2024
7380a2a
fix condition for checking mult membs suitability
jurajsic May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
replace trivial disequations with regex memebership immediately
  • Loading branch information
@jurajsic
jurajsic committed May 1, 2024
commit 0d3b63fe2d60e40181bb7be8073717420b374c24
22 changes: 17 additions & 5 deletions src/smt/theory_str_noodler/theory_str_noodler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,10 +775,6 @@ namespace smt::noodler {
}
);

bool contains_word_equations = !this->m_word_eq_todo_rel.empty();
bool contains_word_disequations = !this->m_word_diseq_todo_rel.empty();
bool contains_conversions = !this->m_conversion_todo.empty();

// Solve Language (dis)equations
if (!solve_lang_eqs_diseqs()) {
// one of the (dis)equations is unsat
Expand All @@ -799,6 +795,20 @@ namespace smt::noodler {
}
}

vector<expr_pair> new_m_word_diseq_todo_rel;
for (const auto& diseq : m_word_diseq_todo_rel) {
if (util::is_str_variable(diseq.first, m_util_s) && m_util_s.str.is_string(diseq.second)) {
m_membership_todo_rel.push_back({diseq.first, expr_ref(m_util_s.re.mk_to_re(diseq.second), m), false});
} else {
new_m_word_diseq_todo_rel.push_back(diseq);
}
}
m_word_diseq_todo_rel = std::move(new_m_word_diseq_todo_rel);

bool contains_word_equations = !this->m_word_eq_todo_rel.empty();
bool contains_word_disequations = !this->m_word_diseq_todo_rel.empty();
bool contains_conversions = !this->m_conversion_todo.empty();

// As a heuristic, for the case we have exactly one constraint, which is of type 'x notin RE', we use universality
// checking instead of constructing the automaton for complement of RE. The complement can sometimes blow up, so
// universality checking should be faster.
Expand Down Expand Up @@ -832,7 +842,9 @@ namespace smt::noodler {
}

for (auto & [var, list_of_automata] : var_to_list_of_automata_and_complement_flag) {
std::sort(list_of_automata.begin(), list_of_automata.end(), [](const std::pair<bool,std::shared_ptr<mata::nfa::Nfa>>& l, const std::pair<bool,std::shared_ptr<mata::nfa::Nfa>>& r) { return l.second->num_of_states() < r.second->num_of_states();});
std::sort(list_of_automata.begin(), list_of_automata.end(), [](const std::pair<bool,std::shared_ptr<mata::nfa::Nfa>>& l, const std::pair<bool,std::shared_ptr<mata::nfa::Nfa>>& r) {
return ((!l.first && r.first) | (l.second->num_of_states() < r.second->num_of_states()));
});
std::shared_ptr<mata::nfa::Nfa> intersection = nullptr;
for (auto & [is_complement, nfa] : list_of_automata) {
STRACE("str", tout << "building intersection for var " << var << " with automaton of size " << nfa->num_of_states() << (is_complement ? " that needs to be first complemented" : " that does not need to be first complemented") << std::endl;);
Expand Down