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

Introduce an emptiness-check interface, and modify the existing

Browse source 
algorithms to conform to it, uniformly.  This will unfortunately
break third-party code that were using these algorithms.
* src/tgbaalgos/emptiness.cc, src/tgbaalgos/emptiness.hh: New files.
* src/tgbaalgos/Makefile.am: New files.
* src/tgbaalgos/magic.cc, src/tgbaalgos/magic.hh: Adjust to
conform to the new emptiness-check interface.
* src/tgbaalgos/gtec/ce.cc, src/tgbaalgos/gtec/ce.hh,
src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gtec/gtec.hh,
src/tgbaalgos/gtec/status.cc, src/tgbaalgos/gtec/status.hh:
Likewise.  The classes have been renamed are as following
  emptiness_check -> couvreur99_check
  emptiness_check_shy -> couvreur99_check_shy
  counter_example -> couvreur99_check_result
* src/tgbatest/ltl2tgba.cc, iface/gspn/ltlgspn.cc, iface/gspn/ssp.hh,
iface/gspn/ssp.cc: Adjust to renaming and new interface.
This commit is contained in:
Alexandre Duret-Lutz 2004-10-27 16:47:54 +00:00
parent 7010a02cd9
commit 6c815004c4
16 changed files with 523 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

90
src/tgbatest/ltl2tgba.cc
View file

@ -533,66 +533,60 @@ main(int argc, char** argv)
assert(!"unknown output option");
}
spot::emptiness_check* ec = 0;
spot::tgba* ec_a = 0;
switch (echeck)
{
case None:
break;
case Couvreur:
ec_a = a;
ec = new spot::couvreur99_check(a);
break;
case Couvreur2:
{
std::cout << "Tarjan Couvreur" << std::endl;
spot::emptiness_check* ec;
if (echeck == Couvreur)
ec = new spot::emptiness_check(a);
else
ec = new spot::emptiness_check_shy(a);
bool res = ec->check();
if (expect_counter_example)
{
if (res)
{
exit_code = 1;
delete ec;
break;
}
spot::counter_example ce(ec->result());
ce.print_result(std::cout);
ce.print_stats(std::cout);
}
else
{
exit_code = !res;
}
delete ec;
}
ec_a = a;
ec = new spot::couvreur99_check_shy(a);
break;
case MagicSearch:
{
std::cout << "Magic Search" << std::endl;
spot::magic_search ms(degeneralized);
bool res = ms.check();
if (expect_counter_example)
{
if (!res)
{
exit_code = 1;
break;
}
do
ms.print_result(std::cout);
while (magic_many && ms.check());
}
else
{
exit_code = res;
}
}
ec_a = degeneralized;
ec = new spot::magic_search(degeneralized);
break;
}
default:
assert(0);
if (ec)
{
do
{
spot::emptiness_check_result* res = ec->check();
if (expect_counter_example != !!res)
exit_code = 1;
if (!res)
{
std::cout << "no accepting run found" << std::endl;
break;
}
else
{
spot::tgba_run* run = res->accepting_run();
if (!run)
{
std::cout << "an accepting run exist" << std::endl;
}
else
{
spot::print_tgba_run(std::cout, run, ec_a);
delete run;
}
}
delete res;
}
while (magic_many);
delete ec;
}
if (f)