simulation: many fixes.

* src/tgbaalgos/simulation.cc: Attempt to fix several cases.
* src/tgbatest/sim.test: Add more tests.
* src/tgbatest/sim2.test: New file.
* src/tgbatest/Makefile.am: Add it.

src/tgbatest/Makefile.am

@@ -80,6 +80,7 @@ TESTS = \
   readsave.test \
   simdet.test \
   sim.test \
+  sim2.test \
   ltl2tgba.test \
   ltl2neverclaim.test \
   ltl2neverclaim-lbtt.test \

src/tgbatest/sim.test

@@ -51,12 +51,33 @@ EOF
 
 diff out.tgba expected.tgba
 
-run 0 ../ltl2tgba -RDCIS -kt 'Fp U Gq' > out.tgba
-cat >expected.tgba <<EOF
+run 0 ../ltl2tgba -RDCIS -kt 'Fp U Gq' > out
+cat >expected <<EOF
 sub trans.: 12
 transitions: 6
 states: 3
 nondeterministic states: 1
 EOF
 
-diff out.tgba expected.tgba
+diff out expected
+
+
+run 0 ../ltl2tgba -R3 -x -RDCS -kt 'F(a & GFa)' > out
+run 0 ../ltl2tgba -R3f -x -RDCS -kt 'F(a & GFa)' > out2
+diff out out2
+
+
+f='FG((Fp0 & (!p0 R (F!p1 U !p1))) | (G!p0 & (p0 U (Gp1 R p1))))'
+run 0 ../ltl2tgba -R3f -x -RDS -kt "$f" | grep -v sub > out
+run 0 ../ltl2tgba -R3f -x -RDCS -kt "$f" | grep -v sub > out2
+diff out out2
+
+run 0 ../ltl2tgba -R3f -x -RDCS -kt "$f" > out2
+cat >expected <<EOF
+sub trans.: 13
+transitions: 8
+states: 3
+nondeterministic states: 1
+EOF
+
+diff out2 expected

src/tgbatest/sim2.test

@@ -0,0 +1,29 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Copyright (C) 2013 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/>.
+
+. ./defs
+set -e
+
+../ltl2tgba -b -x -R3f -RDS '{(a&b)[*3]}<>=>G(a&!b)' > ref
+
+
+for i in -R3 -R3f '-R3 -RDS' '-R3f -RDS' '-R3 -RDCS' '-R3f -RDCS'; do
+  ../ltl2tgba -Pref -E -x $i '(X!b R F!a) U (!a | G!b)'
+done