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

remove algorithms that where only used by dstar's dra2ba conversion

Browse source 
Since we just removed that conversion, those can go as well.  Yay!

* src/tests/kv.test, src/twa/twamask.cc,
src/twa/twamask.hh, src/twa/twaproxy.cc,
src/twa/twaproxy.hh, src/twaalgos/scc.cc,
src/twaalgos/scc.hh: Delete.
* src/twaalgos/Makefile.am, src/twa/Makefile.am,
src/tests/Makefile.am, src/tests/ikwiad.cc: adjust.
This commit is contained in:
Alexandre Duret-Lutz 2015-08-20 21:31:07 +02:00
parent 9b5340b90a
commit 62f5b9769b
11 changed files with 1 additions and 1181 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/tests/Makefile.am
View file

@ -199,7 +199,6 @@ TESTS_twa = \
degendet.test \
degenid.test \
degenlskip.test \
kv.test \
randomize.test \
lbttparse.test \
scc.test \

26
src/tests/ikwiad.cc
View file

@ -53,7 +53,6 @@
#include "twaalgos/stats.hh"
#include "twaalgos/sccinfo.hh"
#include "twaalgos/emptiness_stats.hh"
#include "twaalgos/scc.hh"
#include "twaalgos/sccinfo.hh"
#include "twaalgos/isdet.hh"
#include "twaalgos/cycles.hh"
@ -268,8 +267,6 @@ syntax(char* prog)
<< "subtransitions)"
<< std::endl
<< " -K dump the graph of SCCs in dot format" << std::endl
<< " -KV verbosely dump the graph of SCCs in dot format"
<< std::endl
<< " -KC list cycles in automaton" << std::endl
<< " -KW list weak SCCs" << std::endl
<< " -N output the never clain for Spin (implies -DS)"
@ -556,10 +553,6 @@ checked_main(int argc, char** argv)
return 2;
tm.stop("reading -KP's argument");
}
else if (!strcmp(argv[formula_index], "-KV"))
{
output = 11;
}
else if (!strcmp(argv[formula_index], "-KC"))
{
output = 15;
@ -1485,24 +1478,7 @@ checked_main(int argc, char** argv)
break;
}
case 10:
{
auto aa =
std::dynamic_pointer_cast<const spot::twa_graph>(a);
if (!aa)
dump_scc_dot(a, std::cout, false);
else
dump_scc_info_dot(std::cout, aa);
}
break;
case 11:
{
//const spot::twa_graph_ptr g =
// dynamic_cast<const spot::twa_graph_ptr>(a);
//if (!g)
dump_scc_dot(a, std::cout, true);
//else
// dump_scc_info_dot(std::cout, g);
}
dump_scc_info_dot(std::cout, ensure_digraph(a));
break;
case 12:
stats_reachable(a).dump(std::cout);

55
src/tests/kv.test
View file

@ -1,55 +0,0 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2009, 2010, 2011, 2012 Laboratoire de Recherche et
# Développement de l'EPITA.
#
# This file is part of Spot, a model checking library.
#
# Spot is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Spot is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
# License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
. ./defs
set -e
check ()
{
run 0 ../ikwiad -f -KV "$1" > out.dot
test -z "$DOT" || "$DOT" out.dot > /dev/null
rm -f out.dot
}
# We don't check the output, but running these might be
# enough to trigger assertions in the code, or raise valgrind concerns.
check 'a R (b R c)'
check '(a U b) U (c U d)'
check '((Xp2)U(X(1)))&(p1 R(p2 R p0))'
# Make sure escaped variables print OK.
check '"G1"U"GG" && "FF"'
# Make sure we count 4 atomic propositions in
# G("P_1.p2" <-> (F"P_1.p3" & ("P_0.p3" | (X"P_1.CS" U "P_1.p2")))) U G"P_1.p2"
# even after iterated simulation
# Report from Etienne Renault.
../ikwiad -KV -R3 -RIS >out \
'G("P_1.p2" <-> (F"P_1.p3" & ("P_0.p3" | (X"P_1.CS" U "P_1.p2")))) U G"P_1.p2"'
x=`sed -n '/APrec/{
s/.*APrec=\[\([^]]*\)\].*/\1/p
q
}' out | tr ' ' '\n' | wc -l`
test "$x" -eq 4