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

Rewrite F(a M b) as F(a & b), and G(a W b) as G(a | b).

Browse source 
* src/ltlvisit/simplify.cc: Implement these rules.
* src/ltltest/reduccmp.test: Add tests.
* doc/tl/tl.tex: Document them.
This commit is contained in:
Alexandre Duret-Lutz 2012-01-11 11:15:54 +01:00
parent 212c7ebdd7
commit 54d4a0a093
3 changed files with 65 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ltltest/reduccmp.test
View file

@ -1,4 +1,4 @@
#! /bin/sh
#! /bin/sh
# Copyright (C) 2009, 2010, 2011, 2012 Laboratoire de Recherche et Developpement
# de l'Epita (LRDE).
# Copyright (C) 2004, 2006 Laboratoire d'Informatique de Paris 6 (LIP6),
@ -166,6 +166,11 @@ for x in ../reduccmp ../reductaustr; do
run 0 $x 'a R (!a M a)' '0'
run 0 $x 'a W (!a M a)' 'Ga'
run 0 $x 'F(a U b)' 'Fb'
run 0 $x 'F(a M b)' 'F(a & b)'
run 0 $x 'G(a R b)' 'Gb'
run 0 $x 'G(a W b)' 'G(a | b)'
# Syntactic implication
run 0 $x '(a & b) R (a R c)' '(a & b)R c'
run 0 $x 'a R ((a & b) R c)' '(a & b)R c'

63
src/ltlvisit/simplify.cc
View file

@ -736,6 +736,24 @@ namespace spot
return is_binop(f, binop::U);
}
binop*
is_M(formula* f)
{
return is_binop(f, binop::M);
}
binop*
is_R(formula* f)
{
return is_binop(f, binop::R);
}
binop*
is_W(formula* f)
{
return is_binop(f, binop::W);
}
formula*
unop_multop(unop::type uop, multop::type mop, multop::vec* v)
{
@ -1061,6 +1079,20 @@ namespace spot
return;
}
// F(a M b) = F(a & b)
bo = is_M(result_);
if (bo)
{
formula* r =
unop::instance(unop::F,
multop::instance(multop::And,
bo->first()->clone(),
bo->second()->clone()));
bo->destroy();
result_ = recurse_destroy(r);
return;
}
// FX(a) = XF(a)
{
unop* u = is_X(result_);
@ -1113,17 +1145,28 @@ namespace spot
{
// G(a R b) = G(b)
if (result_->kind() == formula::BinOp)
binop* bo = is_R(result_);
if (bo)
{
binop* bo = static_cast<binop*>(result_);
if (bo->op() == binop::R)
{
formula* r =
unop::instance(unop::G, bo->second()->clone());
bo->destroy();
result_ = recurse_destroy(r);
return;
}
formula* r =
unop::instance(unop::G, bo->second()->clone());
bo->destroy();
result_ = recurse_destroy(r);
return;
}
// G(a W b) = G(a | b)
bo = is_W(result_);
if (bo)
{
formula* r =
unop::instance(unop::G,
multop::instance(multop::Or,
bo->first()->clone(),
bo->second()->clone()));
bo->destroy();
result_ = recurse_destroy(r);
return;
}
// GX(a) = XG(a)