python: add bindings for bdd_to_formula()
Follow-up to an email from Ayrat Khalimov. * python/spot/impl.i: Include twa/formula2bdd.hh. * python/spot/__init__.py: Make the dictionnary optional. * spot/twa/formula2bdd.cc: Throw an exception instead of asserting. * tests/python/bdditer.py: New file. * tests/Makefile.am: Add it. * NEWS: Update.
This commit is contained in:
parent
df44616dfd
commit
4e9303e380
6 changed files with 78 additions and 3 deletions
4
NEWS
4
NEWS
|
|
@ -8,6 +8,10 @@ New in spot 2.3.1.dev (not yet released)
|
||||||
atomic propositions instead of conting them. Tools that output
|
atomic propositions instead of conting them. Tools that output
|
||||||
formulas also support --format=%x for this purpose.
|
formulas also support --format=%x for this purpose.
|
||||||
|
|
||||||
|
Python:
|
||||||
|
|
||||||
|
- The bdd_to_formula() function can now be called in Python.
|
||||||
|
|
||||||
Documentation:
|
Documentation:
|
||||||
|
|
||||||
- https://spot.lrde.epita.fr/tut11.html is a new page describing
|
- https://spot.lrde.epita.fr/tut11.html is a new page describing
|
||||||
|
|
|
||||||
|
|
@ -891,6 +891,9 @@ def parse_word(word, dic=_bdd_dict):
|
||||||
from spot.impl import parse_word as pw
|
from spot.impl import parse_word as pw
|
||||||
return pw(word, dic)
|
return pw(word, dic)
|
||||||
|
|
||||||
|
def bdd_to_formula(b, dic=_bdd_dict):
|
||||||
|
from spot.impl import bdd_to_formula as bf
|
||||||
|
return bf(b, dic)
|
||||||
|
|
||||||
def language_containment_checker(dic=_bdd_dict):
|
def language_containment_checker(dic=_bdd_dict):
|
||||||
from spot.impl import language_containment_checker as c
|
from spot.impl import language_containment_checker as c
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,7 @@
|
||||||
#include <spot/tl/relabel.hh>
|
#include <spot/tl/relabel.hh>
|
||||||
|
|
||||||
#include <spot/twa/bddprint.hh>
|
#include <spot/twa/bddprint.hh>
|
||||||
|
#include <spot/twa/formula2bdd.hh>
|
||||||
#include <spot/twa/fwd.hh>
|
#include <spot/twa/fwd.hh>
|
||||||
#include <spot/twa/acc.hh>
|
#include <spot/twa/acc.hh>
|
||||||
#include <spot/twa/twa.hh>
|
#include <spot/twa/twa.hh>
|
||||||
|
|
@ -429,6 +430,7 @@ namespace std {
|
||||||
/* these must come before apcollect.hh */
|
/* these must come before apcollect.hh */
|
||||||
%include <spot/twa/bdddict.hh>
|
%include <spot/twa/bdddict.hh>
|
||||||
%include <spot/twa/bddprint.hh>
|
%include <spot/twa/bddprint.hh>
|
||||||
|
%include <spot/twa/formula2bdd.hh>
|
||||||
%include <spot/twa/fwd.hh>
|
%include <spot/twa/fwd.hh>
|
||||||
%implicitconv spot::acc_cond::mark_t;
|
%implicitconv spot::acc_cond::mark_t;
|
||||||
%implicitconv spot::acc_cond::acc_code;
|
%implicitconv spot::acc_cond::acc_code;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
// -*- coding: utf-8 -*-
|
// -*- coding: utf-8 -*-
|
||||||
// Copyright (C) 2009, 2010, 2012, 2014, 2015 Laboratoire de Recherche
|
// Copyright (C) 2009-2017 Laboratoire de Recherche et Développement
|
||||||
// et Développement de l'Epita (LRDE).
|
// de l'Epita (LRDE).
|
||||||
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris
|
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris
|
||||||
// 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
|
// 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
|
||||||
// Université Pierre et Marie Curie.
|
// Université Pierre et Marie Curie.
|
||||||
|
|
@ -39,7 +39,10 @@ namespace spot
|
||||||
{
|
{
|
||||||
int var = bdd_var(b);
|
int var = bdd_var(b);
|
||||||
const bdd_dict::bdd_info& i = d->bdd_map[var];
|
const bdd_dict::bdd_info& i = d->bdd_map[var];
|
||||||
assert(i.type == bdd_dict::var);
|
if (SPOT_UNLIKELY(i.type != bdd_dict::var))
|
||||||
|
throw std::runtime_error("bdd_to_formula() was passed a bdd"
|
||||||
|
" with a variable that is not in "
|
||||||
|
"the dictionary");
|
||||||
formula res = i.f;
|
formula res = i.f;
|
||||||
|
|
||||||
bdd high = bdd_high(b);
|
bdd high = bdd_high(b);
|
||||||
|
|
|
||||||
|
|
@ -327,6 +327,7 @@ TESTS_python = \
|
||||||
python/alarm.py \
|
python/alarm.py \
|
||||||
python/alternating.py \
|
python/alternating.py \
|
||||||
python/bddnqueen.py \
|
python/bddnqueen.py \
|
||||||
|
python/bdditer.py \
|
||||||
python/bugdet.py \
|
python/bugdet.py \
|
||||||
python/sccinfo.py \
|
python/sccinfo.py \
|
||||||
python/decompose_scc.py \
|
python/decompose_scc.py \
|
||||||
|
|
|
||||||
62
tests/python/bdditer.py
Normal file
62
tests/python/bdditer.py
Normal file
|
|
@ -0,0 +1,62 @@
|
||||||
|
# -*- mode: python; 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/>.
|
||||||
|
|
||||||
|
|
||||||
|
# Tests different ways to explore a BDD label, as discussed in
|
||||||
|
# http://lists.lrde.epita.fr/pipermail/spot/2017q1/000117.html
|
||||||
|
|
||||||
|
import spot
|
||||||
|
import buddy
|
||||||
|
import sys
|
||||||
|
|
||||||
|
run = spot.translate('a & !b').accepting_run()
|
||||||
|
b = run.prefix[0].label
|
||||||
|
c = buddy.bdd_satone(b)
|
||||||
|
assert c != buddy.bddfalse
|
||||||
|
res = []
|
||||||
|
while c != buddy.bddtrue:
|
||||||
|
var = buddy.bdd_var(c)
|
||||||
|
h = buddy.bdd_high(c)
|
||||||
|
if h == buddy.bddfalse:
|
||||||
|
res.append(-var)
|
||||||
|
c = buddy.bdd_low(c)
|
||||||
|
else:
|
||||||
|
res.append(var)
|
||||||
|
c = h
|
||||||
|
|
||||||
|
assert res == [0, -1]
|
||||||
|
|
||||||
|
res2 = []
|
||||||
|
for i in run.aut.ap():
|
||||||
|
res2.append((i, run.aut.register_ap(i)))
|
||||||
|
assert str(res2) == '[(a, 0), (b, 1)]'
|
||||||
|
|
||||||
|
|
||||||
|
f = spot.bdd_to_formula(b)
|
||||||
|
assert f._is(spot.op_And)
|
||||||
|
assert f[0]._is(spot.op_ap)
|
||||||
|
assert f[1]._is(spot.op_Not)
|
||||||
|
assert f[1][0]._is(spot.op_ap)
|
||||||
|
assert str(f) == 'a & !b'
|
||||||
|
|
||||||
|
try:
|
||||||
|
f = spot.bdd_to_formula(b, spot.make_bdd_dict())
|
||||||
|
sys.exit(2)
|
||||||
|
except RuntimeError as e:
|
||||||
|
assert "not in the dictionary" in str(e)
|
||||||
Loading…
Add table
Add a link
Reference in a new issue