mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

Merge branch 'master' of https://github.com/z3prover/z3

Browse source
This commit is contained in:
Nikolaj Bjorner 2017-09-19 19:44:22 -07:00
parent 93e08d9499 66bc68f128
commit 2ec3b4090e
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/math/automata/symbolic_automata_def.h
View file

@ -451,7 +451,15 @@ typename symbolic_automata<T, M>::automaton_t* symbolic_automata<T, M>::mk_produ
} }
} }
if (mvs1.empty()) { if (mvs1.empty()) {
return alloc(automaton_t, m); if (a.is_final_state(a.init()) && b.is_final_state(b.init())) {
// special case: automaton has no moves, but the initial state is final on both sides
// this results in the automaton which accepts the empty sequence and nothing else
final.clear();
final.push_back(0);
return alloc(automaton_t, m, 0, final, mvs1);
} else {
return alloc(automaton_t, m);
}
} }
else { else {
return alloc(automaton_t, m, 0, final, mvs1); return alloc(automaton_t, m, 0, final, mvs1);

7
src/smt/theory_lra.cpp
View file

@ -2335,7 +2335,12 @@ namespace smt {
lp::var_index vi = m_theory_var2var_index.get(v, UINT_MAX); lp::var_index vi = m_theory_var2var_index.get(v, UINT_MAX);
vector<std::pair<rational, lp::var_index> > coeffs; vector<std::pair<rational, lp::var_index> > coeffs;
rational coeff; rational coeff;
if (m_solver->is_term(vi)) { if (vi == UINT_MAX) {
has_shared = false;
blocker = m.mk_false();
return inf_eps(rational::one(), inf_rational());
}
else if (m_solver->is_term(vi)) {
const lp::lar_term& term = m_solver->get_term(vi); const lp::lar_term& term = m_solver->get_term(vi);
for (auto & ti : term.m_coeffs) { for (auto & ti : term.m_coeffs) {
coeffs.push_back(std::make_pair(ti.second, ti.first)); coeffs.push_back(std::make_pair(ti.second, ti.first));