test the SPOT_SATSOLVER envvar

* tests/core/satmin3.test: New file.
* tests/Makefile.am: Add it.
* spot/misc/satsolver.cc: Cleanup error messages.
* spot/misc/satsolver.hh (satsolver_get_solution): Remove this unused
function.
* tests/core/readsat.cc, tests/core/readsat.test: Delete (unused).
* tests/Makefile.am: Adjust.

spot/misc/satsolver.cc

@@ -1,5 +1,5 @@
 // -*- coding: utf-8 -*-
-// Copyright (C) 2013, 2014, 2015, 2016 Laboratoire de Recherche et
+// Copyright (C) 2013, 2014, 2015, 2016, 2017 Laboratoire de Recherche et
 // Développement de l'Epita.
 //
 // This file is part of Spot, a model checking library.
@@ -31,45 +31,6 @@
 
 namespace spot
 {
-  std::vector<int>
-  satsolver_get_solution(const char* filename)
-  {
-    std::vector<int> sol;
-    std::istream* in;
-    if (filename[0] == '-' && filename[1] == 0)
-      in = &std::cin;
-    else
-      in = new std::ifstream(filename);
-
-    int c;
-    while ((c = in->get()) != EOF)
-      {
-        // If a line does not start with 'v ', ignore it.
-        if (c != 'v' || in->get() != ' ')
-          {
-            in->ignore(std::numeric_limits<std::streamsize>::max(), '\n');
-            continue;
-          }
-        // Otherwise, read integers one by one.
-        int i;
-        while (*in >> i)
-          {
-            if (i == 0)
-              goto stop;
-            sol.emplace_back(i);
-          }
-        if (!in->eof())
-          // If we haven't reached end-of-file, then we just attempted
-          // to extract something that wasn't an integer.  Clear the
-          // fail bit so that will loop over.
-          in->clear();
-      }
-  stop:
-    if (in != &std::cin)
-      delete in;
-    return sol;
-  }
-
   // In other functions, command_given() won't be called anymore as it is more
   // easy to check if psat_ was initialized or not.
   satsolver::satsolver()
@@ -379,11 +340,11 @@ namespace spot
 
     prime(satsolver);
     if (!has('I'))
-      throw std::runtime_error(": SPOT_SATSOLVER should contain %I to "
+      throw std::runtime_error("SPOT_SATSOLVER should use %I as "
-          "indicate how to use the input filename.");
+          "input filename.");
     if (!has('O'))
-      throw std::runtime_error(": SPOT_SATSOLVER should contain %O to "
+      throw std::runtime_error("SPOT_SATSOLVER should use %O as "
-          "indicate how to use the output filename.");
+          "output filename.");
   }
 
   bool

spot/misc/satsolver.hh

@@ -1,5 +1,5 @@
 // -*- coding: utf-8 -*-
-// Copyright (C) 2013 Laboratoire de Recherche et Développement
+// Copyright (C) 2013, 2017 Laboratoire de Recherche et Développement
 // de l'Epita.
 //
 // This file is part of Spot, a model checking library.
@@ -173,13 +173,6 @@ namespace spot
     std::string path_;
   };
 
-  /// \brief Extract the solution of a SAT solver output.
-  SPOT_API std::vector<int>
-  satsolver_get_solution(const char* filename);
-}
-
-namespace spot
-{
   template<typename T>
   void
   satsolver::comment_rec(T single)

tests/Makefile.am

@@ -84,7 +84,6 @@ check_PROGRAMS = \
   core/ngraph \
   core/parity \
   core/randtgba \
-  core/readsat \
   core/reduc \
   core/reduccmp \
   core/reduceu \
@@ -112,7 +111,6 @@ core_intvcmp2_SOURCES = core/intvcmp2.cc
 core_kripkecat_SOURCES = core/kripkecat.cc
 core_ngraph_SOURCES = core/ngraph.cc
 core_randtgba_SOURCES = core/randtgba.cc
-core_readsat_SOURCES = core/readsat.cc
 core_taatgba_SOURCES = core/taatgba.cc
 core_tgbagraph_SOURCES = core/twagraph.cc
 core_consterm_SOURCES = core/consterm.cc
@@ -294,6 +292,7 @@ TESTS_twa = \
   core/basimul.test \
   core/satmin.test \
   core/satmin2.test \
+  core/satmin3.test \
   core/spotlbtt.test \
   core/ltlcross.test \
   core/spotlbtt2.test \

tests/core/readsat.cc

@@ -1,31 +0,0 @@
-// -*- coding: utf-8 -*-
-// Copyright (C) 2013, 2015 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/>.
-
-#include <iostream>
-#include <vector>
-#include <spot/misc/satsolver.hh>
-
-int main()
-{
-  std::vector<int> sol = spot::satsolver_get_solution("-");
-  for (std::vector<int>::const_iterator i = sol.begin();
-       i != sol.end(); ++i)
-    std::cout << ' ' << *i;
-  std::cout << '\n';
-}

tests/core/readsat.test

@@ -1,52 +0,0 @@
-#!/bin/sh
-# -*- coding: utf-8 -*-
-# Copyright (C) 2013, 2015 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/>.
-
-# Do some quick translations to make sure the neverclaims produced by
-# spot actually look correct!  We do that by parsing them via ltlcross.
-# ltl2neverclaim-lbtt.test does the same with LBTT if it is installed.
-
-. ./defs
-set -e
-
-cat > foo <<EOF
-c some comment
-c more comment
-v 12 13
-cignore
-vignore
-v 14   -15
-signore
-v
-EOF
-
-test ' 12 13 14 -15' = "`../readsat < foo`"
-
-cat > foo <<EOF
-c some comment
-c more comment
-v12 13
-cignore
-vignore
-v 14 0 -15
-signore
-v
-EOF
-
-test ' 14' = "`../readsat < foo`"

tests/core/satmin3.test

@@ -0,0 +1,97 @@
+#!/bin/sh
+# -*- 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/>.
+
+. ./defs
+set -e
+
+
+# Make sure the SPOT_SATSOLVER envar works.
+
+# DRA produced by ltl2dstar for GFp0 -> GFp1
+cat >test.hoa <<EOF
+HOA: v1
+States: 4
+properties: implicit-labels trans-labels no-univ-branch deterministic complete
+acc-name: Rabin 2
+Acceptance: 4 (Fin(0)&Inf(1))|(Fin(2)&Inf(3))
+Start: 0
+AP: 2 "p0" "p1"
+--BODY--
+State: 0 {0}
+1
+0
+3
+2
+State: 1 {1}
+1
+0
+3
+2
+State: 2 {0 3}
+1
+0
+3
+2
+State: 3 {1 3}
+1
+0
+3
+2
+--END--
+EOF
+
+# Try fake SAT-solvers
+SPOT_SATSOLVER=false \
+  autfilt --sat-minimize test.hoa --stats=%s 2>err && exit 1
+grep 'autfilt: SPOT_SATSOLVER should use %I' err
+
+SPOT_SATSOLVER='false %I' \
+  autfilt --sat-minimize test.hoa --stats=%s 2>err && exit 1
+grep 'autfilt: SPOT_SATSOLVER should use %O' err
+
+SPOT_SATSOLVER='false %I %O' \
+  autfilt --sat-minimize test.hoa --stats=%s >output
+test `cat output` = 4
+
+SPOT_SATSOLVER='this-does-not-exist %I %O' \
+              autfilt --sat-minimize test.hoa --stats=%s 2>err && exit
+grep 'this-does-not-exist.*failed' err
+
+# Now use some real one if we can find one.
+
+if (picosat -h >/dev/null) 2>/dev/null; then
+    SPOT_SATSOLVER='picosat %I >%O'
+elif (glucose --help >/dev/null) 2>/dev/null; then
+    SPOT_SATSOLVER='glucose -model -verb=0 %I >%O'
+else
+    exit 77
+fi
+
+export SPOT_SATSOLVER
+
+# Let's try to find a smaller transition-based Streett automaton We
+# easily really check the expected automaton, because different SAT
+# solver (even different versions of glucose) can return different
+# automata.
+autfilt --sat-minimize='acc="Fin(0)|Inf(1)"' test.hoa --stats=%s >output
+test `cat output` = 1
+
+autfilt -S --sat-minimize='acc="Fin(0)|Inf(1)"' test.hoa --stats=%s >output
+test `cat output` = 3