trival: new class for tri-valued logic
* spot/misc/trival.hh: New file. * spot/misc/Makefile.am: Add it. * python/spot_impl.i: Add Python bindings. * tests/core/trival.cc, tests/core/trival.test, tests/python/trival.py: New files, testing it. * tests/Makefile.am: Add them.
This commit is contained in:
parent
e764cf6f3b
commit
1aeb260adf
8 changed files with 378 additions and 10 deletions
|
|
@ -36,8 +36,8 @@ check_SCRIPTS = run
|
|||
|
||||
# We try to keep this somehow by strength. Test basic things first,
|
||||
# because such failures will be easier to diagnose and fix.
|
||||
TESTS = $(TESTS_sanity) $(TESTS_tl) $(TESTS_graph) $(TESTS_kripke) \
|
||||
$(TESTS_twa) $(TESTS_python) $(TESTS_ltsmin)
|
||||
TESTS = $(TESTS_sanity) $(TESTS_misc) $(TESTS_tl) $(TESTS_graph) \
|
||||
$(TESTS_kripke) $(TESTS_twa) $(TESTS_python) $(TESTS_ltsmin)
|
||||
|
||||
distclean-local:
|
||||
find . -name '*.dir' -type d -print | xargs rm -rf
|
||||
|
|
@ -85,6 +85,7 @@ check_PROGRAMS = \
|
|||
core/reductaustr \
|
||||
core/syntimpl \
|
||||
core/taatgba \
|
||||
core/trival \
|
||||
core/tgbagraph \
|
||||
core/tostring \
|
||||
core/tunabbrev \
|
||||
|
|
@ -131,6 +132,7 @@ core_reductaustr_SOURCES = core/equalsf.cc
|
|||
core_reductaustr_CPPFLAGS = $(AM_CPPFLAGS) -DREDUC_TAUSTR
|
||||
core_syntimpl_SOURCES = core/syntimpl.cc
|
||||
core_tostring_SOURCES = core/tostring.cc
|
||||
core_trival_SOURCES = core/trival.cc
|
||||
core_tunabbrev_SOURCES = core/equalsf.cc
|
||||
core_tunabbrev_CPPFLAGS = $(AM_CPPFLAGS) -DUNABBREV='"^ieFG"'
|
||||
core_tunenoform_SOURCES = core/equalsf.cc
|
||||
|
|
@ -180,11 +182,14 @@ TESTS_graph = \
|
|||
TESTS_kripke = \
|
||||
core/kripke.test
|
||||
|
||||
TESTS_misc = \
|
||||
core/bitvect.test \
|
||||
core/intvcomp.test \
|
||||
core/trival.test
|
||||
|
||||
TESTS_twa = \
|
||||
core/acc.test \
|
||||
core/acc2.test \
|
||||
core/intvcomp.test \
|
||||
core/bitvect.test \
|
||||
core/ltlcross3.test \
|
||||
core/taatgba.test \
|
||||
core/renault.test \
|
||||
|
|
@ -299,7 +304,8 @@ TESTS_python = \
|
|||
python/remfin.py \
|
||||
python/satmin.py \
|
||||
python/setxor.py \
|
||||
python/testingaut.ipynb
|
||||
python/testingaut.ipynb \
|
||||
python/trival.py
|
||||
endif
|
||||
|
||||
SUFFIXES = .ipynb .html
|
||||
|
|
|
|||
1
tests/core/.gitignore
vendored
1
tests/core/.gitignore
vendored
|
|
@ -65,6 +65,7 @@ tgbagraph
|
|||
tgbaread
|
||||
tostring
|
||||
tripprod
|
||||
trival
|
||||
tunabbrev
|
||||
tunenoform
|
||||
unabbrevwm
|
||||
|
|
|
|||
50
tests/core/trival.cc
Normal file
50
tests/core/trival.cc
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2016 Laboratoire de Recherche et Developpement 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/>.
|
||||
|
||||
#undef NDEBUG
|
||||
#include <spot/misc/trival.hh>
|
||||
#include <cassert>
|
||||
|
||||
int main()
|
||||
{
|
||||
spot::trival v1;
|
||||
spot::trival v2(false);
|
||||
spot::trival v3(true);
|
||||
spot::trival v4 = spot::trival::maybe();
|
||||
assert(v1 != v2);
|
||||
assert(v1 != v3);
|
||||
assert(v2 != v3);
|
||||
assert(v4 != v2);
|
||||
assert(v4 != v3);
|
||||
assert(v2 == false);
|
||||
assert(true == v3);
|
||||
assert(v4 == spot::trival::maybe());
|
||||
assert(v3);
|
||||
assert(!v2);
|
||||
assert(!(bool)!v1);
|
||||
assert(!(bool)v1);
|
||||
assert(!(bool)!v3);
|
||||
|
||||
for (auto u : {v2, v1, v3})
|
||||
for (auto v : {v2, v1, v3})
|
||||
std::cout << u << " && " << v << " == " << (u && v) << '\n';
|
||||
for (auto u : {v2, v1, v3})
|
||||
for (auto v : {v2, v1, v3})
|
||||
std::cout << u << " || " << v << " == " << (u || v) << '\n';
|
||||
}
|
||||
56
tests/core/trival.test
Executable file
56
tests/core/trival.test
Executable file
|
|
@ -0,0 +1,56 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2016 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 ../trival > trival.out
|
||||
|
||||
cat > expected <<EOF
|
||||
no && no == no
|
||||
no && maybe == no
|
||||
no && yes == no
|
||||
maybe && no == no
|
||||
maybe && maybe == maybe
|
||||
maybe && yes == maybe
|
||||
yes && no == no
|
||||
yes && maybe == maybe
|
||||
yes && yes == yes
|
||||
no || no == no
|
||||
no || maybe == maybe
|
||||
no || yes == yes
|
||||
maybe || no == maybe
|
||||
maybe || maybe == maybe
|
||||
maybe || yes == yes
|
||||
yes || no == yes
|
||||
yes || maybe == yes
|
||||
yes || yes == yes
|
||||
EOF
|
||||
|
||||
diff trival.out expected
|
||||
42
tests/python/trival.py
Normal file
42
tests/python/trival.py
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
# -*- mode: python; coding: utf-8 -*-
|
||||
# Copyright (C) 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/>.
|
||||
|
||||
import spot
|
||||
|
||||
v1 = spot.trival()
|
||||
v2 = spot.trival(False)
|
||||
v3 = spot.trival(True)
|
||||
v4 = spot.trival_maybe()
|
||||
assert v1 != v2
|
||||
assert v1 != v3
|
||||
assert v2 != v3
|
||||
assert v4 != v2
|
||||
assert v4 != v3
|
||||
assert v2 == False
|
||||
assert True == v3
|
||||
assert v4 == spot.trival_maybe()
|
||||
assert v3
|
||||
assert -v2
|
||||
assert not -v1
|
||||
assert not v1;
|
||||
assert not -v3
|
||||
|
||||
for u in (v1, v2, v3):
|
||||
for v in (v1, v2, v3):
|
||||
assert (u & v) == -(-u | -v)
|
||||
Loading…
Add table
Add a link
Reference in a new issue