Commit graph

1764 commits

Author SHA1 Message Date
Alexandre Duret-Lutz
2f8c4ac8b7 Add support for {SERE} and !{SERE} closure operators.
* src/ltlast/unop.hh, src/ltlast/unop.cc: Introduce Closure and
NegClosure operators.
* src/ltlparse/ltlparse.yy: Recognize {foo} as a Closure.
* src/ltlvisit/mark.cc: Consider NegClosure as a marked operator.
* src/tgbaalgos/ltl2tgba_fm.cc (ratexp_trad_visitor): Add option to
select whether the empty_word should act like true (for {SERE}
and {!SERE}) or false (for {SERE}<>->Exp or {SERE}[]->Exp).
(ltl_trad_visitor): Translate Closure and NegClosure.
* src/tgbatest/ltl2tgba.test: Add more tests.
* src/ltlvisit/basicreduce.cc, src/ltlvisit/consterm.cc,
src/ltlvisit/nenoform.cc, src/ltlvisit/reduce.cc,
src/ltlvisit/syntimpl.cc, src/ltlvisit/tostring.cc,
src/ltlvisit/tunabbrev.cc, src/tgba/formula2bdd.cc,
src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/ltl2tgba_lacim.cc,
src/tgbaalgos/ltl2taa.cc: Straightforward update to support or
assert on these new operators.
2012-04-28 09:30:35 +02:00
Alexandre Duret-Lutz
f618e6bc1a Build deterministic automata for []-> operators.
* src/tgbaalgos/ltl2tgba_fm.cc (ltl_trad_visitor::visit): Honor
exprop_ while handling the binop::UConcat case.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
916c154291 Adjust Python tests to the new simplification rules.
* wrap/python/tests/ltlsimple.py: Adjust.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
dbdd37010c Build deterministic automata for <>-> operators.
* src/tgbaalgos/ltl2tgba_fm.cc (ltl_trad_visitor): Take
an exprop argument, and use it while translation <>-> operators.
* src/tgbatest/ltl2tgba.test (check_psl): Use -x too.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
c2b3dac7aa Parse the fusion operator (":") and translate it in ltl2tgba_fm().
* src/ltlast/multop.hh (multop::type::Fusion): New operator.
* src/ltlast/multop.cc: Handle it.
* src/ltlparse/ltlparse.yy: Declare OP_FUSION and add grammar
rules.
* src/ltlparse/ltlscan.ll: Recognize ":" as OP_FUSION.
* src/tgbaalgos/ltl2tgba_fm.cc (ratexp_trad_visitor::visit):
Add translation rule for multop::Fusion.
* src/tgbatest/ltl2tgba.test: Add more tests.
* src/ltlvisit/basicreduce.cc, src/ltlvisit/consterm.cc,
src/ltlvisit/contain.cc, src/ltlvisit/mark.cc,
src/ltlvisit/nenoform.cc, src/ltlvisit/syntimpl.cc,
src/ltlvisit/tostring.cc, src/tgba/formula2bdd.cc,
src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/ltl2taa.cc,
src/tgbaalgos/ltl2tgba_lacim.cc: Handle multop::Fusion in switches.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
ad519b8568 Do not assume that concatenation cannot accept the empty word.
For instance "(a+#e);(b+#e);(c*)" does.

* src/ltlvisit/consterm.cc: Fix handling of Concat operator.
* src/ltltest/consterm.test: Add more tests.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
bd9136a98e Update the FM translation to handle <>->, []->, *, ;, #e.
* src/tgbaalgos/ltl2tgba_fm.cc: Implement translation for
recently introduced operators.
* src/tgbatest/ltl2tgba.test: Add some PSL tests.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
21e89f400a Visitors to transform <>-> into <>+> or to detect the latter.
* src/ltlvisit/mark.cc, src/ltlvisit/mark.hh: New files.
* src/ltlvisit/Makefile.am: Add mark.hh and mark.cc.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
171ca678b8 Introduce EConcatMarked "<>+>" as operator.
* src/ltlast/binop.cc, src/ltlast/binop.hh: Introduce
EConcatMarked ("<>+>").
* src/ltlvisit/basicreduce.cc, src/ltlvisit/consterm.cc,
src/ltlvisit/lunabbrev.cc, src/ltlvisit/nenoform.cc,
src/ltlvisit/reduce.cc, src/ltlvisit/simpfg.cc,
src/ltlvisit/syntimpl.cc, src/ltlvisit/tostring.cc,
src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/eltl2tgba_lacim.cc,
src/tgbaalgos/ltl2tgba_lacim.cc, src/tgba/formula2bdd.cc,
src/tgba/formula2bdd.cc: Deal with it if possible or ignore
it.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
66317db45c Simplify #e in conjunctions.
* src/ltlast/multop.cc: Handle it.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
76528ee2fb Simplify {#e}[]->Exp and {#e}<>->Exp.
* src/ltlast/binop.cc: Add simplification rules.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
fc7c2943de more tests for rational operator simplifications.
* src/ltltest/nenoform.test, src/ltltest/equals.test,
src/ltltest/consterm.test: Update tests for rational ops.
* src/ltltest/consterm.cc: Use parse_ratexp().
* src/ltlast/binop.cc: Fix simplification rules for []-> and
<>->.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
9aebb80e08 Enable parsing stand-alone rational expressions with the LTL parser.
* src/ltlparse/ltlparse.yy (parse_ratexp): New function.
(START_LTL, START_RATEXP): Add these new tokens.
(result): Parse and LTL formula or a rational expression depending
on the start symbol.
* src/ltlparse/public.hh (parse_ratexp): New function.
* src/ltlparse/parsedecl.hh (flex_set_buffer): Add a new argument
to set the starting rule.
* src/ltlparse/ltlscan.ll (flex_set_buffer): Adjust.
(start_token): New global variable.  Return this as first token if
it is set.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
c6dd811b08 Add []-> and <>->.
* src/ltlast/binop.hh, src/ltlast/binop.cc (EConcat, UConcat):
Add these new operators.
* src/ltlparse/ltlparse.yy, src/ltlparse/ltlscan.ll: Parse
these new operators.
* src/ltlvisit/simpfg.cc, src/ltlvisit/syntimpl.cc,
src/ltlvisit/tostring.cc, src/ltlvisit/basicreduce.cc,
src/ltlvisit/consterm.cc, src/ltlvisit/lunabbrev.cc,
src/ltlvisit/nenoform.cc, src/ltlvisit/reduce.cc
src/tgba/formula2bdd.cc, src/tgbaalgos/eltl2tgba_lacim.cc,
src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_fm.cc,
src/tgbaalgos/ltl2tgba_lacim.cc: Add these new operators into the
switches.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
97b7211bb7 Add a constant_term() visitor to decide whether #e is accepted.
* src/ltlvisit/Makefile.am: Add consterm.cc and consterm.hh.
* src/ltlvisit/consterm.hh, src/ltlvisit/consterm.cc: New files.
* src/ltltest/Makefile.am: Add consterm.cc and consterm.test.
* src/ltltest/consterm.cc, src/ltltest/consterm.test: New files.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
2d1aa0a5a0 more files to ignore 2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
546559b8c3 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.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
4fcc4f829c Apply ACI rules to multop formulae.
* src/ltlast/multop.cc (instance): Handle neutral and absorbent
elements for the operator.
* src/ltltest/equals.test: Add more tests.
2012-04-28 09:30:34 +02:00
Alexandre Duret-Lutz
4e1a68e676 Summarize recent changes.
* NEWS: Here.
2012-04-28 09:16:55 +02:00
Alexandre Duret-Lutz
03aca91648 Don't compare memory consumption between 2 runs of dve2check
* iface/dve2/dve2check.test: Here.
2012-04-27 22:47:54 +02:00
Alexandre Duret-Lutz
8aa653e010 [lbtt] Fix make pdf.
* doc/gpl.texi: Fix make pdf for newer texinfo.tex.
2012-04-27 22:47:54 +02:00
Alexandre Duret-Lutz
324802c04f Change the simulation option from -RSD to -RDS and document it.
* src/tgbatest/ltl2tgba.cc: Here.
* src/tgbatest/spotlbtt.test: Adjust.
2012-04-27 22:47:54 +02:00
Alexandre Duret-Lutz
7e5875845a Remove the old broken game-theory-based simulation reductions.
This implementation of direct simulation was only working on
degeneralized automata, and produce automata that are inferiors to
those output by the new direct simulation implementation (in
tgba/simulation.hh) which can also work on TGBA.  The delayed
simulation has never been reliable.  It's time for some spring
cleaning.

* src/tgba/tgbareduc.hh, src/tgba/tgbareduc.cc: Delete.
* src/tgba/Makefile.am: Adjust.
* src/tgbaalgos/reductgba_sim.cc, src/tgbaalgos/reductgba_sim.hh:
Remove all code, and keep only a deprecated replacement
from reduc_tgba_sim().
* src/tgbaalgos/reductgba_sim_del.cc: Delete.
* src/tgbaalgos/Makefile.am: Adjust.
* src/tgbatest/reduccmp.test, src/tgbatest/reductgba.cc,
src/tgbatest/reductgba.test: Delete.
* src/tgbatest/Makefile.am: Adjust.
* src/tgbatest/ltl2tgba.cc: Undocument options -R1s, -R1t,
-R2s, -R2t, and implement them using the new direct simulation.
Remove options -Rd and -RD.
* src/tgbatest/spotlbtt.test: Remove entry using these old options.
* wrap/python/spot.i: Do not process tgbaalgos/reductgba_sim.cc.
2012-04-27 22:47:49 +02:00
Alexandre Duret-Lutz
7ba4ab7931 slights documentation changes around direct simulation
* src/tgbaalgos/simulation.hh: Mention the fact that this is
a "direct" simulation.
* wrap/python/ajax/ltl2tgba.html: Likewise, and change the key
to "ds".
* wrap/python/ajax/protocol.txt, wrap/python/ajax/spot.in: Adjust.
2012-04-27 15:51:20 +02:00
Alexandre Duret-Lutz
cdd576458c Document --without-included-lbtt.
* README: Here.
2012-04-27 15:40:54 +02:00
Alexandre Duret-Lutz
9ea0e00ae7 Define WEXITSTATUS if not available (e.g. on MinGW)
* iface/dve2/dve2.cc: Here.
2012-04-27 15:40:54 +02:00
Alexandre Duret-Lutz
2c8e5297e7 Use clock() when times() is not available.
* configure.ac: Check for times() and sys/times.h.
* src/misc/timer.hh: Include sys/times.h conditionally
and use clock() if times() is not available.
Reported by Yann Thierry-Mieg.
2012-04-27 15:40:54 +02:00
Alexandre Duret-Lutz
8620138069 memusage: drop two useless includes.
* src/misc/memusage.cc: Do not include the unneeded sys/time.hh
and sys/resource.h.  Reported by Yann Thierry-Mieg.
2012-04-27 15:40:54 +02:00
Alexandre Duret-Lutz
907ba16bfa [lbtt] Remove a useless configure check.
* configure.ac: Do not check for mkstemp(), it is not used.
2012-04-27 15:40:54 +02:00
Thomas Badie
dfcaed034e Add the simulation in the Spot web interface.
* wrap/python/ajax/spot.in: Add the simulation.
* wrap/python/ajax/protocol.txt: Add the direct simulation in the
automaton simplifications section.
* wrap/python/spot.i (simulation_new): Create a function which
takes an automaton and a call to the simulation with the good
template parameter.
* wrap/python/ajax/ltl2tgba.html: Add the direct simulation
checkbox.
2012-04-18 19:02:09 +02:00
Thomas Badie
085ea52bf5 Fix two VPath-related bugs in bench.
* bench/ltl2tgba/known (ltlfile): Add a $srcdir.
* bench/ltlclasses/defs.in (builddir): Add the $builddir.
* bench/ltlclasses/run (gen): Change the $srcdir into $builddir.
2012-04-18 19:02:09 +02:00
Thomas Badie
876f8c90a2 Create the direct simulation.
* src/tgbaalgos/simulation.cc, src/tgbaalgos/simulation.hh: New files.
* src/tgbaalgos/Makefile.am: Add the new files to the compilation.
* src/tgbatest/spotlbtt.test: Add the simulation.
* src/tgbatest/ltl2tgba.cc: Add direct simulation (-RSD).
2012-04-18 19:02:09 +02:00
Thomas Badie
e75ad57446 Add a class to convert a bdd into its complement.
* src/misc/acccompl.cc, src/misc/acccompl.hh: Add a way to
an acceptance condition in an automaton, into its
complement.
Create a method to make the reverse operation.
* src/misc/Makefile.am: Add the new files to the compilation.
2012-04-18 18:54:41 +02:00
Alexandre Duret-Lutz
d3be530410 tgbatba: fix destroying of cache variables.
* src/tgba/tgbatba.cc (tgba_tba_proxy::~tgba_tba_proxy):
Zero last_support_conditions_input_ and last_support_variables_input_.
2012-04-13 12:23:53 +02:00
Alexandre Duret-Lutz
8269ae9cee tgbaexplicit: execute the test
* src/tgbatest/explicit2.test: New file.
* src/tgbatest/Makefile.am: Add it.
* src/tgbatest/explicit2.cc: Print the LTL formula as text.
2012-04-13 08:43:58 +02:00
Alexandre Duret-Lutz
37a6b601c1 Declare the sba class in its own header.
* src/tgba/sba.hh: New file, extrated from...
* src/tgba/tgbaexplicit.hh: ... here.  Also rename
sba_explicit::is_accepting as sba_explicit::state_is_accepting for
consistency with tgba_sba_proxy.
* src/tgbatest/explicit2.cc: Adjust to the renaming.
* src/tgba/Makefile.am: Add sba.hh.
2012-04-13 08:43:58 +02:00
Pierre PARUTTO
937248e561 Correct a bug in tgba_explicit_succ_iterator class
* src/tgba/tgbaexplicit.hh (current_acceptance_conditiosn):
remove a suspect and in return statement
2012-04-12 17:40:12 +02:00
Pierre PARUTTO
9cfc408262 Modify is_accepting sba's method to run in constant time.
* src/tgba/tgbaexplicit.hh: modify is_accepting method
2012-04-12 17:40:12 +02:00
Pierre PARUTTO
eec3a12f80 Implement sba_explicit class, add tests
* src/tgba/tgbaexplicit.hh: Add sba_explicit implementation
* src/tgbatest/explicit2.cc: Add test to check the good instantiation
of sba_explicit_*
2012-04-12 17:40:12 +02:00
Alexandre Duret-Lutz
603c5d603b tgba_explicit: make the new class work with Swig.
* src/tgba/tgbaexplicit.hh (explicit_graph, tgba_explicit): Make the
transition type explicit.
(state_explicit_string::get_iterator): New method.
(explicit_graph::get_transition): Use it.
(tba): Rename as ...
(sba): ... this.
* wrap/python/spot.i: Instanciate explicit_graph and tgba_explicit
for all three types.
2012-04-12 17:40:12 +02:00
Pierre PARUTTO
a15aac2845 Revamp tgbaexplicit.hh
* src/tgba/tgbaexplicit.hh, src/tgba/tgbaexplicit.cc: Factor most of
the code in an explicit_graph<State, Type> that inherits from type.
The tgba_explicit type<State> now inherits from
explicit_graph<State,tgba>.
* src/ltlvisit/contain.cc, src/neverparse/neverclaimparse.yy
src/tgba/tgbareduc.cc, src/tgba/tgbareduc.hh, src/tgbaalgos/cutscc.cc,
src/tgbaalgos/dupexp.cc, src/tgbaalgos/dupexp.hh,
src/tgbaalgos/emptiness.cc, src/tgbaalgos/ltl2tgba_fm.cc,
src/tgbaalgos/ltl2tgba_fm.hh, src/tgbaalgos/minimize.cc,
src/tgbaalgos/powerset.cc, src/tgbaalgos/randomgraph.cc,
src/tgbaalgos/sccfilter.cc, src/tgbaparse/tgbaparse.yy,
src/tgbatest/complementation.cc, src/tgbatest/explicit.cc,
src/tgbatest/explprod.cc, src/tgbatest/ltl2tgba.cc,
src/tgbatest/mixprod.cc, src/tgbatest/powerset.cc,
src/tgbatest/tgbaread.cc, src/tgbatest/tripprod.cc:
Replace tgba_explicit* by the actual type used.
* src/tgbatest/explicit2.cc: New file.
* src/tgbatest/Makefile.am: Add it.
2012-04-12 17:39:48 +02:00
Alexandre Duret-Lutz
9e2b932fe6 maint: add .checklog
* .checklog: New file.
2012-04-11 12:27:09 +02:00
Alexandre Duret-Lutz
e9ea9fd3fe maint: set umask 022 in lrde-upload.sh
* lrde-upload.sh: Call umask, so that newly created directories are
accessible.
2012-03-19 07:59:15 +01:00
Alexandre Duret-Lutz
862c248a41 ltl2tgba.html: Scroll to result. (Suggested by Thomas Badie.)
* wrap/python/ajax/ltl2tgba.html: Scroll the the results the first
time a formula is submitted, and anytime a formula is submitted with
'enter'.  Also do not animate the settings of panels when reloading
the page from a hash fragment.
2012-03-18 22:40:48 +01:00
Alexandre Duret-Lutz
3fb29ce1be Typo: rename automata_ as aut_.
* src/tgbaalgos/reachiter.hh, src/tgbaalgos/reachiter.cc,
src/tgbaalgos/dotty.cc, src/tgbaalgos/dupexp.cc,
src/tgbaalgos/lbtt.cc, src/tgbaalgos/neverclaim.cc,
src/tgbaalgos/reductgba_sim.cc, src/tgbaalgos/reductgba_sim_del.cc,
src/tgbaalgos/save.cc, src/tgbaalgos/sccfilter.cc,
src/tgba/tgbareduc.cc, src/evtgbaalgos/tgba2evtgba.cc,
src/kripke/kripkeprint.cc: Rename automata_ as aut_.
2012-03-17 14:37:59 +01:00
Alexandre Duret-Lutz
4749d77e4f Generate ChangeLog from git log during "make dist".
* tools/gitlog-to-changelog: New file, from gnulib.
* Makefile.am (EXTRA_DIST): Distribute it.
(dist-hook, gen_start, gen-ChangeLog): Generate the ChangeLog during
distdir.
2012-03-12 17:43:46 +01:00
Alexandre Duret-Lutz
915115d9e2 Rename ChangeLog as ChangeLog.1 and leave an empty ChangeLog.
The empty ChangeLog is required so that Automake does not complain.

* ChangeLog: Rename as ...
* ChangeLog.1: ... this.
* Makefile.am (EXTRA_DIST): Distribute it.
* ChangeLog: New empty file.
2012-03-12 16:41:32 +01:00
Alexandre Duret-Lutz
a0a22c4f7d * configure.ac, NEWS: Bump version to 0.8.3a. 2012-03-09 19:09:42 +01:00
Alexandre Duret-Lutz
91b59bfe66 Release Spot 0.8.3.
* configure.ac, NEWS: Bump version to 0.8.3.
2012-03-09 18:41:11 +01:00
Alexandre Duret-Lutz
a01034e5f9 Fix a segfault in the CGI script, reported by Denis.
* src/tgbaalgos/emptiness.cc
(emptiness_check_instantiator::construct): Set *err = 0
on success.  This avoids problem with the python bindings
always converting *err to a string and sometimes failing
to do so when err was not initialized.
2012-03-09 08:38:55 +01:00