7ac570fa3f
Since we now require Python 3.6, we can use f-strings instead of format() to make the code more readable. * doc/org/tut01.org, doc/org/tut02.org, doc/org/tut03.org, doc/org/tut21.org, doc/org/tut24.org, doc/org/tut90.org, python/spot/__init__.py, python/spot/jupyter.py, tests/python/acc.py, tests/python/acc_cond.ipynb, tests/python/complement_semidet.py, tests/python/decompose.ipynb, tests/python/formulas.ipynb, tests/python/highlighting.ipynb, tests/python/ipnbdoctest.py, tests/python/ltlf.py, tests/python/parity.ipynb, tests/python/product.ipynb, tests/python/relabel.py, tests/python/satmin.ipynb, tests/python/stutter-inv.ipynb, tests/python/twagraph-internals.ipynb, tests/python/zlktree.ipynb: Use f-strings.
48 lines
1.7 KiB
Python
48 lines
1.7 KiB
Python
# -*- mode: python; coding: utf-8 -*-
|
|
# Copyright (C) by the Spot authors, see the AUTHORS file for details.
|
|
#
|
|
# This file is part of Spot, a model checking library.
|
|
#
|
|
# Spot is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Spot is distributed in the hope that it will be useful, but WITHOUT
|
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
|
# License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
import spot
|
|
from unittest import TestCase
|
|
tc = TestCase()
|
|
|
|
lcc = spot.language_containment_checker()
|
|
|
|
formulas = ['GFa', 'FGa', '(GFa) U b',
|
|
'(a U b) U c', 'a U (b U c)',
|
|
'(a W b) W c', 'a W (b W c)',
|
|
'(a R b) R c', 'a R (b R c)',
|
|
'(a M b) M c', 'a M (b M c)',
|
|
'(a R b) U c', 'a U (b R c)',
|
|
'(a M b) W c', 'a W (b M c)',
|
|
'(a U b) R c', 'a R (b U c)',
|
|
'(a W b) M c', 'a M (b W c)',
|
|
]
|
|
|
|
# The rewriting assume the atomic proposition will not change
|
|
# once we reache the non-alive part.
|
|
cst = spot.formula('G(X!alive => ((a <=> Xa) && (b <=> Xb) && (c <=> Xc)))')
|
|
|
|
for f in formulas:
|
|
f1 = spot.formula(f)
|
|
f2 = f1.unabbreviate()
|
|
f3 = spot.formula_And([spot.from_ltlf(f1), cst])
|
|
f4 = spot.formula_And([spot.from_ltlf(f2), cst])
|
|
print(f"{f1}\t=>\t{f3}")
|
|
print(f"{f2}\t=>\t{f4}")
|
|
tc.assertTrue(lcc.equal(f3, f4))
|
|
print()
|