Commit graph

790 commits

Author SHA1 Message Date
Denis Poitrenaud
addb3a30cd * src/tgbatest/randtgba.cc: Close the formula file and remove a trace. 2005-01-13 18:16:32 +00:00
Denis Poitrenaud
2653b35ba7 * src/tgbatest/randtgba.cc: Add products with formulae issued of a file
and more statistics.
* src/tgbatest/readsave.test: Undo previous change.
2005-01-13 18:00:25 +00:00
Denis Poitrenaud
4e6ce2e739 * src/tgbatest/readsave.test: Fix parameter of randtgba call.
more statistics.
the heap used for bit state hashing version and adjust the prototype of
* src/tgbaalgos/tau03.cc, src/tgbaalgos/tau03opt.cc: adjust the
prototype of has_been_visited and pop_notify.
2005-01-13 09:21:22 +00:00
Denis Poitrenaud
333ee43f00 * src/tgbatest/randtgba.cc: Add products with randomized formulae and 2005-01-12 18:38:25 +00:00
Alexandre Duret-Lutz
0ff7f3ba2f * src/tgbaalgos/gv04.cc (result): Implement the acss_statistics,
and ars_statistics interfaces.
2005-01-11 14:42:00 +00:00
Denis Poitrenaud
81423bb743 * src/ltltest/randltl.cc: Typo. 2005-01-11 12:37:43 +00:00
Denis Poitrenaud
86b7f26960 * src/tgbaparse/tgbaparse.yy: Accept automaton without state.
* src/ltltest/randltl.cc: Typo.
2005-01-11 12:27:37 +00:00
Denis Poitrenaud
3f2790061a * src/tgbatest/randtgba.cc: Typo. 2005-01-10 18:26:14 +00:00
Alexandre Duret-Lutz
1cc003ec38 * src/tgbatest/ltl2tgba.cc: Typo. 2005-01-10 17:26:11 +00:00
Alexandre Duret-Lutz
6a0ab6c081 * src/tgbatest/randtgba.cc: Add option -P. 2005-01-10 17:22:25 +00:00
Denis Poitrenaud
a4b9b791ef * src/tgbaalgos/tau03.cc: Typo.
* src/tgbatest/ltl2tgba.cc: Add option -b.
2005-01-10 17:17:19 +00:00
Alexandre Duret-Lutz
7c07f3149f * src/tgbaalgos/ndfs_result.hxx (ndfs_result, acss_interface):
Conditionally inherit from acss_statistics.
* src/tgbaalgos/magic.cc, src/tgbaalgos/se05.cc, src/tgbaalgos/tau03.cc,
src/tgbaalgos/tau03opt.cc: Define Has_Size in all heaps.
2005-01-07 10:27:17 +00:00
Denis Poitrenaud
603b49e216 * src/ltltest/randltl.cc: Include cassert.
* src/tgbaalgos/ndfs_result.hxx: Implement the spot::acss_statistics
interface.
* src/tgbaalgos/magic.cc, src/tgbaalgos/se05.cc, src/tgbaalgos/tau03.cc,
src/tgbaalgos/tau03opt.cc: Add to each heap class a method returning its
size.
2005-01-06 15:54:48 +00:00
Alexandre Duret-Lutz
174b531f82 * src/ltltest/randltl.cc: Add options -r and -u.
* src/ltltest/reduc.test: Use randltl -u, and run it through valgrind.
2005-01-06 12:29:56 +00:00
Alexandre Duret-Lutz
e366b081a8 * src/ltlvisit/randomltl.cc, src/ltlvisit/randomltl.hh: New files.
* src/ltlvisit/Makefile.am (ltlvisit_HEADERS,
libltlvisit_la_SOURCES): Distribute them.
* src/ltltest/randltl.cc: New file.
* src/ltltest/Makefile.am (LDADD): Link with ../libspot.la directly.
(noinst_PROGRAMS, randltl_SOURCES): New.
(EXTRA_DIST, CLEANFILES): The list of random formulae is now generated.
* src/ltltest/formulae.txt: Delete.
* src/ltltest/reduc.test: Use randltl to generate formulae.
* src/ltlvisit/length.cc (length_visitor): Fix computation
of the length of multops.
* src/ltlvisit/length.hh (length): Document the length of multops.
2005-01-05 16:20:21 +00:00
Alexandre Duret-Lutz
7216701631 * src/sanity/includes.test: Also check *.hxx files.
* src/tgbaalgos/ndfs_result.hxx: Rename the include guard.
2005-01-04 13:32:53 +00:00
Alexandre Duret-Lutz
e9beca0d56 fix eof, truncated by last commit 2005-01-04 13:20:50 +00:00
Alexandre Duret-Lutz
b054139e6d * doc/Doxyfile.in (FILE_PATTERNS): Remove *.hxx.
* src/sanity/80columns.test, src/sanity/style.test: Process *.hxx files.
* src/tgbaalgos/ndfs_result.hh: Rename as ..
* src/tgbaalgos/ndfs_result.hxx: ... this, so it does not get
documented (and so Doxygen do not complain).
* src/tgbaalgos/magic.cc, src/tgbaalgos/se05.cc, src/tgbaalgos/tau03.cc,
src/tgbaalgos/tau03opt.cc: Adjust include.
* src/tgbaalgos/Makefile.am: Rename ndfs_result.hh as ndfs_result.hxx
and do not install it, this is a private header.
2005-01-03 17:39:43 +00:00
Alexandre Duret-Lutz
a9ab303859 * src/tgbaalgos/emptiness.hh: Declare Doxygen group
emptiness_check_stats.
* src/tgbaalgos/emptiness_stats.hh: Use it.
2005-01-03 16:59:53 +00:00
Alexandre Duret-Lutz
685c23a756 * doc/Doxyfile.in: Update for Doxygen 1.4.0, set
DOT_MULTI_TARGETS, and disable GROUP_GRAPH (it causes segfault).
* src/tgbaparse/public.hh (format_tgba_parse_errors): Complete
Doxygen comment.
2005-01-03 16:40:15 +00:00
Alexandre Duret-Lutz
55c08790fd * src/tgbaalgos/emptiness_stats.hh (ars_statistics): New class.
* src/tgbaalgos/ndfs_result.hh (ndfs_result): Inherit from
ars_statistics.
(ndfs_result::dfs): Call inc_ars_states().
(ndfs_result::test_path, ndfs_result::min_path): Update ars_statistics.
* tgbaalgos/gtec/ce.hh (couvreur99_check_result): Inherit
from ars_statistics.
* tgbaalgos/gtec/ce.cc (shortest_path,
couvreur99_check_result::accepting_cycle::scc_bfs):
Update ars_statistics.
* src/tgbatest/randtgba.cc: Display statistics about accepting run
search.
2005-01-03 15:49:50 +00:00
Alexandre Duret-Lutz
6feb92090d * src/tgbaalgos/bfssteps.hh (bfs_steps::finalize): Document. 2005-01-03 14:20:08 +00:00
Alexandre Duret-Lutz
ca2fe6c711 * src/tgbaalgos/emptiness_stats.hh (accs_statistics): New class.
* src/tgbaalgos/gtec/ce.cc, src/tgbaalgos/gtec/ce.hh
(couvreur99_check_result): Inherit from acss_statistics.
(couvreur99_check_result::acss_states): Implement it.
* src/tgbatest/randtgba.cc: Display statistics about accepting cycle
search space.
2005-01-03 13:10:35 +00:00
Alexandre Duret-Lutz
13183893dd * src/tgbaalgos/ndfs_result.hh (construct_prefix): Do not call
erase() after splice(), splice() already removes the elements.
2005-01-03 12:11:28 +00:00
Alexandre Duret-Lutz
000c041a95 * src/evtgba/evtgbaiter.hh, src/ltlast/formula.hh,
src/ltlast/refformula.hh, src/ltlenv/defaultenv.hh,
src/misc/bareword.hh, src/tgba/succiter.hh,
src/tgba/tgbabddfactory.hh, src/tgba/tgbareduc.hh,
src/tgbaalgos/dupexp.hh, src/tgbaalgos/emptiness_stats.hh,
src/tgbaalgos/ltl2tgba_fm.hh, src/tgbaalgos/ltl2tgba_lacim.hh,
src/tgbaalgos/reductgba_sim.hh, src/tgbaalgos/tau03opt.hh: Add
or fix include guards.
* src/sanity/includes.test: Check the presence of the include
guard.
2005-01-03 10:20:26 +00:00
Alexandre Duret-Lutz
93f77c5782 * src/tgbaalgos/gtec/nsheap.hh, src/tgbaalgos/gtec/nsheap.cc
(index_and_insert): New function.
* src/tgbaalgos/gtec/gtec.cc (couvreur99_check_shy::check): Rewrite.
(couvreur99_check_shy::clear_todo): New method.
* src/tgbaalgos/gtec/gtec.hh (couvreur99_check_shy::todo_item): New
struct.
* iface/gspn/ssp.cc (numbered_state_heap_ssp_semi::index_and_insert):
New method.
2004-12-29 15:29:26 +00:00
Alexandre Duret-Lutz
988dbbd367 * doc/Doxyfile.in (EXCLUDE_SYMLINKS): Set to YES, since we have no
legitimate symlink in our source tree.  Requested by Akim Demaille.
2004-12-20 13:35:33 +00:00
Denis Poitrenaud
8dbc9424c1 * src/tgbaalgos/ndfs_result.hh: Rewrite the computation of accepting
runs.
* src/tgbaalgos/bfssteps.hh, src/tgbaalgos/bfssteps.cc: Add the method
finalize witch compute (by default) the traversed path.
* src/tgbaalgos/magic.cc, src/tgbaalgos/se05.cc: Fix a bug concerning
the heap used for bit state hashing version and ajust the prototype of
has_been_visited and pop_notify.
* src/tgbaalgos/tau03.cc, src/tgbaalgos/tau03opt.cc: ajust the prototype
of has_been_visited and pop_notify.
2004-12-20 10:09:45 +00:00
Alexandre Duret-Lutz
0c2c12a80f * src/tgbaalgos/ndfs_result.hh: Include misc/hash.hh. 2004-12-17 08:33:32 +00:00
Alexandre Duret-Lutz
e7a3ebb16a * src/tgbaalgos/reducerun.cc (reduce_run): Do not call erase() after
splice(), splice() already remove the elements.
* src/tgbaalgos/gtec/ce.cc (couvreur99_check_result::accepting_run):
Likewise.
2004-12-16 23:13:33 +00:00
Alexandre Duret-Lutz
58aff37db9 * src/tgbatest/randtgba.cc: Add option -O, so we can profile each
emptiness-check on its own.
2004-12-16 21:49:46 +00:00
Alexandre Duret-Lutz
0efca0f644 * src/ltlparse/ltlscan.ll: Pass yyleng to the std::string constructor,
so it doesn't have to compute it.
* src/tgbaparse/tgbascan.ll: Likewise.
(YY_USER_INIT, current_file): Remove, it is too costly to use
yy::Location::filename in the current implementation
of yy::Location (this attribute is duplicated for each token).
Leaving it empty divides the parsing time by 3.
* src/tgbaparse/fmterror.cc, src/tgbaparse/public.hh
(format_tgba_parse_errors): Take the filename as argument.
* src/tgbatest/explprod.cc, src/tgbatest/ltl2tgba.cc,
src/tgbatest/mixprod.cc, src/tgbatest/powerset.cc,
src/tgbatest/readsave.cc, src/tgbatest/reductgba.cc,
src/tgbatest/tgbaread.cc, src/tgbatest/tripprod.cc,
iface/gspn/dottyssp.cc, iface/gspn/ltlgspn.cc: Adjust calls
to format_tgba_parse_errors.
2004-12-16 12:33:37 +00:00
Alexandre Duret-Lutz
704f237a22 * src/tgbaparse/tgbaparse.yy: Cache parsed formulae to speedup
reading of TGBAs with lots of identical conditions.
2004-12-15 17:13:44 +00:00
Alexandre Duret-Lutz
752d4afc31 * src/tgba/bdddict.hh (bdd_dict) <fv_map, vf_map, ref_set,
vr_map, free_annonymous_list_of_type>: Redeclare as std::map,
instead of Sgi::hash_map.  It proved to be faster.
* src/tgbaalgos/ltl2tgba_fm.cc (translate_dict) <fv_map, vf_map>:
Use the same definition as in bdd_dict.
* tgbaalgos/reachiter.hh, tgbaalgos/replayrun.cc: Explicitly
include misc/hash.hh.
2004-12-15 16:23:07 +00:00
Alexandre Duret-Lutz
b0a51a0656 Adjust Swig rules for Swig 1.3.24 (and probably 1.3.23 too).
Compiling the runtime in a separate modules is no longer required,
and actually it does not work anymore...
* wrap/python/swigpy.i: Remove.
* wrap/python/Makefile.am (_swigpy.la): Remove all references.
($(srcdir)/spot_wrap.cxx, $(srcdir)/buddy_wrap.cxx): Do not
use -noruntime.
2004-12-15 12:59:46 +00:00
Alexandre Duret-Lutz
73c42db23d * src/tgbatest/ltl2tgba.cc: Add option -P. 2004-12-14 18:40:57 +00:00
Denis Poitrenaud
60f50d66e0 * src/tgbaalgos/ndfs_result.hh: Define the trace output stream. 2004-12-14 14:10:56 +00:00
Denis Poitrenaud
964f856bb5 * src/tgbaalgos/ndfs_result.hh: New file factorizing the computation of
accepting runs for ndfs emptiness check algoritms.
* src/tgbaalgos/Makefile.am: Add it.
* src/tgbaalgos/magic.cc, src/tgbaalgos/se05.cc,
src/tgbaalgos/tau03.cc, src/tgbaalgos/tau03opt.cc: Remove the old
result classes and use the new one.
2004-12-13 08:43:05 +00:00
Alexandre Duret-Lutz
abbd0eee07 * src/tgbaalgos/gtec/status.hh
(couvreur99_check_status::cycle_seed): New attribute.
* src/tgbaalgos/gtec/gtec.cc (couvreur99_check::check,
couvreur99_check_shy::check): Fill cycle_seed.
* src/tgbaalgos/gtec/ce.hh, src/tgbaalgos/gtec/ce.cc:
(couvreur99_check_result::accepting_run,
couvreur99_check_result::accepting_cycle): Revamp to compute a
cycle from the cycle_start, and then the shortest prefix to this
cycle.
2004-12-10 18:33:39 +00:00
Alexandre Duret-Lutz
27966c28f0 * src/tgbaalgos/gtec/nsheap.hh (numbered_state_heap::find): Clarify
comment.
2004-12-10 18:24:15 +00:00
Alexandre Duret-Lutz
3763c2c16b * src/tgba/tgbareduc.hh: Include tgbaalgos/gtec/nsheap.hh,
not tgbaalgos/gtec/status.hh.
2004-12-10 18:22:33 +00:00
Denis Poitrenaud
0222c5e186 * src/misc/timer.cc, src/tgbatest/randtgba.cc: Format the statistics. 2004-12-10 18:15:20 +00:00
Alexandre Duret-Lutz
0fc279c56e * src/tgbatest/emptchkr.test: Tune the "big degeneralized" test
so it actually explore some accepting automata.
2004-12-10 16:23:05 +00:00
Alexandre Duret-Lutz
9782b822f0 * src/tgbaalgos/gtec/gtec.hh, src/tgbaalgos/gtec/gtec.cc
(couvreur99_check_shy::couvreur99_check_shy): Add the group option,
and redefine todo as a list so it can be iterated over.
* src/tgbatest/ltl2tgba.cc, src/tgbatest/randtgba.cc: Introduce
couvreur99_shy- (for group=false) in addition to couvreur99_shy
(for group=true).
* iface/gspn/ssp.cc (couvreur99_check_ssp_shy_semi,
couvreur99_check_ssp_shy): Use group=true;
2004-12-10 16:16:38 +00:00
Alexandre Duret-Lutz
8b8257b157 * src/tgbaalgos/randomgraph.cc (random_graph): Do not use the
pointer of the state created as keys in sets; otherwise the graph
created depends on the memory layout.
2004-12-10 15:10:19 +00:00
Alexandre Duret-Lutz
d4b9ebaaff * src/tgba/tgbaexplicit.cc (tgba_explicit::create_transition):
Make sure to create the source state before the destination state.
2004-12-09 08:20:12 +00:00
Denis Poitrenaud
d645e0ac54 * src/tgbaalgos/emptiness.cc: Suppress a horrible space before a ')'. 2004-12-08 18:14:46 +00:00
Denis Poitrenaud
446b85a842 * src/tgba/tgbaexplicit.hh, src/tgba/tgbaexplicit.cc
(set_init_state): Return a pointer to the initial state.

(tgba_run_to_tgba): New function.
2004-12-08 18:03:38 +00:00
Alexandre Duret-Lutz
8279667300 * src/tgbaalgos/replayrun.cc (replay_tgba_run): More comments. 2004-12-08 15:44:17 +00:00
Alexandre Duret-Lutz
688587d700 * src/tgba/tgbaexplicit.cc, src/tgba/tgbaexplicit.hh
(tgba_explicit::create_transition(state*, const state*)): New function.
* src/tgbaalgos/randomgraph.cc, src/tgbaalgos/randomgraph.hh:
(random_graph): Revamp the algorithm to call rand() less often.
* src/tgbatest/randtgba.cc: Add option -0 to easy profiling.
2004-12-08 15:39:15 +00:00