diff --git a/bench/ltlclasses/defs.in b/bench/ltlclasses/defs.in deleted file mode 100644 index 9d86b391d..000000000 --- a/bench/ltlclasses/defs.in +++ /dev/null @@ -1,54 +0,0 @@ -# -*- shell-script -*- -# Copyright (C) 2005 Laboratoire d'Informatique de Paris 6 (LIP6), -# département Systèmes Répartis Coopératifs (SRC), Université Pierre -# et Marie Curie. -# -# 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 . - -# Ensure we are running from the right directory. -test -f ./defs || { - echo "defs: not found in current directory" 1>&2 - exit 1 -} - -srcdir='@srcdir@' -builddir='@builddir@' - -# Ensure $srcdir is set correctly. -test -f "$srcdir/defs.in" || { - echo "$srcdir/defs.in not found, check \$srcdir" 1>&2 - exit 1 -} - -LBT='@LBT@' -LBTT='@LBTT@' -LBTT_TRANSLATE="@LBTT_TRANSLATE@" -LTL2BA='@LTL2BA@' -LTL2NBA='@LTL2NBA@' -LTL2TGBA='@top_builddir@/src/tgbatest/ltl2tgba@EXEEXT@' -ELTL2TGBA='@top_builddir@/src/tgbatest/eltl2tgba@EXEEXT@' -MODELLA='@MODELLA@' -SPIN='@SPIN@' -WRING2LBTT='@WRING2LBTT@' - -for var in LBT LTL2BA LTL2NBA MODELLA SPIN WRING2LBTT -do - if eval 'test -z "$'$var'"'; then - eval HAVE_$var=no - else - eval HAVE_$var=yes - fi -done diff --git a/bench/ltlclasses/run b/bench/ltlclasses/run index c0ac6f397..d4c979b62 100755 --- a/bench/ltlclasses/run +++ b/bench/ltlclasses/run @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright (C) 2010, 2012 Laboratoire de Recherche et Développement de -# l'EPITA (LRDE) +# Copyright (C) 2010, 2012, 2013 Laboratoire de Recherche et +# Développement de l'EPITA (LRDE) # # This file is part of Spot, a model checking library. # @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. ./defs - -gen="$builddir/../../src/bin/genltl" +gen=../../src/bin/genltl +LTL2TGBA=../../src/tgbatest/ltl2tgba for F in alpha beta beta-prime phi xi; do echo "# Benching ltl2tgba_fm for family ccj-$F" diff --git a/bench/ltlcounter/defs.in b/bench/ltlcounter/defs.in deleted file mode 100644 index c27676c07..000000000 --- a/bench/ltlcounter/defs.in +++ /dev/null @@ -1,53 +0,0 @@ -# -*- shell-script -*- -# Copyright (C) 2005 Laboratoire d'Informatique de Paris 6 (LIP6), -# département Systèmes Répartis Coopératifs (SRC), Université Pierre -# et Marie Curie. -# -# 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 . - -# Ensure we are running from the right directory. -test -f ./defs || { - echo "defs: not found in current directory" 1>&2 - exit 1 -} - -srcdir='@srcdir@' - -# Ensure $srcdir is set correctly. -test -f "$srcdir/defs.in" || { - echo "$srcdir/defs.in not found, check \$srcdir" 1>&2 - exit 1 -} - -LBT='@LBT@' -LBTT='@LBTT@' -LBTT_TRANSLATE="@LBTT_TRANSLATE@" -LTL2BA='@LTL2BA@' -LTL2NBA='@LTL2NBA@' -LTL2TGBA='@top_builddir@/src/tgbatest/ltl2tgba@EXEEXT@' -ELTL2TGBA='@top_builddir@/src/tgbatest/eltl2tgba@EXEEXT@' -MODELLA='@MODELLA@' -SPIN='@SPIN@' -WRING2LBTT='@WRING2LBTT@' - -for var in LBT LTL2BA LTL2NBA MODELLA SPIN WRING2LBTT -do - if eval 'test -z "$'$var'"'; then - eval HAVE_$var=no - else - eval HAVE_$var=yes - fi -done diff --git a/bench/ltlcounter/run b/bench/ltlcounter/run index fea8c687e..5ee0cd7da 100755 --- a/bench/ltlcounter/run +++ b/bench/ltlcounter/run @@ -1,7 +1,7 @@ #!/bin/sh - -# Copyright (C) 2009, 2010, 2011, 2012 Laboratoire de Recherche et -# Développement de l'EPITA (LRDE) +# -*- coding: utf-8 -*- +# Copyright (C) 2009, 2010, 2011, 2012, 2013 Laboratoire de Recherche +# et Développement de l'EPITA (LRDE) # # This file is part of Spot, a model checking library. # @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. ./defs - gen=../../src/bin/genltl +LTL2TGBA=../../src/tgbatest/ltl2tgba echo "# Benching ltl2tgba_fm..." echo "# the following values are also saved to file 'results.fm'" diff --git a/bench/wdba/defs.in b/bench/wdba/defs.in deleted file mode 100644 index c27676c07..000000000 --- a/bench/wdba/defs.in +++ /dev/null @@ -1,53 +0,0 @@ -# -*- shell-script -*- -# Copyright (C) 2005 Laboratoire d'Informatique de Paris 6 (LIP6), -# département Systèmes Répartis Coopératifs (SRC), Université Pierre -# et Marie Curie. -# -# 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 . - -# Ensure we are running from the right directory. -test -f ./defs || { - echo "defs: not found in current directory" 1>&2 - exit 1 -} - -srcdir='@srcdir@' - -# Ensure $srcdir is set correctly. -test -f "$srcdir/defs.in" || { - echo "$srcdir/defs.in not found, check \$srcdir" 1>&2 - exit 1 -} - -LBT='@LBT@' -LBTT='@LBTT@' -LBTT_TRANSLATE="@LBTT_TRANSLATE@" -LTL2BA='@LTL2BA@' -LTL2NBA='@LTL2NBA@' -LTL2TGBA='@top_builddir@/src/tgbatest/ltl2tgba@EXEEXT@' -ELTL2TGBA='@top_builddir@/src/tgbatest/eltl2tgba@EXEEXT@' -MODELLA='@MODELLA@' -SPIN='@SPIN@' -WRING2LBTT='@WRING2LBTT@' - -for var in LBT LTL2BA LTL2NBA MODELLA SPIN WRING2LBTT -do - if eval 'test -z "$'$var'"'; then - eval HAVE_$var=no - else - eval HAVE_$var=yes - fi -done diff --git a/bench/wdba/run b/bench/wdba/run index 52509c120..6ced198d8 100755 --- a/bench/wdba/run +++ b/bench/wdba/run @@ -1,6 +1,7 @@ #!/bin/sh -# Copyright (C) 2010, 2011 Laboratoire de Recherche et Développement -# de l'Epita (LRDE). +# -*- coding: utf-8 -*- +# Copyright (C) 2010, 2011, 2013 Laboratoire de Recherche et +# Développement de l'Epita (LRDE). # # This file is part of Spot, a model checking library. # @@ -17,8 +18,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. ./defs - cat >obligations.txt <(!p U r) @@ -62,6 +61,8 @@ Fr->(p->(!r U (s&!r&!z&X((!r&!z) U t)))) U r G((q&Fr)->(p->(!r U (s&!r&!z&X((!r&!z) U t)))) U r) EOF +LTL2TGBA=../../src/tgbatest/ltl2tgba + ( line=0 echo "# form. nbr., states, trans., states minimized, trans. minimized, formula" diff --git a/configure.ac b/configure.ac index f22cea840..24f705b9b 100644 --- a/configure.ac +++ b/configure.ac @@ -111,15 +111,12 @@ AC_CONFIG_FILES([ bench/emptchk/Makefile bench/emptchk/defs bench/ltlcounter/Makefile - bench/ltlcounter/defs bench/ltlclasses/Makefile - bench/ltlclasses/defs bench/ltl2tgba/Makefile bench/ltl2tgba/defs bench/scc-stats/Makefile bench/split-product/Makefile bench/wdba/Makefile - bench/wdba/defs doc/Doxyfile doc/Makefile doc/tl/Makefile