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

remove_fin: use simplify_acceptance

Browse source 
* spot/twaalgos/remfin.cc: Simplify acceptance before trying the
different strategies.
* spot/twaalgos/cleanacc.cc: Skip simplify_complementary_marks_here()
on generalized Büchi.
* tests/core/remfin.test, tests/python/tra2tba.py: Adjust.
* spot/twaalgos/totgba.cc: Simplify the result of Streett->GBA.
* NEWS: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2018-01-06 11:56:43 +01:00
parent 2feba6ad5e
commit a924bc561a
6 changed files with 43 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/core/remfin.test
View file

@ -1,7 +1,7 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2015-2017 Laboratoire de Recherche et Développement de
# Copyright (C) 2015-2018 Laboratoire de Recherche et Développement de
# l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -394,7 +394,8 @@ State: 0
[!0] 0
[0] 1
State: 1 {0}
[t] 1
[!0] 1
[0] 1
--END--
HOA: v1
States: 10
@ -589,9 +590,8 @@ HOA: v1
States: 37
Start: 0
AP: 2 "a" "b"
acc-name: generalized-Buchi 12
Acceptance: 12 Inf(0)&Inf(1)&Inf(2)&Inf(3)&Inf(4)&Inf(5)&Inf(6)\
&Inf(7)&Inf(8)&Inf(9)&Inf(10)&Inf(11)
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels state-acc complete
--BODY--
State: 0
@ -731,7 +731,7 @@ State: 32
State: 33
[t] 33
[!1] 36
State: 34 {0 1 2 3 4 5 6 7 8 9 10 11}
State: 34 {0}
[t] 34
State: 35
[1] 34
@ -750,11 +750,11 @@ properties: trans-labels explicit-labels state-acc complete
properties: deterministic
--BODY--
State: 0
[!0] 0
[0] 1
[!0] 0
State: 1 {0}
[!0] 0
[0] 1
[!0] 0
--END--
HOA: v1
States: 21

8
tests/python/tra2tba.py
View file

@ -94,8 +94,8 @@ exp = """HOA: v1
States: 2
Start: 0
AP: 2 "a" "b"
acc-name: Buchi
Acceptance: 1 Inf(0)
acc-name: none
Acceptance: 0 f
properties: trans-labels explicit-labels state-acc deterministic
--BODY--
State: 0
@ -383,11 +383,11 @@ Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels state-acc deterministic
--BODY--
State: 0 {0}
[!1&!2] 0
[1&!2] 1
[!1&!2] 0
State: 1
[!1&!2] 0
[1&!2] 1
[!1&!2] 0
--END--"""
res = spot.remove_fin(aut)