Introduce rational operators and trivial simplification rules.
Trivial simplifications rules (such as "FFa=Fa" or "x&1=x") are performed any time a formule is instanciated. * src/ltlast/constant.hh, src/ltlast/constant.cc (true_instance, true_instance_): Declare the true_instance_ as a static member, and move true_instance() into the .hh so it gets inlined. Have true_instance_ as a class variable will ensure that it is the first formula instantiated. Binop simplifications rely on this to order arguments. (false_instance, false_instance_): Likewise. (empty_word_instance, empty_word_instance_): New method and static member. * src/ltlast/formula.hh (formula::formula): If max_count_ ever loops, skip the first three values so that constants always have smaller hash codes. * src/ltlast/binop.hh, src/ltlast/binop.cc (instance): Add simplifications and document them. * src/ltlast/multop.hh (multop::Concat): New operator. * src/ltlast/multop.cc (op_name): Handle Concat. (instance): Inline Concat arguments without reordering. Handle absorbent and neutral elements for all operators. * src/ltlast/unop.hh (unop::Star): New operator. * src/ltlast/unop.cc (op_name): Handle Star. (instance): Handle Star, and add trivial simplifications for other unary operators. * src/ltlparse/ltlparse.yy (OP_CONCAT, OP_STAR, CONST_EMPTYWORD): Declare these new operators and add rules for them. * src/ltlparse/ltlscan.ll (OP_CONCAT, OP_STAR, CONST_EMPTYWORD): Output these new operators. * src/ltltest/equals.test: New tests. * src/ltltest/parse.test: Remove redundant test. * src/ltltest/tunabbrev.test, src/tgbatest/emptchk.test: Adjust tests. * src/ltlvisit/basicreduce.cc, src/ltlvisit/contain.cc, src/ltlvisit/nenoform.cc, src/ltlvisit/reduce.cc, src/ltlvisit/syntimpl.cc, src/ltlvisit/tostring.cc, src/ltlvisit/tunabbrev.cc: Complete visitors to handle new operators. * src/ltltest/nenoform.test: More tests. * src/ltlvisit/lunabbrev.cc (unabbreviate_logic_visitor::visit): Clone formulae before instance() function actually have a chance to destroy them. * src/tgba/formula2bdd.cc, src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/ltl2tgba_lacim.cc: Adjust switches to assert on new operators.
This commit is contained in:
Alexandre Duret-Lutz
parent
4fcc4f829c
commit
546559b8c3
29 changed files with 575 additions and 120 deletions
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# Copyright (C) 2009, 2011 Laboratoire de Recherche et Développement
|
||||
# Copyright (C) 2009, 2010, 2011 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
|
||||
|
|
@ -68,3 +68,49 @@ run 0 ../equals 'a & b ^ c | d' 'd | c ^ b & a'
|
|||
|
||||
# Corner cases parsing
|
||||
run 0 ../equals 'FFG__GFF' 'F(F(G("__GFF")))'
|
||||
|
||||
# Trivial simplifications
|
||||
run 0 ../equals '0*' '#e'
|
||||
run 0 ../equals '#e*' '#e'
|
||||
run 0 ../equals 'Exp**' 'Exp*'
|
||||
run 0 ../equals 'FF(Exp)' 'F(Exp)'
|
||||
run 0 ../equals 'GG(Exp)' 'G(Exp)'
|
||||
run 0 ../equals 'F(0)' '0'
|
||||
run 0 ../equals 'G(0)' '0'
|
||||
run 0 ../equals 'F(1)' '1'
|
||||
run 0 ../equals 'G(1)' '1'
|
||||
run 0 ../equals 'F(#e)' '1'
|
||||
run 0 ../equals 'G(#e)' '1'
|
||||
run 0 ../equals '!1' '0'
|
||||
run 0 ../equals '!0' '1'
|
||||
run 0 ../equals '!!Exp' 'Exp'
|
||||
|
||||
run 0 ../equals '(1 => Exp)' 'Exp'
|
||||
run 0 ../equals '(0 => Exp)' '0'
|
||||
run 0 ../equals '(Exp => 1)' '1'
|
||||
run 0 ../equals '(Exp => 0)' '!Exp'
|
||||
run 0 ../equals '(1 ^ Exp)' '!Exp'
|
||||
run 0 ../equals '(0 ^ Exp)' 'Exp'
|
||||
run 0 ../equals '(0 <=> Exp)' '!Exp'
|
||||
run 0 ../equals '(1 <=> Exp)' 'Exp'
|
||||
run 0 ../equals '(Exp U 1)' '1'
|
||||
run 0 ../equals '(Exp U 0)' '0'
|
||||
run 0 ../equals '(Exp R 1)' '1'
|
||||
run 0 ../equals '(Exp R 0)' '0'
|
||||
run 0 ../equals '(1 R Exp)' 'Exp'
|
||||
|
||||
run 0 ../equals FFx Fx
|
||||
run 0 ../equals FFFFFx Fx
|
||||
run 0 ../equals GGx Gx
|
||||
run 0 ../equals GGGGGx Gx
|
||||
run 0 ../equals '!!x' x
|
||||
run 0 ../equals '!!!!!x' '!x'
|
||||
run 0 ../equals '#e;x' x
|
||||
run 0 ../equals 'x;#e' x
|
||||
run 0 ../equals '#e;x;#e;#e' x
|
||||
run 0 ../equals '#e;x;#e;x;#e' 'x;x'
|
||||
run 0 ../equals 'x;x;x;#e;x;x' 'x;x;x;x;x'
|
||||
run 0 ../equals 'x;0;x;x;x' '0'
|
||||
run 0 ../equals '0*' '#e'
|
||||
run 0 ../equals '#e*' '#e'
|
||||
run 0 ../equals 'x;x;FF(0)' '0'
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#! /bin/sh
|
||||
# Copyright (C) 2009 Laboratoire de Recherche et Développement
|
||||
# Copyright (C) 2009, 2010 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
|
||||
# d<EFBFBD>partement Syst<73>mes R<>partis Coop<6F>ratifs (SRC), Universit<69> Pierre
|
||||
# et Marie Curie.
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
|
|
@ -66,3 +66,8 @@ run 0 ../nenoform '!(a | b | c | d)' '!a & !b & !c & !d'
|
|||
run 0 ../nenoform '!(a U (!b U ((a & b & c) R d)))' \
|
||||
'!a R (b R ((!a | !b | !c) U !d))'
|
||||
run 0 ../nenoform '!(GF a => FG b)' 'GFa & GF!b'
|
||||
|
||||
# Rational operators
|
||||
run 0 ../nenoform '!(X((!Xa)*))' 'X!((X!a)*)'
|
||||
run 0 ../nenoform 'X((Xa)*)' 'X((Xa)*)'
|
||||
run 0 ../nenoform '!F!X!(GF(a);!FG(a);x)' 'GX!(GFa;GF!a;x)'
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Copyright (C) 2009, 2010, 2011 Laboratoire de Recherche et Developpement
|
||||
# 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
|
||||
# d<EFBFBD>partement Syst<73>mes R<>partis Coop<6F>ratifs (SRC), Universit<69> Pierre
|
||||
# et Marie Curie.
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
|
|
@ -42,8 +42,6 @@ for f in \
|
|||
'a && .b.' \
|
||||
'a + b' \
|
||||
'a3214 | b' \
|
||||
'a & b' \
|
||||
'a && b' \
|
||||
'a /\ b' \
|
||||
'a || b' \
|
||||
'a \/ b' \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#! /bin/sh
|
||||
# Copyright (C) 2009 Laboratoire de Recherche et Développement
|
||||
# Copyright (C) 2009, 2010 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
|
||||
# d<EFBFBD>partement Syst<73>mes R<>partis Coop<6F>ratifs (SRC), Universit<69> Pierre
|
||||
# et Marie Curie.
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
|
|
@ -55,5 +55,6 @@ run 0 ../tunabbrev '(a ^ b) | (b ^ c)' \
|
|||
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 (false V (false V (false V a)))'
|
||||
run 0 ../tunabbrev 'FFFfalse' 'true U ((true) U (true U (false)))'
|
||||
run 0 ../tunabbrev 'GGGGa' 'false V a'
|
||||
run 0 ../tunabbrev 'FFFfalse' '0'
|
||||
run 0 ../tunabbrev 'FFFf' 'true U f'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue