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

replace sba_explicit_* by tgba_digraph, and use tgba_digraph is postproc

Browse source 
This is a huge patch.  tgba_digraph are equiped with some boolean
properties that can be used to indicate whether they represent SBA
(and will carry more informations later).  All algorithms that produce
or use sba_explicit_* automata are changed to use tgba_digraph.
postproc has been rewritten using only tgba_digraph, and this required
changing the return types of many algorithms from tgba* to
tgba_digraph*.

* src/bin/dstar2tgba.cc, src/bin/ltlfilt.cc, src/dstarparse/dra2ba.cc,
src/dstarparse/dstar2tgba.cc, src/dstarparse/nra2nba.cc,
src/dstarparse/nsa2tgba.cc, src/dstarparse/public.hh,
src/tgba/tgbagraph.hh, src/tgba/tgbasafracomplement.cc,
src/tgbaalgos/compsusp.cc, src/tgbaalgos/compsusp.hh,
src/tgbaalgos/degen.cc, src/tgbaalgos/degen.hh,
src/tgbaalgos/dotty.cc, src/tgbaalgos/minimize.cc,
src/tgbaalgos/minimize.hh, src/tgbaalgos/postproc.cc,
src/tgbaalgos/postproc.hh, src/tgbaalgos/sccfilter.cc,
src/tgbaalgos/sccinfo.cc, src/tgbaalgos/stripacc.cc,
src/tgbaalgos/stripacc.hh, src/tgbaalgos/translate.cc,
src/tgbaalgos/translate.hh, src/tgbatest/ltl2tgba.cc,
wrap/python/spot.i: Update.
This commit is contained in:
Alexandre Duret-Lutz 2014-08-11 19:08:14 +02:00
parent 637aeff2d3
commit 6c9d5e4bb3
26 changed files with 296 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/tgbatest/ltl2tgba.cc
View file

@ -1003,7 +1003,6 @@ main(int argc, char** argv)
if (from_file)
{
spot::tgba_explicit_string* e = 0;
switch (readformat)
{
case ReadSpot:
@ -1113,9 +1112,6 @@ main(int argc, char** argv)
}
break;
}
if (e)
e->merge_transitions();
}
else
{
@ -1204,19 +1200,36 @@ main(int argc, char** argv)
const spot::tgba* aut_scc = 0;
if (scc_filter)
{
auto aa = dynamic_cast<const spot::tgba_digraph*>(a);
bool freeit = false;
if (!aa)
{
freeit = true;
aa = tgba_dupexp_dfs(a);
}
assert(aa);
tm.start("SCC-filter");
aut_scc = a = spot::scc_filter(a, scc_filter_all);
aut_scc = a = spot::scc_filter(aa, scc_filter_all);
tm.stop("SCC-filter");
assume_sba = false;
if (freeit)
delete aa;
}
const spot::tgba* degeneralized = 0;
spot::tgba* minimized = 0;
spot::tgba_digraph* minimized = 0;
if (opt_minimize)
{
tm.start("obligation minimization");
minimized = minimize_obligation(a, f, 0, reject_bigger);
auto aa = dynamic_cast<const spot::tgba_digraph*>(a);
bool freeit = false;
if (!aa)
{
freeit = true;
aa = tgba_dupexp_dfs(a);
}
minimized = minimize_obligation(aa, f, 0, reject_bigger);
tm.stop("obligation minimization");
if (minimized == 0)
@ -1229,7 +1242,7 @@ main(int argc, char** argv)
exit(2);
}
}
else if (minimized == a)
else if (minimized == aa)
{
minimized = 0;
}
@ -1244,6 +1257,8 @@ main(int argc, char** argv)
reduction_iterated_sim = false;
assume_sba = true;
}
if (freeit)
delete aa;
}
if (reduction_dir_sim && !reduction_iterated_sim)
@ -1302,8 +1317,10 @@ main(int argc, char** argv)
if (scc_filter)
{
auto aa = down_cast<const spot::tgba_digraph*>(a);
assert(aa);
tm.start("SCC-filter on don't care");
a = spot::scc_filter(a, true);
a = spot::scc_filter(aa, true);
delete temp_dont_care_sim;
temp_dont_care_sim = a;
tm.stop("SCC-filter on don't care");
@ -1438,8 +1455,10 @@ main(int argc, char** argv)
{
tm.start("SCC-filter post-sim");
delete aut_scc;
auto aa = down_cast<const spot::tgba_digraph*>(a);
assert(aa);
// Do not filter_all for SBA
aut_scc = a = spot::scc_filter(a, assume_sba ?
aut_scc = a = spot::scc_filter(aa, assume_sba ?
false : scc_filter_all);
tm.stop("SCC-filter post-sim");
}
@ -1448,7 +1467,7 @@ main(int argc, char** argv)
if (opt_monitor)
{
tm.start("Monitor minimization");
minimized = a = minimize_monitor(a);
a = minimized = minimize_monitor(a);
tm.stop("Monitor minimization");
assume_sba = false; // All states are accepting, so double
// circles in the dot output are
@ -1612,16 +1631,6 @@ main(int argc, char** argv)
a = new spot::future_conditions_collector(a, true);
}
if (utf8_opt)
{
if (spot::tgba_explicit_formula* tef =
dynamic_cast<spot::tgba_explicit_formula*>(a))
tef->enable_utf8();
else if (spot::sba_explicit_formula* sef =
dynamic_cast<spot::sba_explicit_formula*>(a))
sef->enable_utf8();
}
if (output != -1)
{
tm.start("producing output");