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

twa_graph: swap the two passes of merge_edges()

Browse source 
This improves the determinism in a few cases.

* spot/twa/twagraph.cc (merge_edges): Encapsulate the two
passes into lambdas so that they are very easy to swap.
* spot/twa/twagraph.hh (merge_edges): Adjust documentation.
* tests/python/mergedge.py: Add test case.
* tests/core/alternating.test, tests/python/alternation.ipynb:
Determinism was improved.
* tests/core/parity2.test, tests/core/readsave.test,
tests/core/sbacc.test, tests/python/_product_susp.ipynb,
tests/python/atva16-fig2a.ipynb, tests/python/decompose.ipynb,
tests/python/highlighting.ipynb, tests/python/satmin.ipynb,
tests/python/simstate.py: Adjust expected order of edges.
* NEWS: Mention the change.
This commit is contained in:
Alexandre Duret-Lutz 2021-01-19 20:58:04 +01:00
parent e8e31c2723
commit 2072151499
15 changed files with 1963 additions and 1896 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/core/alternating.test
View file

@ -1,6 +1,6 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2016-2018, 2020 Laboratoire de Recherche et
# Copyright (C) 2016-2018, 2020-2021 Laboratoire de Recherche et
# Développement de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -196,11 +196,12 @@ AP: 1 "a"
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels trans-acc complete
properties: deterministic
--BODY--
State: 0
[t] 1
State: 1
[t] 1
[!0] 1
[0] 1 {0}
--END--
EOF

40
tests/core/parity2.test
View file

@ -1,7 +1,7 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2018, 2019 Laboratoire de Recherche et Développement de
# l'Epita (LRDE).
# Copyright (C) 2018-2019, 2021 Laboratoire de Recherche et
# Développement de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
#
@ -56,8 +56,8 @@ properties: trans-labels explicit-labels trans-acc complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {0}
[!1] 0
[0&1] 0 {0}
[!0&1] 1
State: 1
[0] 0 {0}
@ -115,8 +115,8 @@ properties: trans-labels explicit-labels trans-acc complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {1}
[!1] 0
[0&1] 0 {1}
[!0&1] 1
State: 1
[0] 0 {1}
@ -174,8 +174,8 @@ properties: trans-labels explicit-labels trans-acc complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {0}
[!1] 0
[0&1] 0 {0}
[!0&1] 1
State: 1
[0] 0 {0}
@ -233,8 +233,8 @@ properties: trans-labels explicit-labels trans-acc colored complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {1}
[!1] 0 {0}
[0&1] 0 {1}
[!0&1] 1 {0}
State: 1
[0] 0 {1}
@ -292,8 +292,8 @@ properties: trans-labels explicit-labels trans-acc colored complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {1}
[!1] 0 {2}
[0&1] 0 {1}
[!0&1] 1 {2}
State: 1
[0] 0 {1}
@ -351,8 +351,8 @@ properties: trans-labels explicit-labels trans-acc colored complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {2}
[!1] 0 {1}
[0&1] 0 {2}
[!0&1] 1 {1}
State: 1
[0] 0 {2}
@ -417,8 +417,8 @@ properties: trans-labels explicit-labels trans-acc complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {0}
[!1] 0
[0&1] 0 {0}
[!0&1] 1
State: 1
[0] 0 {0}
@ -478,8 +478,8 @@ properties: trans-labels explicit-labels trans-acc complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {1}
[!1] 0
[0&1] 0 {1}
[!0&1] 1
State: 1
[0] 0 {1}
@ -539,8 +539,8 @@ properties: trans-labels explicit-labels trans-acc complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {0}
[!1] 0
[0&1] 0 {0}
[!0&1] 1
State: 1
[0] 0 {0}
@ -600,8 +600,8 @@ properties: trans-labels explicit-labels trans-acc colored complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {1}
[!1] 0 {0}
[0&1] 0 {1}
[!0&1] 1 {0}
State: 1
[0] 0 {1}
@ -661,8 +661,8 @@ properties: trans-labels explicit-labels trans-acc colored complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {1}
[!1] 0 {2}
[0&1] 0 {1}
[!0&1] 1 {2}
State: 1
[0] 0 {1}
@ -722,8 +722,8 @@ properties: trans-labels explicit-labels trans-acc colored complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {2}
[!1] 0 {1}
[0&1] 0 {2}
[!0&1] 1 {1}
State: 1
[0] 0 {2}
@ -1158,8 +1158,8 @@ properties: trans-labels explicit-labels trans-acc complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {0}
[!1] 0
[0&1] 0 {0}
[!0&1] 1
State: 1
[0] 0 {0}
@ -1219,8 +1219,8 @@ properties: trans-labels explicit-labels trans-acc complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {1}
[!1] 0
[0&1] 0 {1}
[!0&1] 1
State: 1
[0] 0 {1}
@ -1280,8 +1280,8 @@ properties: trans-labels explicit-labels trans-acc complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {0}
[!1] 0
[0&1] 0 {0}
[!0&1] 1
State: 1
[0] 0 {0}
@ -1341,8 +1341,8 @@ properties: trans-labels explicit-labels trans-acc colored complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {1}
[!1] 0 {0}
[0&1] 0 {1}
[!0&1] 1 {0}
State: 1
[0] 0 {1}
@ -1403,8 +1403,8 @@ properties: trans-labels explicit-labels trans-acc colored complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {1}
[!1] 0 {2}
[0&1] 0 {1}
[!0&1] 1 {2}
State: 1
[0] 0 {1}
@ -1465,8 +1465,8 @@ properties: trans-labels explicit-labels trans-acc colored complete
properties: deterministic stutter-invariant
--BODY--
State: 0
[0&1] 0 {2}
[!1] 0 {1}
[0&1] 0 {2}
[!0&1] 1 {1}
State: 1
[0] 0 {2}

10
tests/core/readsave.test
View file

@ -1,6 +1,6 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2009, 2010, 2012, 2014-2020 Laboratoire de
# Copyright (C) 2009, 2010, 2012, 2014-2021 Laboratoire de
# Recherche et Développement de l'Epita (LRDE).
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
@ -364,8 +364,8 @@ digraph "G(Fa & Fb)" {
I -> 0
0 [label="0"]
0 -> 0 [label="!a & !b"]
0 -> 0 [label="!a & b\n{1}"]
0 -> 0 [label="a & !b\n{0}"]
0 -> 0 [label="!a & b\n{1}"]
0 -> 0 [label="a & b\n{0,1}"]
}
EOF
@ -383,8 +383,8 @@ digraph "G(Fa & Fb)" {
I -> 0
0 [label="0"]
0 -> 0 [label="!a & !b"]
0 -> 0 [label="!a & b\n❶"]
0 -> 0 [label="a & !b\n⓿"]
0 -> 0 [label="!a & b\n❶"]
0 -> 0 [label="a & b\n⓿❶"]
}
EOF
@ -402,8 +402,8 @@ digraph "G(Fa & Fb)" {
I -> 0
0 [label="0"]
0 -> 0 [label=""]
0 -> 0 [label="❶"]
0 -> 0 [label="⓿"]
0 -> 0 [label="❶"]
0 -> 0 [label="⓿❶"]
}
EOF
@ -428,8 +428,8 @@ digraph "G(Fa & Fb)" {
I -> 0
0 [label=<0>]
0 -> 0 [label=<!a &amp; !b>]
0 -> 0 [label=<!a &amp; b<br/>$one>]
0 -> 0 [label=<a &amp; !b<br/>$zero>]
0 -> 0 [label=<!a &amp; b<br/>$one>]
0 -> 0 [label=<a &amp; b<br/>$zero$one>]
}
EOF

22
tests/core/sbacc.test
View file

@ -1,6 +1,6 @@
#! /bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2015-2017, 2020 Laboratoire de Recherche et
# Copyright (C) 2015-2017, 2020-2021 Laboratoire de Recherche et
# Développement de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -37,23 +37,23 @@ properties: deterministic stutter-invariant
State: 0 {0 1}
[0&1] 0
[!0&!1] 1
[!0&1] 2
[0&!1] 3
[0&!1] 2
[!0&1] 3
State: 1
[0&1] 0
[!0&!1] 1
[!0&1] 2
[0&!1] 3
State: 2 {1}
[0&!1] 2
[!0&1] 3
State: 2 {0}
[0&1] 0
[!0&!1] 1
[!0&1] 2
[0&!1] 3
State: 3 {0}
[0&!1] 2
[!0&1] 3
State: 3 {1}
[0&1] 0
[!0&!1] 1
[!0&1] 2
[0&!1] 3
[0&!1] 2
[!0&1] 3
--END--
EOF