alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

alternation: fix detection of non-weak automata

Browse source 
Fixes #218.

* spot/twaalgos/alternation.cc: Adjust check.
* tests/core/alternating.test: Add test case from #218.
* NEWS: Mention the bug.
This commit is contained in:
Alexandre Duret-Lutz 2017-02-12 01:37:52 +01:00
parent 60bc269fd2
commit 15c6fd9562
3 changed files with 54 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -27,6 +27,9 @@ New in spot 2.3.0.dev (not yet released)
spot::acc_word::op and spot::acc_word::type had to be renamed as spot::acc_word::op and spot::acc_word::type had to be renamed as
spot::acc_word::sub.op and spot::acc_word::sub.type. spot::acc_word::sub.op and spot::acc_word::sub.type.
- alternation_removal() was not always reporting the unsupported
non-weak automata.
New in spot 2.3 (2017-01-19) New in spot 2.3 (2017-01-19)
Build: Build:

14
spot/twaalgos/alternation.cc
View file

@ -104,11 +104,12 @@ namespace spot
unsigned reject_1_count_ = 0; unsigned reject_1_count_ = 0;
std::set<unsigned> true_states_; std::set<unsigned> true_states_;
bool ensure_weak_state(unsigned src, unsigned scc) bool ensure_weak_scc(unsigned scc)
{ {
bool first = true; bool first = true;
bool reject_cycle = false; bool reject_cycle = false;
acc_cond::mark_t m = 0U; acc_cond::mark_t m = 0U;
for (unsigned src: si_.states_of(scc))
for (auto& t: aut_->out(src)) for (auto& t: aut_->out(src))
for (unsigned d: aut_->univ_dests(t.dst)) for (unsigned d: aut_->univ_dests(t.dst))
if (si_.scc_of(d) == scc) if (si_.scc_of(d) == scc)
@ -155,10 +156,11 @@ namespace spot
// decide rejecting/accepting. // decide rejecting/accepting.
assert(si_.is_accepting_scc(n)); assert(si_.is_accepting_scc(n));
unsigned s = si_.states_of(n).front(); // Catch unsupported types of automata
bool rej = ensure_weak_state(s, n); bool rej = ensure_weak_scc(n);
assert(rej == false); assert(rej == false);
// Detect if it is a "true state" // Detect if it is a "true state"
unsigned s = si_.states_of(n).front();
auto& ss = g.state_storage(s); auto& ss = g.state_storage(s);
if (ss.succ == ss.succ_tail) if (ss.succ == ss.succ_tail)
{ {
@ -168,17 +170,13 @@ namespace spot
} }
} }
} }
else else if (ensure_weak_scc(n))
{
for (auto src: si_.states_of(n))
if (ensure_weak_state(src, n))
{ {
class_of_[n] = reject_more; class_of_[n] = reject_more;
has_reject_more_ = true; has_reject_more_ = true;
} }
} }
} }
}
std::vector<int> state_to_var_; std::vector<int> state_to_var_;
std::map<int, unsigned> var_to_state_; std::map<int, unsigned> var_to_state_;

22
tests/core/alternating.test
View file

@ -374,5 +374,25 @@ State: 2 "t"
[t] 2 [t] 2
--END-- --END--
EOF EOF
autfilt --tgba in >out 2>&1 && exit 1 autfilt --tgba in 2>out && exit 1
grep 'autfilt.*weak.*alternating' out
cat >in <<EOF
HOA: v1
States: 4
AP: 2 "a" "b"
Start: 0&1
Acceptance: 1 Inf(0)
--BODY--
State: 0 {0}
[0] 2
State: 2 /*{0}*/
[0] 0
State: 1 {0}
[1] 3
State: 3 /*{0}*/
[1] 1
--END--
EOF
autfilt --tgba in 2>out && exit 1
grep 'autfilt.*weak.*alternating' out grep 'autfilt.*weak.*alternating' out