safra: Add complete option and rename files
* src/tests/safra.cc, src/twaalgos/safra.cc, src/twaalgos/safra.hh, src/tests/safra.test: Rename as... * spot/twaalgos/safra.cc, spot/twaalgos/safra.hh, tests/core/safra.cc tests/core/safra.test: ... these. * tests/Makefile.am: Update.
This commit is contained in:
Alexandre Lewkowicz
Alexandre Duret-Lutz
parent
f88154e507
commit
8068cfad93
5 changed files with 41 additions and 40 deletions
|
|
@ -87,6 +87,7 @@ check_PROGRAMS = \
|
|||
core/reduccmp \
|
||||
core/reduceu \
|
||||
core/reductaustr \
|
||||
core/safra \
|
||||
core/syntimpl \
|
||||
core/taatgba \
|
||||
core/trival \
|
||||
|
|
@ -134,6 +135,7 @@ core_reduceu_SOURCES = core/equalsf.cc
|
|||
core_reduceu_CPPFLAGS = $(AM_CPPFLAGS) -DREDUC -DEVENT_UNIV
|
||||
core_reductaustr_SOURCES = core/equalsf.cc
|
||||
core_reductaustr_CPPFLAGS = $(AM_CPPFLAGS) -DREDUC_TAUSTR
|
||||
core_safra_SOURCES = core/safra.cc
|
||||
core_syntimpl_SOURCES = core/syntimpl.cc
|
||||
core_tostring_SOURCES = core/tostring.cc
|
||||
core_trival_SOURCES = core/trival.cc
|
||||
|
|
@ -256,6 +258,7 @@ TESTS_twa = \
|
|||
core/randtgba.test \
|
||||
core/isomorph.test \
|
||||
core/uniq.test \
|
||||
core/safra.test \
|
||||
core/sbacc.test \
|
||||
core/stutter-tgba.test \
|
||||
core/strength.test \
|
||||
|
|
|
|||
136
tests/core/safra.cc
Normal file
136
tests/core/safra.cc
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2015 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/>.
|
||||
|
||||
#include <iostream>
|
||||
#include <cstring>
|
||||
|
||||
#include "spot/tl/parse.hh" // spot::parse_infix_psl
|
||||
#include "spot/tl/formula.hh" // spot::formula
|
||||
#include "spot/parseaut/public.hh"
|
||||
#include "spot/twa/twagraph.hh"
|
||||
#include "spot/twaalgos/degen.hh"
|
||||
#include "spot/twaalgos/dot.hh" // print_dot
|
||||
#include "spot/twaalgos/hoa.hh" // print_hoa
|
||||
#include "spot/twaalgos/safra.hh"
|
||||
#include "spot/twaalgos/translate.hh"
|
||||
|
||||
|
||||
int help();
|
||||
int help()
|
||||
{
|
||||
std::cerr << "safra [OPTIONS]\n";
|
||||
std::cerr << "\t-f ltl_formula\tinput string is an ltl formulae\n";
|
||||
std::cerr << "\t--hoa file.hoa\tinput file has hoa format\n";
|
||||
std::cerr << "\t-p\tpretty print states\n";
|
||||
std::cerr << "\t-H\toutput hoa format\n";
|
||||
std::cerr << "\t-b\treduce result using bisimulation\n";
|
||||
std::cerr << "\t--scc_opt\tUse an SCC-based Safra\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
bool scc_opt = false;
|
||||
bool use_bisim = false;
|
||||
bool sim = false;
|
||||
bool in_hoa = false;
|
||||
bool in_ltl = false;
|
||||
bool out_dot = true;
|
||||
bool out_hoa = false;
|
||||
bool pretty_print = false;
|
||||
bool complete = false;
|
||||
|
||||
char* input = nullptr;
|
||||
if (argc <= 2)
|
||||
return help();
|
||||
for (int i = 1; i < argc; ++i)
|
||||
{
|
||||
if (!strncmp(argv[i], "--hoa", 5))
|
||||
{
|
||||
in_hoa = true;
|
||||
if (i + 1 >= argc)
|
||||
return help();
|
||||
input = argv[++i];
|
||||
}
|
||||
else if (!strncmp(argv[i], "-f", 2))
|
||||
{
|
||||
in_ltl = true;
|
||||
if (i + 1 >= argc)
|
||||
return help();
|
||||
input = argv[++i];
|
||||
}
|
||||
else if (!strncmp(argv[i], "-H", 2))
|
||||
{
|
||||
out_dot = false;
|
||||
out_hoa = true;
|
||||
}
|
||||
else if (!strncmp(argv[i], "-p", 2))
|
||||
pretty_print = true;
|
||||
else if (!strncmp(argv[i], "-b", 2))
|
||||
sim = true;
|
||||
else if (!strncmp(argv[i], "-c", 2))
|
||||
complete = true;
|
||||
else if (!strncmp(argv[i], "--scc_opt", 9))
|
||||
scc_opt = true;
|
||||
else if (!strncmp(argv[i], "--bisim_opt", 10))
|
||||
use_bisim = true;
|
||||
else
|
||||
{
|
||||
std::cerr << "Warning: " << argv[i] << " not used\n";
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (!input)
|
||||
help();
|
||||
|
||||
auto dict = spot::make_bdd_dict();
|
||||
spot::twa_graph_ptr res;
|
||||
if (in_ltl)
|
||||
{
|
||||
spot::parse_error_list pel;
|
||||
spot::formula f = spot::parse_infix_psl(input, pel);
|
||||
if (spot::format_parse_errors(std::cerr, input, pel))
|
||||
return 2;
|
||||
spot::translator trans(dict);
|
||||
trans.set_pref(spot::postprocessor::Deterministic);
|
||||
auto tmp = trans.run(f);
|
||||
res = spot::tgba_determinisation(tmp, sim, pretty_print, scc_opt,
|
||||
use_bisim, complete);
|
||||
}
|
||||
else if (in_hoa)
|
||||
{
|
||||
auto aut = spot::parse_aut(input, dict);
|
||||
if (aut->format_errors(std::cerr))
|
||||
return 2;
|
||||
res = tgba_determinisation(aut->aut, sim, pretty_print, scc_opt,
|
||||
use_bisim, complete);
|
||||
}
|
||||
res->merge_edges();
|
||||
|
||||
if (out_hoa)
|
||||
{
|
||||
spot::print_hoa(std::cout, res, "t");
|
||||
std::cout << std::endl;
|
||||
}
|
||||
else if (out_dot)
|
||||
spot::print_dot(std::cout, res);
|
||||
else
|
||||
assert(false);
|
||||
}
|
||||
179
tests/core/safra.test
Executable file
179
tests/core/safra.test
Executable file
|
|
@ -0,0 +1,179 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2015 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 >double_a.hoa << EOF
|
||||
HOA: v1
|
||||
name: "F\"x > 1\""
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
--BODY--
|
||||
State: 0
|
||||
[0] 0 {0}
|
||||
[0] 1
|
||||
State: 1
|
||||
[1] 1
|
||||
[0] 0
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 4
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
acc-name: Rabin 1
|
||||
Acceptance: 2 Fin(0) & Inf(1)
|
||||
properties: trans-labels explicit-labels trans-acc deterministic
|
||||
--BODY--
|
||||
State: 0
|
||||
[0] 1
|
||||
State: 1
|
||||
[0] 2 {1}
|
||||
[!0&1] 3
|
||||
State: 2
|
||||
[0] 1
|
||||
[!0&1] 3
|
||||
State: 3
|
||||
[0&!1] 0
|
||||
[0&1] 2
|
||||
[!0&1] 3
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../safra --hoa double_a.hoa -H > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
cat >double_b.hoa << EOF
|
||||
HOA: v1
|
||||
name: "F\"x > 1\""
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
--BODY--
|
||||
State: 0
|
||||
[0] 0
|
||||
[0] 1
|
||||
State: 1
|
||||
[1] 1 {0}
|
||||
[0] 0
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 5
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
acc-name: Rabin 1
|
||||
Acceptance: 2 Fin(0) & Inf(1)
|
||||
properties: trans-labels explicit-labels trans-acc deterministic
|
||||
--BODY--
|
||||
State: 0
|
||||
[0] 1
|
||||
State: 1
|
||||
[0&!1] 1
|
||||
[0&1] 2
|
||||
[!0&1] 3 {1}
|
||||
State: 2
|
||||
[0&1] 1 {1}
|
||||
[!0&1] 3 {1}
|
||||
[0&!1] 4
|
||||
State: 3
|
||||
[0&!1] 0
|
||||
[0&1] 2
|
||||
[!0&1] 3 {1}
|
||||
State: 4
|
||||
[0] 1 {1}
|
||||
[!0&1] 3 {1}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../safra --hoa double_b.hoa -H > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
# Test scc-based optim
|
||||
cat > out.exp << EOF
|
||||
HOA: v1
|
||||
States: 3
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
acc-name: Rabin 1
|
||||
Acceptance: 2 Fin(0) & Inf(1)
|
||||
properties: trans-labels explicit-labels trans-acc deterministic
|
||||
--BODY--
|
||||
State: 0 "{₀0₀}"
|
||||
[0] 1 {1}
|
||||
State: 1 "{₀0₀}{₁1₁}"
|
||||
[0] 1 {1}
|
||||
[!0&1] 2 {0}
|
||||
State: 2 "{₀1₀}"
|
||||
[0&!1] 2
|
||||
[1] 2 {1}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat > in.hoa << EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
Acceptance: 1 Inf(0)
|
||||
--BODY--
|
||||
State: 0
|
||||
[0] 0 {0}
|
||||
[0] 1
|
||||
State: 1
|
||||
[1] 1 {0}
|
||||
[0] 1
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../safra --hoa in.hoa --scc_opt -p -H > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
# Formulas from bench/dtgbasat/formulas
|
||||
cat >formulae <<EOF
|
||||
X((a M F((!c & !b) | (c & b))) W (G!c U b))
|
||||
X(((a & b) R (!a U !c)) R b)
|
||||
XXG(Fa U Xb)
|
||||
(!a M !b) W F!c
|
||||
(b & Fa & GFc) R a
|
||||
(a R (b W a)) W G(!a M (c | b))
|
||||
(Fa W b) R (Fc | !a)
|
||||
X(G(!a M !b) | G(a | G!a))
|
||||
Fa W Gb
|
||||
Ga | GFb
|
||||
a M G(F!b | X!a)
|
||||
G!a R XFb
|
||||
EOF
|
||||
run 0 ../safra --hoa double_b.hoa -H > out.hoa
|
||||
ltl2tgba=ltl2tgba
|
||||
ltlcross -F formulae \
|
||||
"../safra -f %f -H > %O" \
|
||||
"$ltl2tgba -f %f -H > %O"
|
||||
Loading…
Add table
Add a link
Reference in a new issue