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

* src/tgbaalgos/gtec/gtec.hh, src/tgbaalgos/gtec/gtec.cc

Browse source 
(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;
This commit is contained in:
Alexandre Duret-Lutz 2004-12-10 16:16:38 +00:00
parent 8b8257b157
commit 9782b822f0
6 changed files with 72 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/tgbatest/ltl2tgba.cc
View file

@ -122,6 +122,7 @@ syntax(char* prog)
<< std::endl
<< "Where ALGO should be one of:" << std::endl
<< " couvreur99 (the default)" << std::endl
<< " couvreur99_shy-" << std::endl
<< " couvreur99_shy" << std::endl
<< " magic_search" << std::endl
<< " magic_search_repeated" << std::endl
@ -159,6 +160,7 @@ main(int argc, char** argv)
enum { None, Couvreur, Couvreur2, MagicSearch, Se05Search,
Tau03Search, Tau03OptSearch, Gv04 } echeck = None;
enum { NoneDup, BFS, DFS } dupexp = NoneDup;
bool couv_group = true;
bool search_many = false;
bool bit_state_hashing = false;
int heap_size = 10*1024*1024;
@ -381,6 +383,12 @@ main(int argc, char** argv)
else if (echeck_algo == "couvreur99_shy")
{
echeck = Couvreur2;
couv_group = true;
}
else if (echeck_algo == "couvreur99_shy-")
{
echeck = Couvreur2;
couv_group = false;
}
else if (echeck_algo == "magic_search")
{
@ -670,7 +678,7 @@ main(int argc, char** argv)
break;
case Couvreur2:
ec = new spot::couvreur99_check_shy(a);
ec = new spot::couvreur99_check_shy(a, couv_group);
break;
case MagicSearch:

7
src/tgbatest/randtgba.cc
View file

@ -59,6 +59,12 @@ couvreur99_shy_cons(const spot::tgba* a)
return new spot::couvreur99_check_shy(a);
}
spot::emptiness_check*
couvreur99_shy_minus_cons(const spot::tgba* a)
{
return new spot::couvreur99_check_shy(a, false);
}
spot::emptiness_check*
bsh_ms_cons(const spot::tgba* a)
{
@ -82,6 +88,7 @@ struct ec_algo
ec_algo ec_algos[] =
{
{ "couvreur99", couvreur99_cons, 0, -1U, true },
{ "couvreur99_shy-", couvreur99_shy_minus_cons, 0, -1U, true },
{ "couvreur99_shy", couvreur99_shy_cons, 0, -1U, true },
{ "explicit_magic_search", spot::explicit_magic_search, 0, 1, true },
{ "bit_state_hashing_magic_search",