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

bin: make --stats and --format synonyms

Browse source 
* bin/common_output.cc: Make --stats an alias of --format.
* bin/common_aoutput.cc: Make --format an alias of --stats.
* tests/core/acc2.test, tests/core/format.test: Test these aliases.
* NEWS: Mention this.
This commit is contained in:
Alexandre Duret-Lutz 2017-09-04 17:42:13 +02:00
parent f726152ebd
commit e452e09ff7
5 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
NEWS
View file

@ -51,6 +51,12 @@ New in spot 2.3.5.dev (not yet released)
- The --stats=%c option of tools producing automata can now be - The --stats=%c option of tools producing automata can now be
restricted to count complete SCCs, using %[c]c. restricted to count complete SCCs, using %[c]c.
- Tools producing automata have a --stats=... option, and tools
producing formulas have a --format=... option. These two options
work similarly, the use of different names is just historical.
Starting with this release, all tools that recognize one of these
two options also accept the other one as an alias.
Library: Library:
- A new library, libspotgen, gathers all functions used to generate - A new library, libspotgen, gathers all functions used to generate

1
bin/common_aoutput.cc
View file

@ -142,6 +142,7 @@ static const argp_option options[] =
"(ignored with --lbtt or --spin)", 0 }, "(ignored with --lbtt or --spin)", 0 },
{ "stats", OPT_STATS, "FORMAT", 0, { "stats", OPT_STATS, "FORMAT", 0,
"output statistics about the automaton", 0 }, "output statistics about the automaton", 0 },
{ "format", 0, nullptr, OPTION_ALIAS, nullptr, 0 },
{ "check", OPT_CHECK, "PROP", OPTION_ARG_OPTIONAL, { "check", OPT_CHECK, "PROP", OPTION_ARG_OPTIONAL,
"test for the additional property PROP and output the result " "test for the additional property PROP and output the result "
"in the HOA format (implies -H). PROP may be any prefix of " "in the HOA format (implies -H). PROP may be any prefix of "

1
bin/common_output.cc
View file

@ -60,6 +60,7 @@ static const argp_option options[] =
"quote the formula for use in a CSV file", -20 }, "quote the formula for use in a CSV file", -20 },
{ "format", OPT_FORMAT, "FORMAT", 0, { "format", OPT_FORMAT, "FORMAT", 0,
"specify how each line should be output (default: \"%f\")", -20 }, "specify how each line should be output (default: \"%f\")", -20 },
{ "stats", 0, nullptr, OPTION_ALIAS, nullptr, 0 },
{ "output", 'o', "FORMAT", 0, { "output", 'o', "FORMAT", 0,
"send output to a file named FORMAT instead of standard output. The" "send output to a file named FORMAT instead of standard output. The"
" first formula sent to a file truncates it unless FORMAT starts" " first formula sent to a file truncates it unless FORMAT starts"

2
tests/core/acc2.test
View file

@ -26,7 +26,7 @@ set -e
ltl2tgba -H 'GFa & GFb' > in ltl2tgba -H 'GFa & GFb' > in
grep 'Acceptance:' in > expected grep 'Acceptance:' in > expected
ltl2tgba -H 'GFa & GFb' --stats='Acceptance: %a %g' > out1 ltl2tgba -H 'GFa & GFb' --stats='Acceptance: %a %g' > out1
autfilt -H in --stats='Acceptance: %A %G' > out2 autfilt -H in --format='Acceptance: %A %G' > out2
diff out1 expected diff out1 expected
diff out2 expected diff out2 expected

2
tests/core/format.test
View file

@ -23,7 +23,7 @@
set -e set -e
genltl --dac=1..10 --format='%s,%b,%x,%f' > output genltl --dac=1..10 --stats='%s,%b,%x,%f' > output
cat >expected <<EOF cat >expected <<EOF
3,2,1,G!p0 3,2,1,G!p0
7,6,2,Fp0 -> (!p1 U p0) 7,6,2,Fp0 -> (!p1 U p0)