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

Make minimization of obligation properties and deterministic

Browse source 
monitor available in the CGI script.

* wrap/python/spot.i: Declare the minimize() interface.
* wrap/python/cgi-bin/ltl2tgba.in: Add reduce_dmonitor and
reduce_wdba options.
This commit is contained in:
Alexandre Duret-Lutz 2010-12-26 19:30:36 +01:00
parent edc71b807e
commit 241ba112d6
3 changed files with 37 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2010-12-26 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Make minimization of obligation properties and deterministic
monitor available in the CGI script.
* wrap/python/spot.i: Declare the minimize() interface.
* wrap/python/cgi-bin/ltl2tgba.in: Add reduce_dmonitor and
reduce_wdba options.
2010-12-14 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2010-12-14 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Add a WDBA benchmark. Add a WDBA benchmark.

8
wrap/python/cgi-bin/ltl2tgba.in
View file

@ -260,6 +260,8 @@ options_reduce = [
] ]
options_aut_reduce = [ options_aut_reduce = [
('reduce_scc', 'prune unaccepting SCCs', 1), ('reduce_scc', 'prune unaccepting SCCs', 1),
('reduce_wdba', 'minimize obligation properties' + new, 0),
('reduce_dmonitor', 'build deterministic monitor' + new, 0),
] ]
options_debug = [ options_debug = [
('show_parse', 'show traces during parsing', 0), ('show_parse', 'show traces during parsing', 0),
@ -569,7 +571,11 @@ elif trans_fm:
elif trans_taa: elif trans_taa:
automaton = spot.ltl_to_taa(f, dict, refined_rules) automaton = spot.ltl_to_taa(f, dict, refined_rules)
if reduce_scc: if reduce_dmonitor:
automaton = spot.minimize(automaton, True)
elif reduce_wdba:
automaton = spot.minimize(automaton, False)
elif reduce_scc:
# Do not suppress all useless acceptance conditions if # Do not suppress all useless acceptance conditions if
# degeneralization is requested: keeping those that lead to # degeneralization is requested: keeping those that lead to
# accepting states usually help. # accepting states usually help.

39
wrap/python/spot.i
View file

@ -77,16 +77,17 @@
#include "tgba/tgbaproduct.hh" #include "tgba/tgbaproduct.hh"
#include "tgba/tgbatba.hh" #include "tgba/tgbatba.hh"
#include "tgbaalgos/ltl2tgba_lacim.hh"
#include "tgbaalgos/ltl2tgba_fm.hh"
#include "tgbaalgos/ltl2taa.hh"
#include "tgbaalgos/dottydec.hh" #include "tgbaalgos/dottydec.hh"
#include "tgbaalgos/dotty.hh" #include "tgbaalgos/dotty.hh"
#include "tgbaalgos/dupexp.hh" #include "tgbaalgos/dupexp.hh"
#include "tgbaalgos/lbtt.hh"
#include "tgbaalgos/emptiness.hh" #include "tgbaalgos/emptiness.hh"
#include "tgbaalgos/gtec/gtec.hh" #include "tgbaalgos/gtec/gtec.hh"
#include "tgbaalgos/lbtt.hh"
#include "tgbaalgos/ltl2taa.hh"
#include "tgbaalgos/ltl2tgba_fm.hh"
#include "tgbaalgos/ltl2tgba_lacim.hh"
#include "tgbaalgos/magic.hh" #include "tgbaalgos/magic.hh"
#include "tgbaalgos/minimize.hh"
#include "tgbaalgos/neverclaim.hh" #include "tgbaalgos/neverclaim.hh"
#include "tgbaalgos/reductgba_sim.hh" #include "tgbaalgos/reductgba_sim.hh"
#include "tgbaalgos/rundotdec.hh" #include "tgbaalgos/rundotdec.hh"
@ -137,22 +138,23 @@ using namespace spot;
%include "ltlvisit/tostring.hh" %include "ltlvisit/tostring.hh"
%include "ltlvisit/tunabbrev.hh" %include "ltlvisit/tunabbrev.hh"
%feature("new") spot::ltl_to_tgba_lacim;
%feature("new") spot::ltl_to_tgba_fm;
%feature("new") spot::ltl_to_taa;
%feature("new") spot::tgba::get_init_state;
%feature("new") spot::tgba::succ_iter;
%feature("new") spot::tgba_succ_iterator::current_state;
%feature("new") spot::tgba_dupexp_bfs;
%feature("new") spot::tgba_dupexp_dfs;
%feature("new") spot::emptiness_check::check; %feature("new") spot::emptiness_check::check;
%feature("new") spot::emptiness_check_instantiator::construct;
%feature("new") spot::emptiness_check_instantiator::instanciate;
%feature("new") spot::emptiness_check_result::accepting_run; %feature("new") spot::emptiness_check_result::accepting_run;
%feature("new") spot::explicit_magic_search; %feature("new") spot::explicit_magic_search;
%feature("new") spot::explicit_se05_search; %feature("new") spot::explicit_se05_search;
%feature("new") spot::ltl_to_taa;
%feature("new") spot::ltl_to_tgba_fm;
%feature("new") spot::ltl_to_tgba_lacim;
%feature("new") spot::minimize;
%feature("new") spot::reduc_tgba_sim; %feature("new") spot::reduc_tgba_sim;
%feature("new") spot::emptiness_check_instantiator::construct;
%feature("new") spot::emptiness_check_instantiator::instanciate;
%feature("new") spot::scc_filter; %feature("new") spot::scc_filter;
%feature("new") spot::tgba_dupexp_bfs;
%feature("new") spot::tgba_dupexp_dfs;
%feature("new") spot::tgba::get_init_state;
%feature("new") spot::tgba::succ_iter;
%feature("new") spot::tgba_succ_iterator::current_state;
// Help SWIG with namespace lookups. // Help SWIG with namespace lookups.
#define ltl spot::ltl #define ltl spot::ltl
@ -170,16 +172,17 @@ using namespace spot;
%include "tgba/tgbaproduct.hh" %include "tgba/tgbaproduct.hh"
%include "tgba/tgbatba.hh" %include "tgba/tgbatba.hh"
%include "tgbaalgos/ltl2tgba_lacim.hh"
%include "tgbaalgos/ltl2tgba_fm.hh"
%include "tgbaalgos/ltl2taa.hh"
%include "tgbaalgos/dottydec.hh" %include "tgbaalgos/dottydec.hh"
%include "tgbaalgos/dotty.hh" %include "tgbaalgos/dotty.hh"
%include "tgbaalgos/dupexp.hh" %include "tgbaalgos/dupexp.hh"
%include "tgbaalgos/lbtt.hh"
%include "tgbaalgos/emptiness.hh" %include "tgbaalgos/emptiness.hh"
%include "tgbaalgos/gtec/gtec.hh" %include "tgbaalgos/gtec/gtec.hh"
%include "tgbaalgos/lbtt.hh"
%include "tgbaalgos/ltl2taa.hh"
%include "tgbaalgos/ltl2tgba_fm.hh"
%include "tgbaalgos/ltl2tgba_lacim.hh"
%include "tgbaalgos/magic.hh" %include "tgbaalgos/magic.hh"
%include "tgbaalgos/minimize.hh"
%include "tgbaalgos/neverclaim.hh" %include "tgbaalgos/neverclaim.hh"
%include "tgbaalgos/reductgba_sim.hh" %include "tgbaalgos/reductgba_sim.hh"
%include "tgbaalgos/rundotdec.hh" %include "tgbaalgos/rundotdec.hh"