tra2tba: Add support for Rabin like automata
* spot/twaalgos/tra2tba.cc: Support Rabin like input * tests/core/tra2tba.cc: Remove C tests * tests/core/tra2tba.test: Remove C tests * tests/python/tra2tba.py: Convert C tests to python * tests/Makefile.am: Remove C tests and add python tests
This commit is contained in:
Henrich Lauko
Alexandre Duret-Lutz
parent
e1271bf8b3
commit
69cf3c5590
4 changed files with 185 additions and 167 deletions
|
|
@ -1,41 +0,0 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2017 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 <spot/parseaut/public.hh>
|
||||
#include <spot/twaalgos/tra2tba.hh>
|
||||
#include <spot/twaalgos/hoa.hh>
|
||||
|
||||
int main(int, char* argv[])
|
||||
{
|
||||
char* input = argv[1];
|
||||
if (!input)
|
||||
return 1;
|
||||
auto pa = parse_aut(input, spot::make_bdd_dict());
|
||||
if (pa->format_errors(std::cerr))
|
||||
return 1;
|
||||
if (pa->aborted)
|
||||
{
|
||||
std::cerr << "--ABORT-- read\n";
|
||||
return 1;
|
||||
}
|
||||
auto tba = spot::tra_to_tba(pa->aut);
|
||||
spot::print_hoa(std::cout, tba) << '\n';
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,509 +0,0 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2017 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 >test1.hoa <<EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
Acceptance: 2 (Fin(0) & Inf(1))
|
||||
--BODY--
|
||||
State: 0
|
||||
[!0] 0 {1}
|
||||
[0] 1
|
||||
State: 1
|
||||
[0] 1 {0}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels trans-acc deterministic
|
||||
--BODY--
|
||||
State: 0
|
||||
[!0] 0 {0}
|
||||
[0] 1
|
||||
State: 1
|
||||
[0] 1
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../tra2tba test1.hoa > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
cat >test2.hoa <<EOF
|
||||
HOA: v1
|
||||
States: 3
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
Acceptance: 2 (Inf(1) & Fin(0))
|
||||
--BODY--
|
||||
State: 0
|
||||
[!0] 0 {0}
|
||||
[0] 1
|
||||
State: 1
|
||||
[0] 2 {}
|
||||
State: 2
|
||||
[!0] 1 {}
|
||||
[0] 2 {1}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 3
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels trans-acc deterministic
|
||||
--BODY--
|
||||
State: 0
|
||||
[!0] 0
|
||||
[0] 1
|
||||
State: 1
|
||||
[0] 2
|
||||
State: 2
|
||||
[!0] 1
|
||||
[0] 2 {0}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../tra2tba test2.hoa > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
cat >test3.hoa <<EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
Acceptance: 4 (Fin(0) & Inf(1)) | (Fin(2) & Inf(3))
|
||||
--BODY--
|
||||
State: 0
|
||||
[!0] 0 {0}
|
||||
[0] 1
|
||||
State: 1
|
||||
[0] 1 {2}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc deterministic
|
||||
--BODY--
|
||||
State: 0
|
||||
[!0] 0
|
||||
[0] 1
|
||||
State: 1
|
||||
[0] 1
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../tra2tba test3.hoa > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
cat >test4.hoa <<EOF
|
||||
HOA: v1
|
||||
States: 3
|
||||
Start: 0
|
||||
Acceptance: 4 (Fin(0) & Inf(1)) | (Fin(2) & Inf(3))
|
||||
AP: 2 "a" "b"
|
||||
--BODY--
|
||||
State: 0
|
||||
[0 & 1] 0 {0 2}
|
||||
[!0] 1
|
||||
[!1] 2
|
||||
State: 1
|
||||
[t] 1 {1}
|
||||
State: 2
|
||||
[t] 2 {3}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 3
|
||||
Start: 0
|
||||
AP: 2 "a" "b"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc complete
|
||||
--BODY--
|
||||
State: 0
|
||||
[0&1] 0
|
||||
[!0] 1
|
||||
[!1] 2
|
||||
State: 1 {0}
|
||||
[t] 1
|
||||
State: 2 {0}
|
||||
[t] 2
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../tra2tba test4.hoa > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
cat >test5.hoa <<EOF
|
||||
HOA: v1
|
||||
States: 4
|
||||
Start: 0
|
||||
Acceptance: 6 (Fin(0) & Inf(1)) | (Fin(2) & Inf(3)) | (Fin(4) & Inf(5))
|
||||
AP: 3 "a" "b" "c"
|
||||
--BODY--
|
||||
State: 0
|
||||
[0 & 1 &2] 0 {0 2 4}
|
||||
[!0] 1
|
||||
[!1] 2
|
||||
[!2] 3
|
||||
State: 1
|
||||
[t] 1 {1}
|
||||
State: 2
|
||||
[t] 2 {3}
|
||||
State: 3
|
||||
[t] 3 {5}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 4
|
||||
Start: 0
|
||||
AP: 3 "a" "b" "c"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc complete
|
||||
--BODY--
|
||||
State: 0
|
||||
[0&1&2] 0
|
||||
[!0] 1
|
||||
[!1] 2
|
||||
[!2] 3
|
||||
State: 1 {0}
|
||||
[t] 1
|
||||
State: 2 {0}
|
||||
[t] 2
|
||||
State: 3 {0}
|
||||
[t] 3
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../tra2tba test5.hoa > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
cat >test6.hoa <<EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
Acceptance: 4 Fin(0)&Inf(1) | Fin(2)&Inf(3)
|
||||
AP: 2 "p3" "p2"
|
||||
--BODY--
|
||||
State: 1 "F(Gp3|GFp2)"
|
||||
[0&1] 1 {1 3 }
|
||||
[0&!1] 0 {1 3 }
|
||||
[!0&1] 1 {1 2 3 }
|
||||
[!0&!1] 0 {1 2 3 }
|
||||
State: 0 "F(Gp3|GFp2)"
|
||||
[0&1] 1 {3 }
|
||||
[0&!1] 0 {3 }
|
||||
[!0&1] 1 {2 3 }
|
||||
[!0&!1] 0 {2 3 }
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 4
|
||||
Start: 0
|
||||
AP: 2 "p3" "p2"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels trans-acc
|
||||
--BODY--
|
||||
State: 0
|
||||
[0&1] 1
|
||||
[0&!1] 0
|
||||
[!0&1] 1
|
||||
[!0&!1] 0
|
||||
[0&!1] 2
|
||||
State: 1
|
||||
[0&1] 1 {0}
|
||||
[0&!1] 0 {0}
|
||||
[!0&1] 1 {0}
|
||||
[!0&!1] 0 {0}
|
||||
[0&1] 3
|
||||
[0&!1] 2
|
||||
State: 2
|
||||
[0&1] 3 {0}
|
||||
[0&!1] 2 {0}
|
||||
State: 3
|
||||
[0&1] 3 {0}
|
||||
[0&!1] 2 {0}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../tra2tba test6.hoa > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
cat >test7.hoa <<EOF
|
||||
HOA: v1
|
||||
name: "FG(a)"
|
||||
properties: deterministic
|
||||
properties: complete
|
||||
States: 1
|
||||
Start: 0
|
||||
Acceptance: 2 Fin(0)&Inf(1)
|
||||
AP: 1 "a"
|
||||
--BODY--
|
||||
State: 0 "FG(a)"
|
||||
[0] 0 {1 }
|
||||
[!0] 0 {0 1 }
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 1 "a"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc
|
||||
--BODY--
|
||||
State: 0
|
||||
[0] 0
|
||||
[!0] 0
|
||||
[0] 1
|
||||
State: 1 {0}
|
||||
[0] 1
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../tra2tba test7.hoa > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
cat >test8.hoa <<EOF
|
||||
HOA: v1
|
||||
States: 7
|
||||
Start: 0
|
||||
Acceptance: 4 Fin(0)&Inf(1) | Fin(2)&Inf(3)
|
||||
AP: 3 "p0" "p2" "p3"
|
||||
--BODY--
|
||||
State: 1 "0"
|
||||
[t] 1 {1 }
|
||||
State: 5 "1"
|
||||
[0&2] 5 {0 1 3 }
|
||||
[0&!2] 6 {0 1 3 }
|
||||
[!0&2] 3 {0 1 2 3 }
|
||||
[!0&!2] 4 {0 1 2 3 }
|
||||
State: 0 "2"
|
||||
[!0&1&2] 3 {0 1 2 }
|
||||
[(0&!1&!2|!0&1&!2)] 4 {0 1 2 }
|
||||
[(0&1|!0&!1)] 1 {0 1 2 }
|
||||
[0&!1&2] 2 {0 1 2 }
|
||||
State: 2 "3"
|
||||
[0&2] 5 {0 1 }
|
||||
[0&!2] 6 {0 1 }
|
||||
[!0&2] 3 {0 1 2 }
|
||||
[!0&!2] 4 {0 1 2 }
|
||||
State: 4 "4"
|
||||
[t] 4 {0 1 2 }
|
||||
State: 6 "5"
|
||||
[0] 6 {0 1 3 }
|
||||
[!0] 4 {0 1 2 3 }
|
||||
State: 3 "6"
|
||||
[0&2] 2 {0 1 2 }
|
||||
[!0&2] 3 {0 1 2 }
|
||||
[!2] 4 {0 1 2 }
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 8
|
||||
Start: 0
|
||||
AP: 3 "p0" "p2" "p3"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels trans-acc
|
||||
--BODY--
|
||||
State: 0
|
||||
[!0&1&2] 3
|
||||
[!0&1&!2 | 0&!1&!2] 4
|
||||
[!0&!1 | 0&1] 1
|
||||
[0&!1&2] 2
|
||||
State: 1
|
||||
[t] 1 {0}
|
||||
State: 2
|
||||
[0&2] 5
|
||||
[0&!2] 6
|
||||
[!0&2] 3
|
||||
[!0&!2] 4
|
||||
State: 3
|
||||
[0&2] 2
|
||||
[!0&2] 3
|
||||
[!2] 4
|
||||
State: 4
|
||||
[t] 4
|
||||
State: 5
|
||||
[0&2] 5
|
||||
[0&!2] 6
|
||||
[!0&2] 3
|
||||
[!0&!2] 4
|
||||
[0&2] 7
|
||||
State: 6
|
||||
[0] 6 {0}
|
||||
[!0] 4
|
||||
State: 7
|
||||
[0&2] 7 {0}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../tra2tba test8.hoa > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
cat >test9.hoa <<EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 3 "p0" "p4" "p1"
|
||||
Acceptance: 4 (Fin(0) & Inf(1)) | (Fin(2) & Inf(3))
|
||||
--BODY--
|
||||
State: 0
|
||||
[0&!2] 1 {0 1 3}
|
||||
[!0&!2] 0 {0 1 3}
|
||||
State: 1
|
||||
[0&!2] 1 {0 1}
|
||||
[!0&!2] 0 {0 1}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 3 "p0" "p4" "p1"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc deterministic
|
||||
--BODY--
|
||||
State: 0 {0}
|
||||
[0&!2] 1
|
||||
[!0&!2] 0
|
||||
State: 1
|
||||
[0&!2] 1
|
||||
[!0&!2] 0
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../tra2tba test9.hoa > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
cat >test10.hoa <<EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
acc-name: Rabin 1
|
||||
Acceptance: 2 Fin(0)&Inf(1)
|
||||
AP: 2 "p0" "p2"
|
||||
--BODY--
|
||||
State: 0 "0"
|
||||
[0&1] 0 {1 }
|
||||
[!0&1] 1 {1 }
|
||||
[0&!1] 0 {0 1 }
|
||||
State: 1 "1"
|
||||
[1] 1 {1 }
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 3
|
||||
Start: 0
|
||||
AP: 2 "p0" "p2"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels state-acc
|
||||
--BODY--
|
||||
State: 0
|
||||
[0&1] 0
|
||||
[!0&1] 1
|
||||
[0&!1] 0
|
||||
[0&1] 2
|
||||
State: 1 {0}
|
||||
[1] 1
|
||||
State: 2 {0}
|
||||
[0&1] 2
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../tra2tba test10.hoa > out.hoa
|
||||
diff out.hoa out.exp
|
||||
|
||||
cat >test11.hoa <<EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
Acceptance: 4 Fin(0)&Inf(1) | Fin(2)&Inf(3)
|
||||
AP: 2 "p2" "p0"
|
||||
--BODY--
|
||||
State: 1 "1"
|
||||
[1] 1 {1 2 3 }
|
||||
[!1] 0 {1 3 }
|
||||
State: 0 "3"
|
||||
[1] 1 {2 3 }
|
||||
[!1] 0 {3 }
|
||||
--END--
|
||||
EOF
|
||||
|
||||
cat >out.exp << EOF
|
||||
HOA: v1
|
||||
States: 2
|
||||
Start: 0
|
||||
AP: 2 "p2" "p0"
|
||||
acc-name: Buchi
|
||||
Acceptance: 1 Inf(0)
|
||||
properties: trans-labels explicit-labels trans-acc complete
|
||||
properties: deterministic
|
||||
--BODY--
|
||||
State: 0
|
||||
[1] 1
|
||||
[!1] 0 {0}
|
||||
State: 1
|
||||
[1] 1 {0}
|
||||
[!1] 0 {0}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../tra2tba test11.hoa > out.hoa
|
||||
diff out.hoa out.exp
|
||||
Loading…
Add table
Add a link
Reference in a new issue