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

dupexp: rename to copy, and preserve named states on request

Browse source 
* src/twaalgos/dupexp.cc, src/twaalgos/dupexp.hh: Rename to...
* src/twaalgos/copy.cc, src/twaalgos/copy.hh: ... these.
Get rid of dupexp_bfs, rename dupexp_dfs as copy, and add
an option to preserve named states.
* src/twaalgos/Makefile.am, src/tests/dupexp.test,
src/tests/ikwiad.cc, src/tests/sccsimpl.test,
src/twa/twagraph.hh, src/twaalgos/dot.cc,
src/twaalgos/stutter.cc, wrap/python/spot_impl.i: Adjust.
* NEWS: Mention this change.
This commit is contained in:
Alexandre Duret-Lutz 2015-09-30 10:59:13 +02:00
parent dcb9d7e8a8
commit 0bbcd6e85e
11 changed files with 42 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tests/dupexp.test
View file

@ -28,7 +28,7 @@ set -e
dorun()
{
run 0 ../ikwiad -f -s "$1" >output1
run 0 ../ikwiad -f "$1" >output1
run 0 ../ikwiad -f -S "$1" >output2
test `wc -l <output1` = `wc -l <output2`
}

23
src/tests/ikwiad.cc
View file

@ -40,7 +40,7 @@
#include "twa/twaproduct.hh"
#include "twaalgos/reducerun.hh"
#include "parseaut/public.hh"
#include "twaalgos/dupexp.hh"
#include "twaalgos/copy.hh"
#include "twaalgos/minimize.hh"
#include "taalgos/minimize.hh"
#include "twaalgos/neverclaim.hh"
@ -334,7 +334,7 @@ checked_main(int argc, char** argv)
int formula_index = 0;
const char* echeck_algo = nullptr;
spot::emptiness_check_instantiator_ptr echeck_inst = nullptr;
enum { NoneDup, BFS, DFS } dupexp = NoneDup;
bool dupexp = false;
bool expect_counter_example = false;
bool accepting_run = false;
bool accepting_run_replay = false;
@ -740,13 +740,9 @@ checked_main(int argc, char** argv)
{
opt_monitor = true;
}
else if (!strcmp(argv[formula_index], "-s"))
{
dupexp = DFS;
}
else if (!strcmp(argv[formula_index], "-S"))
{
dupexp = BFS;
dupexp = true;
}
else if (!strcmp(argv[formula_index], "-CL"))
{
@ -1266,17 +1262,8 @@ checked_main(int argc, char** argv)
// pointless.
}
switch (dupexp)
{
case NoneDup:
break;
case BFS:
a = tgba_dupexp_bfs(a, spot::twa::prop_set::all());
break;
case DFS:
a = tgba_dupexp_dfs(a, spot::twa::prop_set::all());
break;
}
if (dupexp)
a = copy(a, spot::twa::prop_set::all());
//TA, STA, GTA, SGTA and TGTA
if (ta_opt || tgta_opt)

2
src/tests/sccsimpl.test
View file

@ -237,7 +237,7 @@ grep 'Acceptance: 2 ' out8.txt
# This formula gives a 12-state automaton in which one acceptance
# condition can be removed, and after what direct simulation should
# simplify the automaton to 6 states.
run 0 ../ikwiad -R3 -s -RDS -ks \
run 0 ../ikwiad -R3 -RDS -ks \
'(G(!((b) R (a)))) R (((c) R (!(d))) U (G((a) | (!(G(e))))))' > out9.txt
grep 'states: 6$' out9.txt