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

autfilt: -uc should count the number of non-isomorphic automata

Browse source 
* src/bin/autfilt.cc: Fix it.
* src/tests/isomorph.test: Test it.
This commit is contained in:
Alexandre Duret-Lutz 2015-04-28 16:12:13 +02:00
parent 5bfed246f9
commit c0bbabc400
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bin/autfilt.cc
View file

@ -533,8 +533,6 @@ namespace
if (matched == opt_invert) if (matched == opt_invert)
return 0; return 0;
++match_count;
// Postprocessing. // Postprocessing.
if (opt_mask_acc) if (opt_mask_acc)
@ -583,6 +581,8 @@ namespace
return 0; return 0;
} }
++match_count;
printer.print(aut, nullptr, filename, -1, conversion_time, haut); printer.print(aut, nullptr, filename, -1, conversion_time, haut);
if (opt_max_count >= 0 && match_count >= opt_max_count) if (opt_max_count >= 0 && match_count >= opt_max_count)

5
src/tests/isomorph.test
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright (C) 2014 Laboratoire de Recherche et Développement de # Copyright (C) 2014, 2015 Laboratoire de Recherche et Développement de
# l'Epita (LRDE). # l'Epita (LRDE).
# #
# This file is part of Spot, a model checking library. # This file is part of Spot, a model checking library.
@ -106,3 +106,6 @@ EOF
run 0 ../../bin/autfilt aut1 --are-isomorphic aut2 run 0 ../../bin/autfilt aut1 --are-isomorphic aut2
run 0 ../../bin/autfilt aut3 --are-isomorphic aut4 run 0 ../../bin/autfilt aut3 --are-isomorphic aut4
run 0 ../../bin/autfilt -u aut1 aut2 aut2 aut3 -c >out
test 2 = "`cat out`"