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

gen: rename pps-arbiter's APs

Browse source 
* bin/genltl.cc, spot/gen/formulas.cc: Adjust the name of the AP
produced by pps-arbiter.
* NEWS: Mention the change.
This commit is contained in:
Alexandre Duret-Lutz 2024-09-19 11:40:53 +02:00
parent 40a45eff22
commit b9cb4022cf
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
NEWS
View file

@ -10,7 +10,7 @@ New in spot 2.12.0.dev (not yet released)
consistency) and augmented (with new statistics). The new CSV consistency) and augmented (with new statistics). The new CSV
output should be more useful when the input specification is output should be more useful when the input specification is
decomposed, in particular, there is a column giving the number of decomposed, in particular, there is a column giving the number of
sub-specifications obained, and other statistics columns have sub-specifications obtained, and other statistics columns have
names starting with "max_" or "sum_" indicating how said names starting with "max_" or "sum_" indicating how said
statistics are updated across sub-specifications. statistics are updated across sub-specifications.
@ -44,6 +44,12 @@ New in spot 2.12.0.dev (not yet released)
% genltl --lily-patterns | ltlsynt -q % genltl --lily-patterns | ltlsynt -q
- genltl's --pps-arbiter-standard and --pps-arbiter-strict have been
changed to rename variables {r1,r2,...,g1,g2...} as
{i1,i1,...,o1,o2,...} so that these formula can be fed directly to
ltlsynt.
- autfilt learned --restrict-dead-end-edges, to restricts labels of - autfilt learned --restrict-dead-end-edges, to restricts labels of
edges leading to dead-ends. See the description of edges leading to dead-ends. See the description of
restrict_dead_end_edges_here() below. restrict_dead_end_edges_here() below.

8
bin/genltl.cc
View file

@ -140,11 +140,11 @@ static const argp_option options[] =
OPT_ALIAS(beem-patterns), OPT_ALIAS(beem-patterns),
OPT_ALIAS(p), OPT_ALIAS(p),
{ "pps-arbiter-standard", gen::LTL_PPS_ARBITER_STANDARD, "RANGE", 0, { "pps-arbiter-standard", gen::LTL_PPS_ARBITER_STANDARD, "RANGE", 0,
"Arbiter with n clients that sent requests (ri) and " "Arbiter with n clients that sent requests (iN) and "
"receive grants (gi). Standard semantics.", 0 }, "receive grants (oN). Standard semantics.", 0 },
{ "pps-arbiter-strict", gen::LTL_PPS_ARBITER_STRICT, "RANGE", 0, { "pps-arbiter-strict", gen::LTL_PPS_ARBITER_STRICT, "RANGE", 0,
"Arbiter with n clients that sent requests (ri) and " "Arbiter with n clients that sent requests (iN) and "
"receive grants (gi). Strict semantics.", 0 }, "receive grants (oN). Strict semantics.", 0 },
{ "r-left", gen::LTL_R_LEFT, "RANGE", 0, "(((p1 R p2) R p3) ... R pn)", 0 }, { "r-left", gen::LTL_R_LEFT, "RANGE", 0, "(((p1 R p2) R p3) ... R pn)", 0 },
{ "r-right", gen::LTL_R_RIGHT, "RANGE", 0, "(p1 R (p2 R (... R pn)))", 0 }, { "r-right", gen::LTL_R_RIGHT, "RANGE", 0, "(p1 R (p2 R (... R pn)))", 0 },
{ "rv-counter", gen::LTL_RV_COUNTER, "RANGE", 0, "n-bit counter", 0 }, { "rv-counter", gen::LTL_RV_COUNTER, "RANGE", 0, "n-bit counter", 0 },

4
spot/gen/formulas.cc
View file

@ -1428,9 +1428,9 @@ namespace spot
case LTL_P_PATTERNS: case LTL_P_PATTERNS:
return p_pattern(n); return p_pattern(n);
case LTL_PPS_ARBITER_STANDARD: case LTL_PPS_ARBITER_STANDARD:
return pps_arbiter("r", "g", n, false); return pps_arbiter("i", "o", n, false);
case LTL_PPS_ARBITER_STRICT: case LTL_PPS_ARBITER_STRICT:
return pps_arbiter("r", "g", n, true); return pps_arbiter("i", "o", n, true);
case LTL_R_LEFT: case LTL_R_LEFT:
return bin_n("p", n, op::R, false); return bin_n("p", n, op::R, false);
case LTL_R_RIGHT: case LTL_R_RIGHT: