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

introduce output_aborter, and use it in ltlcross

Browse source 
* spot/twaalgos/alternation.cc, spot/twaalgos/alternation.hh,
spot/twaalgos/complement.cc, spot/twaalgos/complement.hh,
spot/twaalgos/determinize.cc, spot/twaalgos/determinize.hh,
spot/twaalgos/minimize.cc, spot/twaalgos/minimize.hh,
spot/twaalgos/postproc.cc, spot/twaalgos/postproc.hh,
spot/twaalgos/powerset.cc, spot/twaalgos/powerset.hh,
spot/twaalgos/product.cc, spot/twaalgos/product.hh: Use an
output_aborter argument to abort if the output is too large.
* bin/ltlcross.cc: Use complement() with an output_aborter
so that ltlcross will not attempt to build complement larger
than 500 states or 5000 edges.  Add --determinize-max-states
and --determinize-max-edges options.
* tests/core/ltlcross3.test, tests/core/ltlcrossce2.test,
tests/core/sccsimpl.test, tests/core/wdba2.test,
tests/python/stutter-inv.ipynb: Adjust test cases.
* NEWS: Document this.
* bin/spot-x.cc: Add documentation for postprocessor's
det-max-states and det-max-edges arguments.
* doc/org/ltlcross.org: Update description.
This commit is contained in:
Alexandre Duret-Lutz 2019-05-27 23:08:13 +02:00
parent 5c3a33f720
commit a85045091b
23 changed files with 568 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tests/core/ltlcross3.test
View file

@ -1,6 +1,6 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2012-2018 Laboratoire de Recherche et Développement de
# Copyright (C) 2012-2019 Laboratoire de Recherche et Développement de
# l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -34,7 +34,7 @@ check_csv()
# Make sure ltlcross quotes formulas correctly
cat >formula <<\EOF
G"a'-'>'b"
FGa
FGa & GFb
EOF
run 0 ltlcross -F formula --csv=out.csv \
"ltl2tgba -s %f >%N" \
@ -48,11 +48,11 @@ info: check_empty P1*N0
info: check_empty P1*N1
info: check_empty Comp(N1)*Comp(P1)
info: check_empty P0*N0
info: check_empty Comp(N0)*Comp(P0)
info: check_empty P0*N1
info: check_empty Comp(N0)*N1
info: check_empty P1*N0
info: check_empty Comp(N1)*N0
info: check_empty P1*N1
info: check_empty Comp(N1)*Comp(P1)
EOF
grep 'info: check_empty' error > ce
diff -u ce ceplan
@ -60,6 +60,7 @@ diff -u ce ceplan
ltlcross -F formula --csv=out.csv \
--ref "ltl2tgba -s %f >%N" \
"ltl2tgba --lenient -s %s >%N" \
--determinize-max-states=0 \
--verbose 2> error
cat >ceplan <<EOF
info: check_empty P0*N1
@ -68,7 +69,6 @@ info: check_empty P1*N1
info: check_empty Comp(N1)*Comp(P1)
info: check_empty P0*N1
info: check_empty P1*N0
info: check_empty Comp(N1)*N0
info: check_empty P1*N1
EOF
grep 'info: check_empty' error > ce
@ -318,3 +318,18 @@ ltlcross --color --products=0 ltl2tgba -f GFa -f FGa --csv=out.csv
grep product out.csv && exit 1
check_csv out.csv
# --determinize and --determinize-max-states are incompatible.
ltlcross -f a ltl2tgba --determinize --determinize-max-states=10 2>stderr &&
exit 1
grep 'max-states.*incompatible' stderr
ltlcross -f a ltl2tgba --determinize-max-states=10 --determinize 2>stderr &&
exit 1
grep 'max-states.*incompatible' stderr
# --determinize and --determinize-max-edges are incompatible.
ltlcross -f a ltl2tgba --determinize-max-edges=10 --determinize 2>stderr &&
exit 1
grep 'max-edges.*incompatible' stderr
ltlcross -f a ltl2tgba --determinize-max-edges=10 --determinize 2>stderr &&
exit 1
grep 'max-edges.*incompatible' stderr

4
tests/core/ltlcrossce2.test
View file

@ -97,7 +97,9 @@ esac
EOF
chmod +x fake
genltl --eh=9 | ltlcross 'ltl2tgba' './fake %f >%O' 2>errors && exit 1
genltl --eh=9 |
ltlcross --determinize-max-states=5 'ltl2tgba' './fake %f >%O' 2>errors &&
exit 1
cat errors
grep 'error: P0\*Comp(P1) is nonempty' errors
grep 'error: {P0} disagree with {P1}' errors

8
tests/core/sccsimpl.test
View file

@ -1,7 +1,7 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2011, 2013, 2015, 2018 Laboratoire de Recherche et
# Développement de l'Epita
# Copyright (C) 2011, 2013, 2015, 2018, 2019 Laboratoire de Recherche
# et Développement de l'Epita
#
# This file is part of Spot, a model checking library.
#
@ -316,7 +316,7 @@ AP: 1 "p0"
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels state-acc complete
properties: deterministic very-weak
properties: deterministic terminal
--BODY--
State: 0 {0}
[t] 0
@ -331,7 +331,7 @@ AP: 1 "p0"
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels state-acc complete
properties: deterministic very-weak
properties: deterministic terminal
--BODY--
State: 0 {0}
[t] 0

4
tests/core/wdba2.test
View file

@ -1,6 +1,6 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2012, 2014, 2015, 2018 Laboratoire de Recherche et
# Copyright (C) 2012, 2014, 2015, 2018, 2019 Laboratoire de Recherche et
# Développement de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -67,7 +67,7 @@ Start: 2
AP: 1 "p1"
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: implicit-labels state-acc complete deterministic very-weak
properties: implicit-labels state-acc complete deterministic terminal
--BODY--
State: 0 {0}
0 0