convert: twa to twacube translation
* spot/twacube/Makefile.am, spot/twacube/twacube.cc, spot/twacube/twacube.hh, spot/twacube_algos/convert.cc, spot/twacube_algos/convert.hh, tests/Makefile.am, tests/core/.gitignore, tests/core/twacube.cc, tests/core/twacube.test: here.
This commit is contained in:
Etienne Renault
parent
8d57700d6a
commit
aceb37ab50
9 changed files with 550 additions and 4 deletions
|
|
@ -99,7 +99,8 @@ check_PROGRAMS = \
|
|||
core/tgbagraph \
|
||||
core/tostring \
|
||||
core/tunabbrev \
|
||||
core/tunenoform
|
||||
core/tunenoform \
|
||||
core/twacube
|
||||
|
||||
# Keep this sorted alphabetically.
|
||||
core_acc_SOURCES = core/acc.cc
|
||||
|
|
@ -150,6 +151,7 @@ core_tunabbrev_SOURCES = core/equalsf.cc
|
|||
core_tunabbrev_CPPFLAGS = $(AM_CPPFLAGS) -DUNABBREV='"^ieFG"'
|
||||
core_tunenoform_SOURCES = core/equalsf.cc
|
||||
core_tunenoform_CPPFLAGS = $(AM_CPPFLAGS) -DNENOFORM -DUNABBREV='"^ieFG"'
|
||||
core_twacube_SOURCES = core/twacube.cc
|
||||
|
||||
|
||||
TESTS_tl = \
|
||||
|
|
@ -328,7 +330,8 @@ TESTS_twa = \
|
|||
core/parity.test \
|
||||
core/parity2.test \
|
||||
core/ltlsynt.test \
|
||||
core/rabin2parity.test
|
||||
core/rabin2parity.test \
|
||||
core/twacube.test
|
||||
|
||||
############################## PYTHON ##############################
|
||||
|
||||
|
|
|
|||
1
tests/core/.gitignore
vendored
1
tests/core/.gitignore
vendored
|
|
@ -74,5 +74,6 @@ tripprod
|
|||
trival
|
||||
tunabbrev
|
||||
tunenoform
|
||||
twacube
|
||||
unabbrevwm
|
||||
safra
|
||||
|
|
|
|||
73
tests/core/twacube.cc
Normal file
73
tests/core/twacube.cc
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2015, 2016 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/>.
|
||||
|
||||
#include <bddx.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <spot/twacube/twacube.hh>
|
||||
#include <spot/twacube_algos/convert.hh>
|
||||
#include <iostream>
|
||||
#include <spot/twa/twagraph.hh>
|
||||
#include <spot/twaalgos/dot.hh>
|
||||
#include <spot/tl/defaultenv.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
// Build some TWA
|
||||
auto d = spot::make_bdd_dict();
|
||||
auto tg = make_twa_graph(d);
|
||||
bdd p1 = bdd_ithvar(tg->register_ap("p1"));
|
||||
bdd p2 = bdd_ithvar(tg->register_ap("p2"));
|
||||
tg->acc().add_sets(2);
|
||||
auto s1 = tg->new_state();
|
||||
auto s2 = tg->new_state();
|
||||
auto s3 = tg->new_state();
|
||||
tg->new_edge(s1, s1, bddfalse, 0U);
|
||||
tg->new_edge(s1, s2, p1, 0U);
|
||||
tg->new_edge(s1, s3, p2, tg->acc().mark(1));
|
||||
tg->new_edge(s2, s3, p1 & p2, tg->acc().mark(0));
|
||||
tg->new_edge(s3, s1, p1 | p2, spot::acc_cond::mark_t({0, 1}));
|
||||
tg->new_edge(s3, s2, p1 >> p2, 0U);
|
||||
tg->new_edge(s3, s3, bddtrue, spot::acc_cond::mark_t({0, 1}));
|
||||
|
||||
// Map Bdd indexes to cube indexes
|
||||
std::unordered_map<int, int> ap_binder;
|
||||
|
||||
// Get the set of propositions used by this automaton
|
||||
std::vector<std::string>* aps = extract_aps(tg, ap_binder);
|
||||
|
||||
// Test translation
|
||||
auto* aut = twa_to_twacube(tg, ap_binder, *aps);
|
||||
spot::print_dot(std::cout, tg);
|
||||
std::cout << "-----------\n" << *aut << "-----------\n";
|
||||
|
||||
unsigned int seed = 17;
|
||||
for (auto it = aut->succ(2); !it->done(); it->next())
|
||||
{
|
||||
auto& t = aut->trans_storage(it, seed);
|
||||
auto& d = aut->trans_data(it, seed);
|
||||
std::cout << t.src << ' ' << t.dst << ' '
|
||||
<< ' ' << aut->get_cubeset().dump(d.cube_, *aps)
|
||||
<< ' ' << d.acc_
|
||||
<< std::endl;
|
||||
}
|
||||
|
||||
delete aps;
|
||||
delete aut;
|
||||
}
|
||||
71
tests/core/twacube.test
Executable file
71
tests/core/twacube.test
Executable file
|
|
@ -0,0 +1,71 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2014, 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/>.
|
||||
|
||||
# While running some benchmark, Tomáš Babiak found that Spot took too
|
||||
# much time (i.e. >1h) to translate those six formulae. It turns out
|
||||
# that the WDBA minimization was performed after the degeneralization
|
||||
# algorithm, while this is not necessary (WDBA will produce a BA, so
|
||||
# we may as well skip degeneralization). Translating these formulae
|
||||
# in the test-suite ensure that they don't take too much time (the
|
||||
# buildfarm will timeout if it does).
|
||||
|
||||
. ./defs
|
||||
|
||||
set -e
|
||||
|
||||
run 0 ../twacube > stdout
|
||||
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
0 [label="0"]
|
||||
0 -> 0 [label="0"]
|
||||
0 -> 1 [label="p1"]
|
||||
0 -> 2 [label="p2\n{1}"]
|
||||
1 [label="1"]
|
||||
1 -> 2 [label="p1 & p2\n{0}"]
|
||||
2 [label="2"]
|
||||
2 -> 0 [label="p1 | p2\n{0,1}"]
|
||||
2 -> 1 [label="!p1 | p2"]
|
||||
2 -> 2 [label="1\n{0,1}"]
|
||||
}
|
||||
-----------
|
||||
init : 0
|
||||
0->0 : !p1&!p2 {}
|
||||
0->1 : p1 {}
|
||||
0->2 : p2 {1}
|
||||
1->2 : p1&p2 {0}
|
||||
2->0 : !p1&p2 {0,1}
|
||||
2->0 : p1 {0,1}
|
||||
2->1 : !p1 {}
|
||||
2->1 : p1&p2 {}
|
||||
2->2 : 1 {0,1}
|
||||
-----------
|
||||
2 1 !p1 {}
|
||||
2 2 1 {0,1}
|
||||
2 0 p1 {0,1}
|
||||
2 1 p1&p2 {}
|
||||
2 0 !p1&p2 {0,1}
|
||||
EOF
|
||||
|
||||
diff stdout expected
|
||||
Loading…
Add table
Add a link
Reference in a new issue