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

improve to_parity() LAR implementation using SCCs

Browse source 
* spot/twaalgos/toparity.cc (lar_generator): Use scc_info to reset
permutations of edges leaving SCCs.
* tests/python/toparity.py: Add a test case.
This commit is contained in:
Alexandre Duret-Lutz 2019-10-08 11:27:22 +02:00
parent 74d1ec2bff
commit b2539e8399
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
spot/twaalgos/toparity.cc
View file

@ -19,10 +19,11 @@
#include "config.h" #include "config.h"
#include <spot/twaalgos/toparity.hh> #include <spot/twaalgos/toparity.hh>
#include <spot/twaalgos/sccinfo.hh>
#include <deque> #include <deque>
#include <map> #include <map>
#include <numeric>
#include <sstream> #include <sstream>
namespace spot namespace spot
@ -88,15 +89,14 @@ namespace spot
return it.first->second; return it.first->second;
}; };
std::vector<unsigned> initial_perm(aut_->num_sets());
std::iota(initial_perm.begin(), initial_perm.end(), 0);
{ {
std::vector<unsigned> p0; lar_state s0{aut_->get_init_state_number(), initial_perm};
for (unsigned k : aut_->acc().all_sets().sets()) res_->set_init_state(get_state(s0));
p0.push_back(k);
lar_state s0{aut_->get_init_state_number(), p0};
unsigned init = get_state(s0); // put s0 in todo
res_->set_init_state(init);
} }
scc_info si(aut_, scc_info_options::NONE);
// main loop // main loop
while (!todo.empty()) while (!todo.empty())
{ {
@ -106,6 +106,7 @@ namespace spot
// TODO todo could store this number to avoid one lookup // TODO todo could store this number to avoid one lookup
unsigned src_num = get_state(current); unsigned src_num = get_state(current);
unsigned source_scc = si.scc_of(current.state);
for (const auto& e : aut_->out(current.state)) for (const auto& e : aut_->out(current.state))
{ {
// find the new permutation // find the new permutation
@ -118,6 +119,12 @@ namespace spot
std::rotate(it, it+1, new_perm.end()); std::rotate(it, it+1, new_perm.end());
} }
if (source_scc != si.scc_of(e.dst))
{
new_perm = initial_perm;
h = 0;
}
lar_state dst{e.dst, new_perm}; lar_state dst{e.dst, new_perm};
unsigned dst_num = get_state(dst); unsigned dst_num = get_state(dst);

12
tests/python/toparity.py
View file

@ -35,6 +35,18 @@ State: 0
p = spot.to_parity(a) p = spot.to_parity(a)
assert spot.are_equivalent(a, p) assert spot.are_equivalent(a, p)
a = spot.automaton("""
HOA: v1 States: 6 Start: 0 AP: 2 "p0" "p1" Acceptance: 6 Inf(5) |
Fin(2) | Inf(1) | (Inf(0) & Fin(3)) | Inf(4) properties: trans-labels
explicit-labels trans-acc --BODY-- State: 0 [0&1] 2 {4 5} [0&1] 4 {0 4}
[!0&!1] 3 {3 5} State: 1 [0&!1] 3 {1 5} [!0&!1] 5 {0 1} State: 2 [!0&!1]
0 {0 3} [0&!1] 1 {0} State: 3 [!0&1] 4 {1 2 3} [0&1] 3 {3 4 5} State:
4 [!0&!1] 1 {2 4} State: 5 [!0&1] 4 --END--
""")
p = spot.to_parity(a)
assert p.num_states() == 22
assert spot.are_equivalent(a, p)
for f in spot.randltl(4, 400): for f in spot.randltl(4, 400):
d = spot.translate(f, "det", "G") d = spot.translate(f, "det", "G")
p = spot.to_parity(d) p = spot.to_parity(d)