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

* src/tgbaalgos/ltl2tgba.cc, src/tgbaalgos/ltl2tgba.hh: Rename as ...

Browse source 
* src/tgbaalgos/ltl2tgba_lacim.cc, src/tgbaalgos/ltl2tgba_lacim.hh:
... this, and rename ltl_to_tgba() as ltl_to_tgba_lacim as well.
* iface/gspn/ltlgspn.cc, src/tgbatest/explprod.cc,
src/tgbatest/ltl2tgba.cc, src/tgbatest/ltlmagic.cc,
src/tgbatest/ltlprod.cc, src/tgbatest/mixprod.cc,
src/tgbatest/tripprod.cc, wrap/python/spot.i,
wrap/python/cgi/ltl2tgba.in, wrap/python/tests/interdep.py,
wrap/python/tests/ltl2tgba.py: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2003-09-22 15:54:34 +00:00
parent 5439b2f4ee
commit 83565fb659
15 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2003-09-22 Alexandre Duret-Lutz <aduret@src.lip6.fr>
* src/tgbaalgos/ltl2tgba.cc, src/tgbaalgos/ltl2tgba.hh: Rename as ...
* src/tgbaalgos/ltl2tgba_lacim.cc, src/tgbaalgos/ltl2tgba_lacim.hh:
... this, and rename ltl_to_tgba() as ltl_to_tgba_lacim as well.
* iface/gspn/ltlgspn.cc, src/tgbatest/explprod.cc,
src/tgbatest/ltl2tgba.cc, src/tgbatest/ltlmagic.cc,
src/tgbatest/ltlprod.cc, src/tgbatest/mixprod.cc,
src/tgbatest/tripprod.cc, wrap/python/spot.i,
wrap/python/cgi/ltl2tgba.in, wrap/python/tests/interdep.py,
wrap/python/tests/ltl2tgba.py: Adjust.
2003-09-11 Alexandre Duret-Lutz <aduret@src.lip6.fr> 2003-09-11 Alexandre Duret-Lutz <aduret@src.lip6.fr>
* src/tgba/state.hh: Include cassert. * src/tgba/state.hh: Include cassert.

4
iface/gspn/ltlgspn.cc
View file

@ -3,7 +3,7 @@
#include "ltlvisit/destroy.hh" #include "ltlvisit/destroy.hh"
#include "tgba/tgbatba.hh" #include "tgba/tgbatba.hh"
#include "tgba/tgbaproduct.hh" #include "tgba/tgbaproduct.hh"
#include "tgbaalgos/ltl2tgba.hh" #include "tgbaalgos/ltl2tgba_lacim.hh"
#include "tgbaalgos/ltl2tgba_fm.hh" #include "tgbaalgos/ltl2tgba_fm.hh"
#include "tgbaalgos/magic.hh" #include "tgbaalgos/magic.hh"
@ -38,7 +38,7 @@ main(int argc, char **argv)
#if FM #if FM
spot::tgba* a_f = spot::ltl_to_tgba_fm(f, dict); spot::tgba* a_f = spot::ltl_to_tgba_fm(f, dict);
#else #else
spot::tgba* a_f = spot::ltl_to_tgba(f, dict); spot::tgba* a_f = spot::ltl_to_tgba_lacim(f, dict);
#endif #endif
spot::ltl::destroy(f); spot::ltl::destroy(f);

4
src/tgbaalgos/Makefile.am
View file

@ -7,8 +7,8 @@ tgbaalgos_HEADERS = \
reachiter.hh \ reachiter.hh \
dotty.hh \ dotty.hh \
lbtt.hh \ lbtt.hh \
ltl2tgba.hh \
ltl2tgba_fm.hh \ ltl2tgba_fm.hh \
ltl2tgba_lacim.hh \
magic.hh \ magic.hh \
save.hh save.hh
@ -17,7 +17,7 @@ libtgbaalgos_la_SOURCES = \
reachiter.cc \ reachiter.cc \
dotty.cc \ dotty.cc \
lbtt.cc \ lbtt.cc \
ltl2tgba.cc \
ltl2tgba_fm.cc \ ltl2tgba_fm.cc \
ltl2tgba_lacim.cc \
magic.cc \ magic.cc \
save.cc save.cc

4
src/tgbaalgos/ltl2tgba.cc → src/tgbaalgos/ltl2tgba_lacim.cc
View file

@ -6,7 +6,7 @@
#include "tgba/tgbabddconcretefactory.hh" #include "tgba/tgbabddconcretefactory.hh"
#include <cassert> #include <cassert>
#include "ltl2tgba.hh" #include "ltl2tgba_lacim.hh"
namespace spot namespace spot
{ {
@ -231,7 +231,7 @@ namespace spot
}; };
tgba_bdd_concrete* tgba_bdd_concrete*
ltl_to_tgba(const ltl::formula* f, bdd_dict* dict) ltl_to_tgba_lacim(const ltl::formula* f, bdd_dict* dict)
{ {
// Normalize the formula. We want all the negations on // Normalize the formula. We want all the negations on
// the atomic propositions. We also suppress logic // the atomic propositions. We also suppress logic

2
src/tgbaalgos/ltl2tgba.hh → src/tgbaalgos/ltl2tgba_lacim.hh
View file

@ -24,7 +24,7 @@ namespace spot
/// editor = {Pierre Leroux} /// editor = {Pierre Leroux}
/// } /// }
/// \endverbatim /// \endverbatim
tgba_bdd_concrete* ltl_to_tgba(const ltl::formula* f, bdd_dict* dict); tgba_bdd_concrete* ltl_to_tgba_lacim(const ltl::formula* f, bdd_dict* dict);
} }
#endif // SPOT_TGBA_LTL2TGBA_HH #endif // SPOT_TGBA_LTL2TGBA_HH

1
src/tgbatest/explprod.cc
View file

@ -1,6 +1,5 @@
#include <iostream> #include <iostream>
#include <cassert> #include <cassert>
#include "tgbaalgos/ltl2tgba.hh"
#include "tgba/tgbaexplicit.hh" #include "tgba/tgbaexplicit.hh"
#include "tgba/tgbaproduct.hh" #include "tgba/tgbaproduct.hh"
#include "tgbaparse/public.hh" #include "tgbaparse/public.hh"

4
src/tgbatest/ltl2tgba.cc
View file

@ -5,7 +5,7 @@
#include "ltlvisit/destroy.hh" #include "ltlvisit/destroy.hh"
#include "ltlast/allnodes.hh" #include "ltlast/allnodes.hh"
#include "ltlparse/public.hh" #include "ltlparse/public.hh"
#include "tgbaalgos/ltl2tgba.hh" #include "tgbaalgos/ltl2tgba_lacim.hh"
#include "tgbaalgos/ltl2tgba_fm.hh" #include "tgbaalgos/ltl2tgba_fm.hh"
#include "tgba/bddprint.hh" #include "tgba/bddprint.hh"
#include "tgbaalgos/dotty.hh" #include "tgbaalgos/dotty.hh"
@ -139,7 +139,7 @@ main(int argc, char** argv)
if (fm_opt) if (fm_opt)
to_free = a = spot::ltl_to_tgba_fm(f, dict); to_free = a = spot::ltl_to_tgba_fm(f, dict);
else else
to_free = a = concrete = spot::ltl_to_tgba(f, dict); to_free = a = concrete = spot::ltl_to_tgba_lacim(f, dict);
spot::ltl::destroy(f); spot::ltl::destroy(f);

4
src/tgbatest/ltlmagic.cc
View file

@ -3,7 +3,7 @@
#include "ltlvisit/destroy.hh" #include "ltlvisit/destroy.hh"
#include "ltlast/allnodes.hh" #include "ltlast/allnodes.hh"
#include "ltlparse/public.hh" #include "ltlparse/public.hh"
#include "tgbaalgos/ltl2tgba.hh" #include "tgbaalgos/ltl2tgba_lacim.hh"
#include "tgbaalgos/magic.hh" #include "tgbaalgos/magic.hh"
void void
@ -47,7 +47,7 @@ main(int argc, char** argv)
spot::bdd_dict* dict = new spot::bdd_dict(); spot::bdd_dict* dict = new spot::bdd_dict();
{ {
spot::tgba_bdd_concrete* a1 = spot::ltl_to_tgba(f1, dict); spot::tgba_bdd_concrete* a1 = spot::ltl_to_tgba_lacim(f1, dict);
spot::tgba_tba_proxy* a2 = new spot::tgba_tba_proxy(a1); spot::tgba_tba_proxy* a2 = new spot::tgba_tba_proxy(a1);
spot::ltl::destroy(f1); spot::ltl::destroy(f1);

6
src/tgbatest/ltlprod.cc
View file

@ -3,7 +3,7 @@
#include "ltlvisit/destroy.hh" #include "ltlvisit/destroy.hh"
#include "ltlast/allnodes.hh" #include "ltlast/allnodes.hh"
#include "ltlparse/public.hh" #include "ltlparse/public.hh"
#include "tgbaalgos/ltl2tgba.hh" #include "tgbaalgos/ltl2tgba_lacim.hh"
#include "tgba/tgbaproduct.hh" #include "tgba/tgbaproduct.hh"
#include "tgba/tgbabddconcreteproduct.hh" #include "tgba/tgbabddconcreteproduct.hh"
#include "tgbaalgos/dotty.hh" #include "tgbaalgos/dotty.hh"
@ -39,8 +39,8 @@ main(int argc, char** argv)
spot::bdd_dict* dict = new spot::bdd_dict(); spot::bdd_dict* dict = new spot::bdd_dict();
{ {
spot::tgba_bdd_concrete* a1 = spot::ltl_to_tgba(f1, dict); spot::tgba_bdd_concrete* a1 = spot::ltl_to_tgba_lacim(f1, dict);
spot::tgba_bdd_concrete* a2 = spot::ltl_to_tgba(f2, dict); spot::tgba_bdd_concrete* a2 = spot::ltl_to_tgba_lacim(f2, dict);
spot::ltl::destroy(f1); spot::ltl::destroy(f1);
spot::ltl::destroy(f2); spot::ltl::destroy(f2);

4
src/tgbatest/mixprod.cc
View file

@ -3,7 +3,7 @@
#include "ltlvisit/destroy.hh" #include "ltlvisit/destroy.hh"
#include "ltlast/allnodes.hh" #include "ltlast/allnodes.hh"
#include "ltlparse/public.hh" #include "ltlparse/public.hh"
#include "tgbaalgos/ltl2tgba.hh" #include "tgbaalgos/ltl2tgba_lacim.hh"
#include "tgba/tgbaproduct.hh" #include "tgba/tgbaproduct.hh"
#include "tgba/tgbabddconcreteproduct.hh" #include "tgba/tgbabddconcreteproduct.hh"
#include "tgbaparse/public.hh" #include "tgbaparse/public.hh"
@ -39,7 +39,7 @@ main(int argc, char** argv)
return 2; return 2;
{ {
spot::tgba_bdd_concrete* a1 = spot::ltl_to_tgba(f1, dict); spot::tgba_bdd_concrete* a1 = spot::ltl_to_tgba_lacim(f1, dict);
spot::ltl::destroy(f1); spot::ltl::destroy(f1);
spot::tgba_product p(a1, a2); spot::tgba_product p(a1, a2);
spot::tgba_save_reachable(std::cout, &p); spot::tgba_save_reachable(std::cout, &p);

1
src/tgbatest/tripprod.cc
View file

@ -1,6 +1,5 @@
#include <iostream> #include <iostream>
#include <cassert> #include <cassert>
#include "tgbaalgos/ltl2tgba.hh"
#include "tgba/tgbaexplicit.hh" #include "tgba/tgbaexplicit.hh"
#include "tgba/tgbaproduct.hh" #include "tgba/tgbaproduct.hh"
#include "tgbaparse/public.hh" #include "tgbaparse/public.hh"

2
wrap/python/cgi/ltl2tgba.in
View file

@ -161,7 +161,7 @@ print '<p>Building automaton...',
sys.stdout.flush() sys.stdout.flush()
if trans_lacim: if trans_lacim:
automaton = spot.ltl_to_tgba(f, dict) automaton = spot.ltl_to_tgba_lacim(f, dict)
elif trans_fm: elif trans_fm:
automaton = spot.ltl_to_tgba_fm(f, dict) automaton = spot.ltl_to_tgba_fm(f, dict)

6
wrap/python/spot.i
View file

@ -48,7 +48,7 @@
#include "tgba/tgbaproduct.hh" #include "tgba/tgbaproduct.hh"
#include "tgba/tgbatba.hh" #include "tgba/tgbatba.hh"
#include "tgbaalgos/ltl2tgba.hh" #include "tgbaalgos/ltl2tgba_lacim.hh"
#include "tgbaalgos/ltl2tgba_fm.hh" #include "tgbaalgos/ltl2tgba_fm.hh"
#include "tgbaalgos/dotty.hh" #include "tgbaalgos/dotty.hh"
#include "tgbaalgos/lbtt.hh" #include "tgbaalgos/lbtt.hh"
@ -84,7 +84,7 @@ 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; %feature("new") spot::ltl_to_tgba_lacim;
%feature("new") spot::ltl_to_tgba_fm; %feature("new") spot::ltl_to_tgba_fm;
%feature("new") spot::tgba::get_init_state; %feature("new") spot::tgba::get_init_state;
%feature("new") spot::tgba::succ_iter; %feature("new") spot::tgba::succ_iter;
@ -105,7 +105,7 @@ using namespace spot;
%include "tgba/tgbaproduct.hh" %include "tgba/tgbaproduct.hh"
%include "tgba/tgbatba.hh" %include "tgba/tgbatba.hh"
%include "tgbaalgos/ltl2tgba.hh" %include "tgbaalgos/ltl2tgba_lacim.hh"
%include "tgbaalgos/ltl2tgba_fm.hh" %include "tgbaalgos/ltl2tgba_fm.hh"
%include "tgbaalgos/dotty.hh" %include "tgbaalgos/dotty.hh"
%include "tgbaalgos/lbtt.hh" %include "tgbaalgos/lbtt.hh"

2
wrap/python/tests/interdep.py
View file

@ -7,7 +7,7 @@ e = spot.default_environment.instance()
p = spot.empty_parse_error_list() p = spot.empty_parse_error_list()
f = spot.parse('GFa', p, e) f = spot.parse('GFa', p, e)
dict = spot.bdd_dict() dict = spot.bdd_dict()
a = spot.ltl_to_tgba(f, dict) a = spot.ltl_to_tgba_lacim(f, dict)
s0 = a.get_init_state() s0 = a.get_init_state()
b = s0.as_bdd() b = s0.as_bdd()
print b print b

2
wrap/python/tests/ltl2tgba.py
View file

@ -77,7 +77,7 @@ if f:
a = spot.ltl_to_tgba_fm(f, dict) a = spot.ltl_to_tgba_fm(f, dict)
concrete = 0 concrete = 0
else: else:
a = concrete = spot.ltl_to_tgba(f, dict) a = concrete = spot.ltl_to_tgba_lacim(f, dict)
spot.destroy(f) spot.destroy(f)
del f del f