alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3727 commits 6 branches 0 tags 36 MiB
Commit graph

3727 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexandre Duret-Lutz
600b21acfe * m4/lbtt.m4: Run lbtt-translate, not lbtt. 2003-07-12 17:59:47 +00:00
Alexandre Duret-Lutz
c8f6eee9d3 * iface/gspn/gspn.cc: Include cassert. 2003-07-12 17:54:16 +00:00
Alexandre Duret-Lutz
9a4da5ffd4 * src/tgbaalgos/ltl2tgba.cc (ltl_trad_visitor::visit(multop)): 
Forward root_ to children of And.
(ltl_trad_visitor::recurse): Take a root argument.
 2003-07-10 14:27:19 +00:00
Alexandre Duret-Lutz
b963af66f1 * src/tgba/tgbabddconcretefactory.hh 
(tgba_bdd_concrete_factory::add_relation): Rename as ...
(tgba_bdd_concrete_factory::constrain_relation): ... this.
* src/tgba/tgbabddconcretefactory.cc, src/tgbaalgos/ltl2tgba.cc:
Adjust.
 2003-07-10 14:13:56 +00:00
Alexandre Duret-Lutz
f661b0adc4 * src/tgbaalgos/ltl2tgba.cc (ltl_trad_visitor::visit(unop::G)): Do 
not create Now/Next variable when G is the root of the formula.
(ltl_trad_visitor::ltl_trad_visitor): Take a root argument.
(ltl_trad_visitor::recurse): Create a new visitor, do not copy
the current one.
(ltl_to_tgba): Build ltl_trad_visitor with root = true.

* src/tgbaalgos/ltl2tgba.cc (ltl_trad_visitor::visit(unop::X)):
Remove FIXME about handling X(a U b) and X(a R b) better, it's
done naturally.
 2003-07-10 13:55:20 +00:00
Alexandre Duret-Lutz
871f421b5e spacing 2003-07-10 12:46:39 +00:00
Alexandre Duret-Lutz
006bd6b930 * src/tgbatest/spotlbtt.test: Make 100 rounds. 2003-07-10 12:01:41 +00:00
Alexandre Duret-Lutz
977d389724 * src/tgba/succiterconcrete.cc (tgba_succ_iterator_concrete::next): 
Fix so that !p.!Acc[g].Acc[f] + p.!Acc[g].Acc[f] + p.Acc[g].!Acc[f]
is factored as !p.!Acc[g].Acc[f] + p.(!Acc[g].Acc[f] + Acc[g].!Acc[f]),
not !Acc[g].Acc[f] + p.Acc[g].!Acc[f].
 2003-07-10 11:56:03 +00:00
Alexandre Duret-Lutz
bbba8ca966 Spot wants ^', not xor'. 
* src/SpotWrapper.hh (SpotWrapper::SPOT_XOR): Declare.
* src/SpotWrapper.cc (SpotWrapper::SPOT_XOR): Define.
(SpotWrapper::translateFormula): Use SPOT_XOR.
 2003-07-10 08:26:23 +00:00
Alexandre Duret-Lutz
79bed65843 * lbtt/: New directory. Contains a patched version of lbtt 1.0.1. 
* Makefile.am (MAYBE_LBTT): New variables.
(SUBDIRS): Add $(MAYBE_LBTT).
(EXTRA_DIST): Add m4/lbtt.m4.
* configure.ac: Call AX_CHECK_LBTT.
* m4/lbtt.m4: New file.
* src/tgbatest/Makefile.am (check_PROGRAMS): Add spotlbtt.
(spotlbtt_SOURCES): New variables.
(TESTS): Add spotlbtt.test.
(CLEANFILE): Add config.
* src/tgbatest/defs.in (top_builddir, LBTT, LBTT_TRANSLATE): New
substitutions.
* src/tgbatest/spotlbtt.cc, src/tgbatest/spotlbtt.test: New files.
 2003-07-09 15:40:24 +00:00
Alexandre Duret-Lutz
71b7da1437 I want $? = 1 whenever some test fails. 
* src/main.cc (testLoop): Return 1 iff an error occured.
(main): Use testLoop's output as exit status.
 2003-07-09 15:34:53 +00:00
Alexandre Duret-Lutz
9df8be4503 typo 2003-07-09 15:05:00 +00:00
Alexandre Duret-Lutz
8af9996863 * src/ExternalTranslator.h (class ExternalTranslator): 
Declare class SpotWrapper as a friend.
* src/SpotWrapper.h, src/SpotWrapper.cc: New files.
* src/Makefile.am (lbtt_translate_SOURCES): Add SpotWrapper.cc
and SpotWrapper.h.
* src/translate.cc (main): Add the --spot option, and build
a SpotWrapper of required.
 2003-07-09 14:11:25 +00:00
Alexandre Duret-Lutz
5cc9c66dc0 * src/tgba/succiterconcrete.cc (tgba_succ_iterator_concrete::next): 
Fix computation of states sharing the same accepting set.
 2003-07-09 14:06:03 +00:00
Alexandre Duret-Lutz
d14eee25bf * src/tgba/succiterconcrete.cc (tgba_succ_iterator_concrete::next): 
Fix computation of states sharing the same accepting state.
 2003-07-09 14:05:49 +00:00
Alexandre Duret-Lutz
2a8b1b7471 Make sure we only output one initial state in LBTT's output. 
* src/tgbaalgos/lbtt.cc (fill_todo): Add the 'first' argument
to designate initial states.
(lbtt_reachable): Adjust calls to fill_todo.  Handle the
fake initial state accepting conditions specially.
* src/tgbaalgos/lbtt.hh: Update comments.
 2003-07-09 14:03:43 +00:00
Alexandre Duret-Lutz
ea04df6971 * src/tgbaalgos/lbtt.cc (lbtt_reachable): Do not end transitions 
guards with -1 in output.
 2003-07-09 11:43:04 +00:00
Alexandre Duret-Lutz
f9c8eb1cb7 * src/tgbatest/ltl2tgba.cc: Add option -t to output the LBTT automata. 
* src/tgbaalgos/lbtt.cc, src/tgbaalgos/lbtt.hh: New files.
* src/tgbaalgos/Makefile.am (tgbaalgos_HEADERS): Add lbtt.hh.
(libtgbaalgos_la_SOURCES): Add lbtt.cc.
* src/tgba/bddprint.cc (print_sat_handler): Put a space after "!".
* src/tgbatest/readsave.test: Adjust spaces after "!".
 2003-07-08 15:45:11 +00:00
Alexandre Duret-Lutz
a307c0d0ae spacing 2003-07-08 11:54:46 +00:00
Alexandre Duret-Lutz
63e23c7a68 * src/ltlvisit/dump.cc: Strip useless spot::ltl:: prefixes. 2003-07-08 08:08:12 +00:00
Alexandre Duret-Lutz
7690e9ad9c First sketch of the GSPN wrapper objects. 
* iface/gspn/gspn.cc, iface/gspn/gspn.hh: New files.
* iface/gspn/Makefile.am (libspotgspn_la_SOURCES): Add them.
 2003-07-07 16:41:10 +00:00
Alexandre Duret-Lutz
c96af6251a * src/tgba/succiter.hh (current_state, current_conditions 
current_accepting_conditions): Mark as const.
* src/tgba/succiterconcrete.cc, src/tgba/succiterconcrete.hh,
src/tgba/tgbaexplicit.cc, src/tgba/tgbaexplicit.hh,
src/tgba/tgbaproduct.cc, src/tgba/tgbaproduct.hh,
src/tgba/tgbatranslateproxy.cc, src/tgba/tgbatranslateproxy.hh:
Likewise.
 2003-07-07 13:43:53 +00:00
Alexandre Duret-Lutz
aaeb297aed * iface/gspn/gspnlib.h: Fit 80 columns. 
[__cplusplus]: Wrap everything under extern "C".
 2003-07-07 12:37:45 +00:00
Alexandre Duret-Lutz
5f55663ad3 typo 2003-07-07 11:01:30 +00:00
Alexandre Duret-Lutz
50b6994298 * src/tgba/succiterconcrete.hh 
(tgba_succ_iterator_concrete::current_acc_): New attribute.
* src/tgba/succiterconcrete.cc
(tgba_succ_iterator_concrete::next): Set current_acc_.
(tgba_succ_iterator_concrete::current_accepting_conditions):
Simply return it.
 2003-07-07 10:59:46 +00:00
Alexandre Duret-Lutz
24427cccdb * configure.ac: Output iface/Makefile and iface/gspn/Makefile. 
* iface/Makefile.am, iface/gspn/Makefile.am: New files.
* Makefile.am (SUBDIRS): Add iface.
* iface/gspn/gspnlib.h: New file, from Yann and Souheib.
 2003-07-07 09:55:30 +00:00
Alexandre Duret-Lutz
f754d1112d * src/tgba/tgbabddcoredata.cc (tgba_bdd_core_data::tgba_bdd_core_data, 
tgba_bdd_core_data::translate): Handle all_accepting_conditions.
* src/tgba/tgbabddconcretefactory.cc
(tgba_bdd_concrete_factory::finish): Fill all_accepting_conditions.
 2003-07-07 09:34:15 +00:00
Alexandre Duret-Lutz
bca9d83c44 * src/Config-parse.yy: Remove stray `,' in %token arguments. 
* src/Alloc.h (__INT_TO_PTR): Redefine to work around glibc 2.3.
* doc/texinfo.tex: New upstream version.
 2003-07-04 16:32:14 +00:00
Alexandre Duret-Lutz
88b6012502 * src/tgbaalgos/ltl2tgba.cc (ltl_trad_visitor::visit): Declare 
accepting conditions w.r.t. to Now variables, not Next.
 2003-07-04 09:35:29 +00:00
Alexandre Duret-Lutz
4432b2388b * src/tgba/tgbaproduct.cc (tgba_product_succ_iterator::first): 
Simplify, do not call next_non_false_() either side is done.
 2003-07-03 14:04:25 +00:00
Alexandre Duret-Lutz
c09f646e3f * src/tgba/succiter.hh (tgba_succ_iterator::current_condition): 
State that this is a boolean function.
* src/tgba/succiterconcrete.hh
(tgba_succ_iterator_concrete::trans_dest_,
tgba_succ_iterator_concrete::trans_set_,
tgba_succ_iterator_concrete::trans_set_left_,
tgba_succ_iterator_concrete::neg_trans_set_): Remove.
* src/tgba/succiterconcrete.cc
(tgba_succ_iterator_concrete::tgba_succ_iterator_concrete,
tgba_succ_iterator_concrete::first): Adjust to removed members.
(tgba_succ_iterator_concrete::next): Simplify, transitions
are no labelled by boolean functions, not only conjunctions.
Suggested by Denis Poitrenaud.
 2003-07-03 14:02:23 +00:00
Alexandre Duret-Lutz
3281b6e9b3 spacing 2003-07-02 14:28:24 +00:00
Alexandre Duret-Lutz
0fe98c6d18 * src/tgba/tgbabddcoredata.hh (tgba_bdd_core_data::translate): New 
function.
* src/tgba/tgbabddcoredata.cc (tgba_bdd_core_data::translate):
Likewise.
* src/tgba/tgbabddtranslatefactory.cc
(tgba_bdd_translate_factory::tgba_bdd_translate_factory): Use
tgba_bdd_core_data::translate.
 2003-07-02 14:28:06 +00:00
Alexandre Duret-Lutz
2ea7cbe0f5 * src/tgba/tgbabddcoredata.hh (tgba_bdd_core_data::nownext_set): 
New attribute.
* tgba/tgbabddcoredata.cc, tgba/tgbabddtranslatefactory.cc:
Handle nownext_set.
* src/tgba/succiterconcrete.cc
(tgba_succ_iterator_concrete::next): Use nownext_set to simplify.
 2003-07-02 14:19:04 +00:00
Alexandre Duret-Lutz
2ed074750d typo 2003-07-02 13:20:33 +00:00
Alexandre Duret-Lutz
dfe74f3134 Rewrite tgba_succ_iterator_concrete::next for the fourth time 
(or is it the fifth?).

* src/tgba/succiterconcrete.hh
(tgba_succ_iterator_concrete::trans_dest_,
tgba_succ_iterator_concrete::trans_set_,
tgba_succ_iterator_concrete::trans_set_left_,
tgba_succ_iterator_concrete::neg_trans_set_): New attributes.
* src/tgba/succiterconcrete.cc
(tgba_succ_iterator_concrete::tgba_succ_iterator_concrete): Initialize
new members.
(tgba_succ_iterator_concrete::first): Likewise.
(tgba_succ_iterator_concrete::next): Rewrite.
* tgba/tgbabddcoredata.hh (tgba_bdd_core_data::acc_set): New attribute.
* tgba/tgbabddcoredata.cc, tgba/tgbabddtranslatefactory.cc:
Handle acc_set.
 2003-07-02 13:19:19 +00:00
Alexandre Duret-Lutz
42680e82bf * src/tgba/tgbabddtranslatefactory.cc 
(tgba_bdd_translate_factory::tgba_bdd_translate_factory): Translate
varandnext_set.
 2003-07-01 11:41:17 +00:00
Alexandre Duret-Lutz
d3a9261816 * src/tgbaparse/tgbaparse.yy (lines): Expect at last one line. 2003-06-30 16:47:56 +00:00
Alexandre Duret-Lutz
cd8090d66c typo 2003-06-30 15:40:02 +00:00
Alexandre Duret-Lutz
e562620885 * doc/Doxyfile.in (HAVE_DOT): Set to YES to output 
collaboration diagrams.
* doc/mainpage.dox: Typo.

* src/tgba/state.hh (state::as_bdd): Delete.
* src/tgba/tgbaproduct.hh (state_bdd_product): Inherit from state,
not state_bdd.
(state_bdd_product::state_bdd_product): Adjust.
* src/tgba/tgbaproduct.cc (state_bdd_product::state_bdd_product):
Adjust.

* src/tgba/succiter.hh (tgba_bdd_succ_iterator::done):
Mark as const.
* src/tgba/succiterconcrete.cc
(tgba_succ_iterator_concrete::done): Likewise.
* src/tgba/succiterconcrete.hh
(tgba_succ_iterator_concrete::done): Likewise.
* src/tgba/tgbaexplicit.cc
(tgba_explicit_succ_iterator::done): Likewise.
* src/tgba/tgbaexplicit.hh
(tgba_explicit_succ_iterator::done): Likewise.
* src/tgba/tgbaproduct.cc
(tgba_product_succ_iterator::done): Likewise.
* src/tgba/tgbaproduct.hh
(tgba_product_succ_iterator::done): Likewise.
* src/tgba/tgbatranslateproxy.hh
(tgba_translate_proxy_succ_iterator::done): Likewise.
* src/tgba/tgbatranslateproxy.cc
(tgba_translate_proxy_succ_iterator::done): Likewise.

* src/tgba/succiterconcrete.cc
(tgba_succ_iterator_concrete::next): Call bdd_satoneset
on data_.varandnext_set.  The previous implementation
was wrong for GFa.
* src/tgba/tgbabddcoredata.hh: Declare varandnext_set.
* src/tgba/tgbabddcoredata.cc: Handle varandnext_set.
 2003-06-30 15:38:41 +00:00
Alexandre Duret-Lutz
b53d8aac71 * doc/Doxygen.in: Enable LaTeX output. 
* doc/Makefile.am (spotref.pdf): New rule.
(EXTRA_DIST): Add spotref.pdf.
 2003-06-30 12:07:30 +00:00
Alexandre Duret-Lutz
12f66a3b18 * src/tgba/tgbabddconcretefactory.cc: 
(tgba_bdd_concrete_factory::tgba_bdd_concrete_factory): New.
(tgba_bdd_concrete_factory::create_state): Update now_to_next_.
(tgba_bdd_concrete_factory::finish): Constraint Next variables
in the relation.
* src/tgba/tgbabddconcretefactory.hh
(tgba_bdd_concrete_factory::now_to_next_): New variable.
 2003-06-30 08:15:06 +00:00
Alexandre Duret-Lutz
cf136e84bd * src/tgba/tgbabddconcretefactory.cc: 
(tgba_bdd_concrete_factory::tgba_bdd_concrete_factory): New.
(tgba_bdd_concrete_factory::create_state): Update now_to_next_.
(tgba_bdd_concrete_factory::finish): Constraint Next variables
in the relation.
* src/tgba/tgbabddconcretefactory.hh
(tgba_bdd_concrete_factory::now_to_next_): New variable.
 2003-06-30 08:15:05 +00:00
Alexandre Duret-Lutz
6f2f4d0247 more files to ignore 2003-06-30 07:48:20 +00:00
Alexandre Duret-Lutz
692f78d663 Fix errors reported by ICC. 
* src/tgba/state.hh (state_ptr_less_than::operator()): Make it const.
* src/tgba/tgbaproduct.cc: Include string.hh.
* src/ltlast/multop.hh (multop::add, multop::add_sorted): Do
not use qualified names in declarations.
* m4/gccwarn.m4 (CF_GXX_WARNINGS): Fix GXX test.
* src/ltlenv/defaultenv.hh, src/ltlenv/defaultenv.cc,
src/ltlenv/environment.hh: Add virtual destructors.
 2003-06-28 10:10:25 +00:00
Alexandre Duret-Lutz
59c145a8fb * Makefile.am (EXTRA_DIST): Add HACKING. 2003-06-26 16:46:13 +00:00
Alexandre Duret-Lutz
d874332e27 * configure.ac: Bump version to 0.0c. 2003-06-26 16:45:43 +00:00
Alexandre Duret-Lutz
d852f2c882 * configure.ac: Bump version to 0.0b. 2003-06-26 16:25:54 +00:00
Alexandre Duret-Lutz
3d129932a8 * INSTALL: New file. 2003-06-26 15:23:33 +00:00
Alexandre Duret-Lutz
7fdd78614c * src/tgba/ltl2tgba.hh, src/tgba/ltl2tgba.cc: Move ... 
* src/tgbaalgos/ltl2tgba.hh, src/tgbaalgos/ltl2tgba.cc: ... here.
* src/tgba/Makefile.am, src/tgbaalgos/Makefile.am: Adjust.
* src/tgba/public.hh: Do not include ltl2tgba.hh.
* src/tgbatests/explprod.cc, src/tgbatests/ltl2tgba.cc,
src/tgbatests/ltlprod.cc, src/tgbatests/mixprod.cc,
src/tgbatests/reach.cc, src/tgbatests/tripprod.cc: Adjust inclusions.
 2003-06-26 15:15:39 +00:00