simulation: get rid of the "don't care" simulation reductions
Those where never really publicized because they were slow and we failed to fix what we hopped to fix with them. They where never used by default. Getting rid of them will make it easier to cleanup the simulation code. * src/tgbaalgos/simulation.cc, src/tgbaalgos/simulation.hh: Remove the simulation code. * src/tgbaalgos/postproc.cc, src/tgbaalgos/postproc.hh, src/tgbatest/ltl2tgba.cc: Do not call it. * src/bin/spot-x.cc: Update doc. * src/tgbatest/sim.test: Delete this file. * src/tgbatest/Makefile.am: Adjust. * src/tgbatest/spotlbtt.test, bench/ltl2tgba/tools.sim: Remove uses to don't care simulation.
This commit is contained in:
Alexandre Duret-Lutz
parent
1d724beabd
commit
0159027395
10 changed files with 19 additions and 807 deletions
|
|
@ -1,5 +1,5 @@
|
|||
## -*- coding: utf-8 -*-
|
||||
## Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Laboratoire de
|
||||
## Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Laboratoire de
|
||||
## Recherche et Développement de l'Epita (LRDE).
|
||||
## Copyright (C) 2003, 2004, 2005, 2006 Laboratoire d'Informatique de
|
||||
## Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
|
||||
|
|
@ -138,8 +138,6 @@ TESTS = \
|
|||
randpsl.test \
|
||||
cycles.test
|
||||
|
||||
XFAIL_TESTS = sim.test
|
||||
|
||||
EXTRA_DIST = $(TESTS)
|
||||
|
||||
distclean-local:
|
||||
|
|
|
|||
|
|
@ -210,8 +210,6 @@ syntax(char* prog)
|
|||
<< std::endl
|
||||
<< " -RIS iterate both direct and reverse simulations"
|
||||
<< std::endl
|
||||
<< " -RDCS reduce the automaton with direct simulation"
|
||||
<< std::endl
|
||||
<< " -Rm attempt to WDBA-minimize the automaton" << std::endl
|
||||
<< std::endl
|
||||
<< " -RM attempt to WDBA-minimize the automaton unless the "
|
||||
|
|
@ -390,9 +388,6 @@ checked_main(int argc, char** argv)
|
|||
bool reduction_dir_sim = false;
|
||||
bool reduction_rev_sim = false;
|
||||
bool reduction_iterated_sim = false;
|
||||
bool reduction_dont_care_sim = false;
|
||||
int limit_dont_care_sim = 0;
|
||||
bool reduction_iterated_dont_care_sim = false;
|
||||
bool opt_bisim_ta = false;
|
||||
bool ta_opt = false;
|
||||
bool tgta_opt = false;
|
||||
|
|
@ -719,18 +714,6 @@ checked_main(int argc, char** argv)
|
|||
{
|
||||
reduction_iterated_sim = true;
|
||||
}
|
||||
else if (!strncmp(argv[formula_index], "-RDCS", 5))
|
||||
{
|
||||
reduction_dont_care_sim = true;
|
||||
if (argv[formula_index][5] == '=')
|
||||
limit_dont_care_sim = to_int(argv[formula_index] + 6);
|
||||
}
|
||||
else if (!strncmp(argv[formula_index], "-RDCIS", 6))
|
||||
{
|
||||
reduction_iterated_dont_care_sim = true;
|
||||
if (argv[formula_index][6] == '=')
|
||||
limit_dont_care_sim = to_int(argv[formula_index] + 7);
|
||||
}
|
||||
else if (!strcmp(argv[formula_index], "-rL"))
|
||||
{
|
||||
simpltl = true;
|
||||
|
|
@ -1218,8 +1201,6 @@ checked_main(int argc, char** argv)
|
|||
// When the minimization succeed, simulation is useless.
|
||||
reduction_dir_sim = false;
|
||||
reduction_rev_sim = false;
|
||||
reduction_iterated_dont_care_sim = false;
|
||||
reduction_dont_care_sim = false;
|
||||
reduction_iterated_sim = false;
|
||||
assume_sba = true;
|
||||
}
|
||||
|
|
@ -1242,14 +1223,6 @@ checked_main(int argc, char** argv)
|
|||
}
|
||||
|
||||
|
||||
if (reduction_iterated_dont_care_sim)
|
||||
{
|
||||
tm.start("don't care iterated simulation");
|
||||
a = spot::dont_care_iterated_simulations(a, limit_dont_care_sim);
|
||||
tm.stop("don't care iterated simulation");
|
||||
assume_sba = false;
|
||||
}
|
||||
|
||||
if (reduction_iterated_sim)
|
||||
{
|
||||
tm.start("Reduction w/ iterated simulations");
|
||||
|
|
@ -1265,23 +1238,6 @@ checked_main(int argc, char** argv)
|
|||
tm.stop("SCC-filter post-sim");
|
||||
}
|
||||
|
||||
if (reduction_dont_care_sim)
|
||||
{
|
||||
tm.start("don't care simulation");
|
||||
a = spot::dont_care_simulation(a, limit_dont_care_sim);
|
||||
tm.stop("don't care simulation");
|
||||
|
||||
if (scc_filter)
|
||||
{
|
||||
auto aa = std::static_pointer_cast<const spot::tgba_digraph>(a);
|
||||
assert(aa);
|
||||
tm.start("SCC-filter on don't care");
|
||||
a = spot::scc_filter(aa, true);
|
||||
tm.stop("SCC-filter on don't care");
|
||||
}
|
||||
assume_sba = false;
|
||||
}
|
||||
|
||||
unsigned int n_acc = a->acc().num_sets();
|
||||
if (echeck_inst
|
||||
&& degeneralize_opt == NoDegen
|
||||
|
|
|
|||
|
|
@ -1,83 +0,0 @@
|
|||
#! /bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2013, 2014 Laboratoire de Recherche et Développement
|
||||
# de l'Epita (LRDE).
|
||||
#
|
||||
# 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
|
||||
|
||||
cat >in.tgba <<EOF
|
||||
acc = "1";
|
||||
"i", "x", "b",;
|
||||
"i", "d2", "b",;
|
||||
"x", "ed", "a", "1";
|
||||
"ed", "ed", "a & b", "1";
|
||||
"d2", "d", "a",;
|
||||
"d", "d", "a", "1";
|
||||
EOF
|
||||
|
||||
run 0 ../ltl2tgba -X -RDCS -b in.tgba > out.tgba
|
||||
|
||||
cat >expected.tgba <<EOF
|
||||
acc = "0";
|
||||
"0", "1", "b",;
|
||||
"1", "1", "a", "0";
|
||||
EOF
|
||||
|
||||
diff out.tgba expected.tgba
|
||||
|
||||
run 0 ../ltl2tgba -RDCIS -b XXXXGFa > out.tgba
|
||||
|
||||
cat >expected.tgba <<EOF
|
||||
acc = "0";
|
||||
"0", "0", "a", "0";
|
||||
"0", "0", "!a",;
|
||||
EOF
|
||||
|
||||
diff out.tgba expected.tgba
|
||||
|
||||
run 0 ../ltl2tgba -RDCIS -kt 'Fp U Gq' > out
|
||||
cat >expected <<EOF
|
||||
sub trans.: 12
|
||||
transitions: 6
|
||||
states: 3
|
||||
nondeterministic states: 1
|
||||
EOF
|
||||
|
||||
diff out expected
|
||||
|
||||
|
||||
run 0 ../ltl2tgba -R3 -x -RDCS -kt 'F(a & GFa)' > out
|
||||
run 0 ../ltl2tgba -R3f -x -RDCS -kt 'F(a & GFa)' > out2
|
||||
diff out out2
|
||||
|
||||
|
||||
f='FG((Fp0 & (!p0 R (F!p1 U !p1))) | (G!p0 & (p0 U (Gp1 R p1))))'
|
||||
run 0 ../ltl2tgba -R3f -x -RDS -kt "$f" | grep -v sub > out
|
||||
run 0 ../ltl2tgba -R3f -x -RDCS -kt "$f" | grep -v sub > out2
|
||||
diff out out2
|
||||
|
||||
run 0 ../ltl2tgba -R3f -x -RDCS -kt "$f" > out2
|
||||
cat >expected <<EOF
|
||||
sub trans.: 13
|
||||
transitions: 8
|
||||
states: 3
|
||||
nondeterministic states: 1
|
||||
EOF
|
||||
|
||||
diff out2 expected
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2009, 2010, 2011, 2012, 2014 Laboratoire de Recherche
|
||||
# et Développement de l'Epita (LRDE).
|
||||
# Copyright (C) 2009, 2010, 2011, 2012, 2014, 2015 Laboratoire de
|
||||
# Recherche et Développement de l'Epita (LRDE).
|
||||
# Copyright (C) 2003, 2004, 2005, 2006, 2007 Laboratoire
|
||||
# d'Informatique de Paris 6 (LIP6), département Systèmes Répartis
|
||||
# Coopératifs (SRC), Université Pierre et Marie Curie.
|
||||
|
|
@ -134,23 +134,6 @@ Algorithm
|
|||
Enabled = yes
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM), don't care simulation"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot '../ltl2tgba -F -f -t -RDCS -r4 -R3f'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM), don't care iterated simulation"
|
||||
Path = "${LBTT_TRANSLATE}"
|
||||
Parameters = "--spot '../ltl2tgba -F -f -t -RDCIS -r4 -R3f'"
|
||||
Enabled = no
|
||||
}
|
||||
|
||||
|
||||
Algorithm
|
||||
{
|
||||
Name = "Spot (Couvreur -- FM), cosimulated"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue