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

Hide the tgba_gspn and tgba_gspn_eesrg classes. Offer the

Browse source 
corresponding automaton via the automaton() method of the
gspn_interface and gspn_eesrg_interface classes.

* iface/gspn/gspn.hh (gspn_interface::gspn_interface): Take dict and
env arguments.
(gspn_interface::automaton): New method.
(tgba_gspn): Move all the declaration ...
* iface/gspn/gspn.cc (tgba_gspn): ... here.
(gspn_interface::automaton): Implement it.
* iface/gspn/eesrg.hh (gspn_eesrg_interface::gspn_eesrg_interface):
Take dict and env arguments.
(gspn_eesrg_interface::automaton): New method.
(tgba_gspn_eesrg): Move all the declaration ...
* iface/gspn/gspn.cc (tgba_gspn_eesrg): ... here.
(gspn_eesrg_interface::automaton): Implement it.
* iface/gspn/dottygspn.cc, iface/gspn/dottyeesrg.cc,
iface/gspn/ltlgspn.cc: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2004-02-02 09:55:48 +00:00
parent 2f7d46d719
commit 9d9ba1bed7
8 changed files with 150 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

8
iface/gspn/ltlgspn.cc
View file

@ -132,7 +132,7 @@ main(int argc, char **argv)
spot::bdd_dict* dict = new spot::bdd_dict();
#if EESRG
spot::gspn_eesrg_interface gspn(2, argv);
spot::gspn_eesrg_interface gspn(2, argv, dict, env);
spot::tgba_parse_error_list pel1;
spot::tgba_explicit* control = spot::tgba_parse(argv[formula_index + 2],
@ -140,7 +140,7 @@ main(int argc, char **argv)
if (spot::format_tgba_parse_errors(std::cerr, pel1))
return 2;
#else
spot::gspn_interface gspn(2, argv);
spot::gspn_interface gspn(2, argv, dict, env);
#endif
spot::tgba* a_f = 0;
@ -156,11 +156,11 @@ main(int argc, char **argv)
spot::ltl::destroy(f);
#ifndef EESRG
spot::tgba* model = new spot::tgba_gspn(dict, env);
spot::tgba* model = gspn.automaton();
spot::tgba_product* prod = new spot::tgba_product(model, a_f);
#else
spot::tgba_product* ca = new spot::tgba_product(control, a_f);
spot::tgba* model = new spot::tgba_gspn_eesrg(dict, env, ca);
spot::tgba* model = gspn.automaton(ca);
spot::tgba* prod = model;
#endif