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

Implement dtgba_sat_minimize().

Browse source 
Joint work with Soheib Baarir.

* src/tgbaalgos/dtgbasat.cc, src/tgbaalgos/dtgbasat.hh: New files.
* src/tgbaalgos/Makefile.am: Add them.
* src/tgbaalgos/postproc.cc, src/tgbaalgos/postproc.hh: Add
a dtgba-sat-minimize option.
* src/tgbatest/ltl2tgba.cc: Add option -RG.
* src/tgbatest/satmin.test: Add more tests.
This commit is contained in:
Alexandre Duret-Lutz 2013-07-17 10:14:00 +02:00
parent 260ab53cb5
commit 679df4eee1
7 changed files with 1035 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/tgbatest/ltl2tgba.cc
View file

@ -73,6 +73,7 @@
#include "tgbaalgos/dbacomp.hh"
#include "tgbaalgos/complete.hh"
#include "tgbaalgos/dtbasat.hh"
#include "tgbaalgos/dtgbasat.hh"
#include "taalgos/tgba2ta.hh"
#include "taalgos/dotty.hh"
@ -432,6 +433,7 @@ main(int argc, char** argv)
bool cs_oblig = false;
bool opt_complete = false;
int opt_dtbasat = -1;
int opt_dtgbasat = -1;
for (;;)
{
@ -798,6 +800,14 @@ main(int argc, char** argv)
redopt.reduce_basics = true;
redopt.reduce_size_strictly = true;
}
else if (!strncmp(argv[formula_index], "-RG", 3))
{
if (argv[formula_index][3] != 0)
opt_dtgbasat = to_int(argv[formula_index] + 3);
else
opt_dtgbasat = 0;
//output = -1;
}
else if (!strcmp(argv[formula_index], "-Rm"))
{
opt_minimize = true;
@ -818,7 +828,7 @@ main(int argc, char** argv)
if (argv[formula_index][3] != 0)
opt_dtbasat = to_int(argv[formula_index] + 3);
else
opt_dtbasat = -1;
opt_dtbasat = 0;
//output = -1;
}
else if (!strcmp(argv[formula_index], "-RT"))
@ -1523,6 +1533,14 @@ main(int argc, char** argv)
if (satminimized)
a = satminimized;
}
else if (opt_dtgbasat >= 0)
{
tm.start("dtgbasat");
satminimized = dtgba_sat_minimize(a, opt_dtgbasat);
tm.stop("dtgbasat");
if (satminimized)
a = satminimized;
}
spot::tgba* complemented = 0;
if (opt_dbacomp)