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

ltltest: speedup more tests

Browse source 
This generalizes the previous patch.

* src/ltltest/equalsf.cc: Allow escaped '\,' and
negated result.
* src/ltltest/Makefile.am: Use equalsf.cc for
almost all tests that used equals.cc.
(nequals): New.
* src/ltltest/equals.test, src/ltltest/eventuniv.test,
src/ltltest/lunabbrev.test, src/ltltest/nenoform.test,
src/ltltest/parseerr.test, src/ltltest/tunabbrev.test,
src/ltltest/tunenoform.test: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2014-08-17 12:22:06 +02:00
parent 7b9f695265
commit 6a741189bc
10 changed files with 371 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/ltltest/tunabbrev.test
View file

@ -1,9 +1,10 @@
#! /bin/sh
# Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement
# -*- coding: utf-8-
# Copyright (C) 2009, 2010, 2014 Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
# d<EFBFBD>partement Syst<73>mes R<>partis Coop<6F>ratifs (SRC), Universit<69> Pierre
# et Marie Curie.
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6
# (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
# Pierre et Marie Curie.
#
# This file is part of Spot, a model checking library.
#
@ -27,32 +28,33 @@
set -e
cat >tunabbrev.txt<<EOF
# A few things that do not change
run 0 ../tunabbrev 'a' 'a'
run 0 ../tunabbrev '1' '1'
run 0 ../tunabbrev '0' '0'
run 0 ../tunabbrev 'a U b' 'a U b'
run 0 ../tunabbrev 'a & b' 'a & b'
run 0 ../tunabbrev 'a & b' 'b & a'
run 0 ../tunabbrev 'a & b & c' 'c & a & b'
run 0 ../tunabbrev 'a & b & c' 'b & c & a'
run 0 ../tunabbrev 'a & b & a' 'b & a & b'
run 0 ../tunabbrev 'a & b' 'b & a & b'
run 0 ../tunabbrev 'a & b' 'b & a & a'
run 0 ../tunabbrev 'a & b & (c |(f U g)| e)' \
'b & a & a & (c | e |(f U g)| e | c) & b'
a, a
1, 1
0, 0
a U b, a U b
a & b, a & b
a & b, b & a
a & b & c, c & a & b
a & b & c, b & c & a
a & b & a, b & a & b
a & b, b & a & b
a & b, b & a & a
a & b & (c |(f U g)| e), b & a & a & (c | e |(f U g)| e | c) & b
# same as in lunabbrev.test:
run 0 ../tunabbrev 'a ^ b' '(a & !b) | (!a & b)'
run 0 ../tunabbrev 'a ^ Xb' '(!Xb & a) | (!a & Xb) | (Xb & !a)'
run 0 ../tunabbrev '!a <-> Xb' '(Xb & !a) | (!!a & !Xb)'
run 0 ../tunabbrev '(a ^ b) | (b ^ c)' \
'(c & !b) | (!c & b) | (a & !b) | (!a & b)'
a ^ b, (a & !b) | (!a & b)
a ^ Xb, (!Xb & a) | (!a & Xb) | (Xb & !a)
!a <-> Xb, (Xb & !a) | (!!a & !Xb)
(a ^ b) | (b ^ c), (c & !b) | (!c & b) | (a & !b) | (!a & b)
# LTL unabbreviations:
run 0 ../tunabbrev 'G a ' 'false R a'
run 0 ../tunabbrev 'GF a => F G(b)' \
'!(false R (true U a)) | (true U (false V b))'
run 0 ../tunabbrev 'GGGGa' 'false V a'
run 0 ../tunabbrev 'FFFfalse' '0'
run 0 ../tunabbrev 'FFFf' 'true U f'
G a , false R a
GF a => F G(b), !(false R (true U a)) | (true U (false V b))
GGGGa, false V a
FFFfalse, 0
FFFf, true U f
EOF
run 0 ../tunabbrev tunabbrev.txt