alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix Python bindings for relabeling_map, and document them

Browse source 
This fixes #61, and addresses one item of #14.

* src/ltlvisit/relabel.hh: Use a map rather than a unordered_map,
because the Swig binding for unordered_map do not seem functional.
* wrap/python/spot_impl.i: Adjust.
* wrap/python/tests/relabel.py: New file.
* wrap/python/tests/Makefile.am: Add it.
* doc/org/tut02.org: New file.
* doc/Makefile.am: Add it.
This commit is contained in:
Alexandre Duret-Lutz 2015-06-07 14:18:42 +02:00
parent a8f5e7fd8b
commit 6c2985e753
6 changed files with 225 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

38
wrap/python/spot_impl.i
View file

@ -32,6 +32,7 @@
%include "std_string.i"
%include "std_list.i"
%include "std_set.i"
%include "std_map.i"
%include "exception.i"
%include "typemaps.i"
@ -223,6 +224,28 @@ using namespace spot;
%include "ltlast/unop.hh"
%include "ltlast/visitor.hh"
namespace std {
%template(atomic_prop_set) set<const spot::ltl::atomic_prop*,
spot::ltl::formula_ptr_less_than>;
%template(mapff) map<const spot::ltl::formula*, const spot::ltl::formula*,
spot::ltl::formula_ptr_less_than>;
}
%{
namespace swig {
template <> struct traits<atomic_prop> {
typedef pointer_category category;
static const char* type_name() { return "spot::ltl::atomic_prop"; }
};
template <> struct traits<formula> {
typedef pointer_category category;
static const char* type_name() { return "spot::ltl::formula"; }
};
}
%}
%include "ltlenv/environment.hh"
%include "ltlenv/defaultenv.hh"
@ -299,21 +322,6 @@ using namespace spot;
#undef ltl
namespace std {
%template(atomic_prop_set) set<const spot::ltl::atomic_prop*,
spot::ltl::formula_ptr_less_than>;
}
%{
namespace swig {
template <> struct traits<atomic_prop> {
typedef pointer_category category;
static const char* type_name() { return"atomic_prop const *"; }
};
}
%}
%extend spot::ltl::formula {
// When comparing formula, make sure Python compare our

1
wrap/python/tests/Makefile.am
View file

@ -49,5 +49,6 @@ TESTS = \
piperead.ipynb \
randaut.ipynb \
randltl.ipynb \
relabel.py \
setxor.py \
testingaut.ipynb

32
wrap/python/tests/relabel.py Normal file
View file

@ -0,0 +1,32 @@
# -*- mode: python; coding: utf-8 -*-
# Copyright (C) 2015 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
f = spot.formula('GF(a & b) -> (FG(a & b) & Gc)')
m = spot.relabeling_map()
g = spot.relabel_bse(f, spot.Pnn, m)
res = ""
for old, new in m.items():
res += "#define {} {}\n".format(old, new)
res += str(g)
print(res)
assert(res == """#define p0 a & b
#define p1 c
GFp0 -> (FGp0 & Gp1)""")