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

ltlsynt: fix a few issues with --csv

Browse source 
Some columns were superfluous, other had inconsistent names, and some
times where not tracked.

* spot/twaalgos/synthesis.cc: Improve tracking of times and verbose
messages.
* bin/ltlsynt.cc (print_csv): Adjust CSV columns.
* tests/core/ltlsynt.test, tests/core/ltlsynt2.test,
tests/core/ltlsynt-pgame.test: Adjust expected CSV and verbose
messages.
* doc/org/ltlsynt.org: Give some example.
This commit is contained in:
Alexandre Duret-Lutz 2024-09-04 22:47:50 +02:00
parent a22a05b8ec
commit b729aa3f30
7 changed files with 175 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

56
spot/twaalgos/synthesis.cc
View file

@ -2215,17 +2215,6 @@ namespace spot
(twa_graph_ptr strat)
{
dict->unregister_all_my_variables(&tmp);
if (vs)
{
*vs << "direct strategy was found.\n";
if (want_strategy)
{
*vs << "direct strat has " << strat->num_states()
<< " states, " << strat->num_edges()
<< " edges and " << strat->num_sets() << " colors\n";
}
}
if (strat)
{
strat->merge_edges();
@ -2238,6 +2227,13 @@ namespace spot
set_synthesis_outputs(strat, outputs);
}
if (vs)
{
*vs << "direct strategy was found.\n";
if (strat && want_strategy)
*vs << "direct strategy has " << strat->num_states()
<< " states and " << strat->num_edges() << " edges\n";
}
return mealy_like{
mealy_like::realizability_code::REALIZABLE_REGULAR,
strat,
@ -2383,15 +2379,19 @@ namespace spot
auto res = trans.run(f_left);
if (!is_deterministic(res))
return ret_sol_maybe();
{
if (bv)
{
auto delta = sw.stop();
bv->trans_time += delta;
if (vs)
*vs << "translating formula done in " << delta
<< " seconds...\n... but it gave a "
<< "non-deterministic automaton (rejected)\n";
}
return ret_sol_maybe();
}
if (bv)
{
auto delta = sw.stop();
bv->trans_time += delta;
if (vs)
*vs << "translating formula done in " << delta << " seconds\n";
}
res->prop_complete(trival::maybe());
bdd output_bdd = bddtrue;
@ -2442,12 +2442,23 @@ namespace spot
res->prop_terminal(trival::maybe());
res->set_named_prop<bdd>("synthesis-outputs", new bdd(output_bdd));
if (bv)
{
auto delta = sw.stop();
bv->trans_time += delta;
if (vs)
*vs << "translating formula done in " << delta << " seconds\n";
}
return ret_sol_exists(res);
}
else if (f_other.is_tt())
{
if (!want_strategy)
return ret_sol_exists(nullptr);
stopwatch sw;
if (bv)
sw.start();
auto res = make_twa_graph(dict);
res->prop_weak(true);
@ -2463,6 +2474,13 @@ namespace spot
bdd g_bdd = formula_to_bdd(f_g, dict, res);
res->new_state();
res->new_edge(0, 0, g_bdd);
if (bv)
{
auto delta = sw.stop();
bv->trans_time += delta;
if (vs)
*vs << "translating formula done in " << delta << " seconds\n";
}
return ret_sol_exists(res);
}
return ret_sol_maybe();