The ltl prefix does not make a lot of sens anymore (since we support psl as well). ltlast/ and ltlenv/ were almost empty. And ltlvisit/ did not contain any visitor anymore. * src/ltlvisit/, src/ltlast/, src/ltlenv/: Merge into... * src/tl/: ...this. * NEWS: Mention the change. * README, bench/stutter/stutter_invariance_formulas.cc, bench/stutter/stutter_invariance_randomgraph.cc, configure.ac, doc/org/tut01.org, doc/org/tut02.org, doc/org/tut10.org, doc/tl/tl.tex, iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc, src/Makefile.am, src/bin/autfilt.cc, src/bin/common_output.cc, src/bin/common_output.hh, src/bin/common_r.hh, src/bin/common_trans.cc, src/bin/genltl.cc, src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc, src/bin/ltlcross.cc, src/bin/ltldo.cc, src/bin/ltlfilt.cc, src/bin/ltlgrind.cc, src/bin/randltl.cc, src/kripke/kripkeexplicit.hh, src/kripkeparse/public.hh, src/parseaut/public.hh, src/priv/accmap.hh, src/ta/taexplicit.hh, src/ta/tgtaexplicit.hh, src/tests/equalsf.cc, src/tests/ikwiad.cc, src/tests/length.cc, src/tests/ltlrel.cc, src/tests/randtgba.cc, src/tests/readltl.cc, src/tests/reduc.cc, src/tests/syntimpl.cc, src/tests/taatgba.cc, src/tests/tostring.cc, src/tests/twagraph.cc, src/twa/acc.hh, src/twa/bdddict.cc, src/twa/bdddict.hh, src/twa/bddprint.cc, src/twa/taatgba.cc, src/twa/taatgba.hh, src/twa/twa.hh, src/twa/twagraph.cc, src/twa/twagraph.hh, src/twa/twasafracomplement.cc, src/twaalgos/compsusp.cc, src/twaalgos/compsusp.hh, src/twaalgos/dtgbasat.cc, src/twaalgos/hoa.cc, src/twaalgos/isweakscc.cc, src/twaalgos/lbtt.cc, src/twaalgos/ltl2taa.cc, src/twaalgos/ltl2taa.hh, src/twaalgos/ltl2tgba_fm.cc, src/twaalgos/ltl2tgba_fm.hh, src/twaalgos/minimize.hh, src/twaalgos/neverclaim.cc, src/twaalgos/randomgraph.hh, src/twaalgos/relabel.hh, src/twaalgos/remprop.hh, src/twaalgos/stats.cc, src/twaalgos/stutter.cc, src/twaalgos/translate.hh, wrap/python/spot_impl.i, src/ltlparse/ltlparse.yy, src/ltlparse/public.hh: Adjust.
154 lines
4.2 KiB
Org Mode
154 lines
4.2 KiB
Org Mode
# -*- coding: utf-8 -*-
|
|
#+TITLE: Relabeling Formulas
|
|
#+SETUPFILE: setup.org
|
|
#+HTML_LINK_UP: tut.html
|
|
|
|
The task is to read an LTL formula, relabel all (possibly complex)
|
|
atomic propositions, and provide =#define= statements for each of
|
|
these renamings, writing everything in Spin's syntax.
|
|
|
|
|
|
* Shell
|
|
|
|
#+BEGIN_SRC sh :results verbatim :exports both
|
|
ltlfilt -ps --relabel=pnn --define -f '"Proc@Here" U ("var > 10" | "var < 4")'
|
|
#+END_SRC
|
|
|
|
#+RESULTS:
|
|
: #define p0 (Proc@Here)
|
|
: #define p1 (var < 4)
|
|
: #define p2 (var > 10)
|
|
: (p0) U ((p1) || (p2))
|
|
|
|
When is this output interesting, you may ask? It is useful for
|
|
instance if you want to call =ltl2ba= (or any other LTL-to-Büchi
|
|
translator) using a formula with complex atomic propositions it cannot
|
|
parse. Then you can pass the rewritten formula to =ltl2ba=, and
|
|
prepend all those =#define= to its output. For instance:
|
|
|
|
#+BEGIN_SRC sh :results verbatim :exports both
|
|
ltlfilt -ps --relabel=pnn --define=tmp.defs -f '"Proc@Here" U ("var > 10" | "var < 4")' >tmp.ltl
|
|
cat tmp.defs; ltl2ba -F tmp.ltl
|
|
rm tmp.defs tmp.ltl
|
|
#+END_SRC
|
|
|
|
#+RESULTS:
|
|
#+begin_example
|
|
#define p0 (Proc@Here)
|
|
#define p1 (var < 4)
|
|
#define p2 (var > 10)
|
|
never { /* (p0) U ((p1) || (p2))
|
|
*/
|
|
T0_init:
|
|
if
|
|
:: (p0) -> goto T0_init
|
|
:: (p1) || (p2) -> goto accept_all
|
|
fi;
|
|
accept_all:
|
|
skip
|
|
}
|
|
#+end_example
|
|
|
|
|
|
* Python
|
|
|
|
The =spot.relabel= function takes an optional third parameter that
|
|
should be a =relabeling_map=. If supplied, this map is filled with
|
|
pairs of atomic propositions of the form (new-name, old-name).
|
|
|
|
#+BEGIN_SRC python :results output :exports both
|
|
import spot
|
|
f = spot.formula('"Proc@Here" U ("var > 10" | "var < 4")')
|
|
m = spot.relabeling_map()
|
|
g = spot.relabel(f, spot.Pnn, m)
|
|
for newname, oldname in m.items():
|
|
print("#define {} ({})".format(newname.to_str(), oldname.to_str('spin', True)))
|
|
print(g.to_str('spin', True))
|
|
#+END_SRC
|
|
|
|
#+RESULTS:
|
|
: #define p0 ((Proc@Here))
|
|
: #define p1 ((var < 4))
|
|
: #define p2 ((var > 10))
|
|
: (p0) U ((p1) || (p2))
|
|
|
|
* C++
|
|
|
|
The =spot::ltl::relabeling_map= is just a =std::map= with a custom
|
|
destructor.
|
|
|
|
#+BEGIN_SRC C++ :results verbatim :exports both
|
|
#include <string>
|
|
#include <iostream>
|
|
#include "ltlparse/public.hh"
|
|
#include "tl/print.hh"
|
|
#include "tl/relabel.hh"
|
|
|
|
int main()
|
|
{
|
|
std::string input = "\"Proc@Here\" U (\"var > 10\" | \"var < 4\")";
|
|
spot::ltl::parse_error_list pel;
|
|
spot::ltl::formula f = spot::ltl::parse_infix_psl(input, pel);
|
|
if (spot::ltl::format_parse_errors(std::cerr, input, pel))
|
|
return 1;
|
|
spot::ltl::relabeling_map m;
|
|
f = spot::ltl::relabel(f, spot::ltl::Pnn, &m);
|
|
for (auto& i: m)
|
|
{
|
|
std::cout << "#define ";
|
|
print_psl(std::cout, i.first) << " (";
|
|
print_spin_ltl(std::cout, i.second, true) << ")\n";
|
|
}
|
|
print_spin_ltl(std::cout, f, true) << '\n';
|
|
return 0;
|
|
}
|
|
#+END_SRC
|
|
|
|
#+RESULTS:
|
|
: #define p0 (Proc@Here)
|
|
: #define p1 (var < 4)
|
|
: #define p2 (var > 10)
|
|
: (p0) U ((p1) || (p2))
|
|
|
|
|
|
* Additional comments
|
|
|
|
** Two ways to name atomic propositions
|
|
|
|
Instead of =--relabel=pnn= (or =spot.Pnn=, or =spot::ltl::Pnn=), you can
|
|
actually use =--relabel=abc= (or =spot.Abc=, or =spot::ltl::Abc=) to have
|
|
the atomic propositions named =a=, =b=, =c=, etc.
|
|
|
|
** Relabeling Boolean sub-expressions
|
|
|
|
Instead of relabeling each atomic proposition, you could decide to
|
|
relabel each Boolean sub-expression:
|
|
|
|
#+BEGIN_SRC sh :results verbatim :exports both
|
|
ltlfilt -ps --relabel-bool=pnn --define -f '"Proc@Here" U ("var > 10" | "var < 4")'
|
|
#+END_SRC
|
|
|
|
#+RESULTS:
|
|
: #define p0 (Proc@Here)
|
|
: #define p1 ((var < 4) || (var > 10))
|
|
: (p0) U (p1)
|
|
|
|
The relabeling routine is smart enough to not give different names
|
|
to Boolean expressions that have some sub-expression in common.
|
|
|
|
For instance =a U (a & b)= will not be relabeled into =(p0) U (p1)=
|
|
because that would hide the fact that both =p0= and =p1= check for
|
|
=a=. Instead we get this:
|
|
|
|
#+BEGIN_SRC sh :results verbatim :exports both
|
|
ltlfilt -ps --relabel-bool=pnn --define -f 'a U (a & b)'
|
|
#+END_SRC
|
|
|
|
#+RESULTS:
|
|
: #define p0 (a)
|
|
: #define p1 (b)
|
|
: (p0) U ((p0) && (p1))
|
|
|
|
This "Boolean sub-expression" relabeling is available in Python and
|
|
C++ via the =relabel_bse= function. The interface is identical to
|
|
=relabel=.
|