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

genem: improve handling of co-Büchi

Browse source 
* spot/twaalgos/sccinfo.cc, spot/twaalgos/sccinfo.hh: Make sure
scc_and_mark_filter does not install a filter if there is nothing
to filter.
* tests/python/genem.py, spot/twaalgos/genem.cc,
python/spot/impl.i: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2019-04-12 23:14:29 +02:00
parent afdc7ddaf8
commit 0623965b43
5 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/python/genem.py
View file

@ -207,6 +207,9 @@ def is_scc_empty1(si, scc_num, acc=None):
return True
def is_empty2(g):
return is_empty2_rec(spot.scc_and_mark_filter(g, g.acc().fin_unit()))
def is_empty2_rec(g):
si = spot.scc_info_with_options(g, spot.scc_info_options_STOP_ON_ACC)
if si.one_accepting_scc() >= 0:
return False
@ -224,13 +227,13 @@ def is_scc_empty2(si, scc_num, acc=None):
acc = acc.restrict_to(occur)
acc = acc.remove(common, False)
# 3 stop conditions removed here, because they are caught by
# one_accepting_scc() or is_rejecting_scc() in is_empty2()
# one_accepting_scc() or is_rejecting_scc() in is_empty2_rec()
for cl in acc.top_disjuncts():
fu = cl.fin_unit() # Is there Fin at the top level
if fu:
with spot.scc_and_mark_filter(si, scc_num, fu) as filt:
filt.override_acceptance(cl.remove(fu, True))
if not is_empty1(filt):
if not is_empty2_rec(filt):
return False
else:
# Pick some Fin term anywhere in the formula
@ -238,7 +241,7 @@ def is_scc_empty2(si, scc_num, acc=None):
# Try to solve assuming Fin(fo)=True
with spot.scc_and_mark_filter(si, scc_num, [fo]) as filt:
filt.override_acceptance(cl.remove([fo], True))
if not is_empty2(filt):
if not is_empty2_rec(filt):
return False
# Try to solve assuming Fin(fo)=False
if not is_scc_empty2(si, scc_num, acc.force_inf([fo])):