PySMT 0.9.7.dev139__tar.gz → 0.9.7.dev333__tar.gz

{PySMT-0.9.7.dev139/PySMT.egg-info → PySMT-0.9.7.dev333}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: PySMT
-Version: 0.9.7.dev139
+Version: 0.9.7.dev333
 Summary: A solver-agnostic library for SMT Formulae manipulation and solving
 Home-page: http://www.pysmt.org
 Author: PySMT Team

{PySMT-0.9.7.dev139 → PySMT-0.9.7.dev333/PySMT.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: PySMT
-Version: 0.9.7.dev139
+Version: 0.9.7.dev333
 Summary: A solver-agnostic library for SMT Formulae manipulation and solving
 Home-page: http://www.pysmt.org
 Author: PySMT Team

{PySMT-0.9.7.dev139 → PySMT-0.9.7.dev333}/PySMT.egg-info/SOURCES.txt

@@ -48,9 +48,17 @@ pysmt/cmd/installers/btor.py
 pysmt/cmd/installers/cvcfive.py
 pysmt/cmd/installers/cvcfour.py
 pysmt/cmd/installers/msat.py
+pysmt/cmd/installers/optimsat.py
 pysmt/cmd/installers/pico.py
 pysmt/cmd/installers/yices.py
 pysmt/cmd/installers/z3.py
+pysmt/optimization/__init__.py
+pysmt/optimization/goal.py
+pysmt/optimization/msat.py
+pysmt/optimization/optimizer.py
+pysmt/optimization/optimsat.py
+pysmt/optimization/yices.py
+pysmt/optimization/z3.py
 pysmt/smtlib/__init__.py
 pysmt/smtlib/annotations.py
 pysmt/smtlib/commands.py
@@ -65,6 +73,7 @@ pysmt/solvers/bdd.py
 pysmt/solvers/btor.py
 pysmt/solvers/cvcfive.py
 pysmt/solvers/cvcfour.py
+pysmt/solvers/dynmsat.py
 pysmt/solvers/eager.py
 pysmt/solvers/interpolation.py
 pysmt/solvers/msat.py
@@ -78,6 +87,8 @@ pysmt/solvers/yices.py
 pysmt/solvers/z3.py
 pysmt/test/__init__.py
 pysmt/test/examples.py
+pysmt/test/omt_examples.py
+pysmt/test/optimization_utils.py
 pysmt/test/test_array.py
 pysmt/test/test_back.py
 pysmt/test/test_bdd.py
@@ -102,6 +113,8 @@ pysmt/test/test_models.py
 pysmt/test/test_native_qe.py
 pysmt/test/test_nia.py
 pysmt/test/test_nlira.py
+pysmt/test/test_optimization.py
+pysmt/test/test_optimizing.py
 pysmt/test/test_oracles.py
 pysmt/test/test_portfolio.py
 pysmt/test/test_printing.py
@@ -127,9 +140,11 @@ pysmt/test/smtlib/test_fuzzed.py
 pysmt/test/smtlib/test_generic_wrapper.py
 pysmt/test/smtlib/test_griggio.py
 pysmt/test/smtlib/test_model_validation.py
+pysmt/test/smtlib/test_omt_lib_solver.py
 pysmt/test/smtlib/test_parser_examples.py
 pysmt/test/smtlib/test_parser_extensibility.py
 pysmt/test/smtlib/test_parser_lra.py
+pysmt/test/smtlib/test_parser_omt.py
 pysmt/test/smtlib/test_parser_qf_arrays.py
 pysmt/test/smtlib/test_parser_qf_lia.py
 pysmt/test/smtlib/test_parser_qf_lira.py

{PySMT-0.9.7.dev139 → PySMT-0.9.7.dev333}/pysmt/__init__.py

@@ -16,7 +16,7 @@
 #   limitations under the License.
 #
 
-VERSION = (0, 9, 7, "dev", 139)
+VERSION = (0, 9, 7, "dev", 333)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{PySMT-0.9.7.dev139 → PySMT-0.9.7.dev333}/pysmt/cmd/check_version.py

@@ -23,12 +23,20 @@ def check_version(module):
             (major, minor, ver, _) = z3.get_version()
             version = "%d.%d.%d" % (major, minor, ver)
 
-        elif module == "msat":
-            import mathsat
-            version_str = mathsat.msat_get_version()
+        elif module in ("msat", "optimsat"):
+            if module == "msat":
+                import mathsat
+                version_str = mathsat.msat_get_version()
+            else:
+                import optimathsat
+                version_str = optimathsat.msat_get_version()
             m = re.match(r"^MathSAT5 version (\d+\.\d+\.\d+) .*$", version_str)
             if m is not None:
                 version = m.group(1)
+            else:
+                m = re.match(r"^MathSAT5 version (\w+) .*$", version_str)
+                if m is not None:
+                    version = m.group(1)
 
         elif module == "cudd":
             import repycudd

{PySMT-0.9.7.dev139 → PySMT-0.9.7.dev333}/pysmt/cmd/install.py

@@ -21,7 +21,7 @@ from collections import namedtuple
 
 from pysmt.cmd.installers import MSatInstaller, Z3Installer, PicoSATInstaller
 from pysmt.cmd.installers import CVC5Installer, YicesInstaller, BtorInstaller
-from pysmt.cmd.installers import CuddInstaller, CVC4Installer
+from pysmt.cmd.installers import CuddInstaller, CVC4Installer, OptiMSatInstaller
 from pysmt.cmd.installers.base import solver_install_site
 
 from pysmt.environment import get_env
@@ -43,10 +43,10 @@ INSTALLERS = [
               {"pypicosat_minor_version" : "1708010052"}),
     Installer(CuddInstaller,    "2.0.3",
               {"git_version" : "ecb03d6d231273343178f566cc4d7258dcce52b4"}),
+    Installer(OptiMSatInstaller, "1.7.3", {})
 ]
 
 
-
 def get_requested_solvers():
     """Parses the PYSMT_SOLVER env variable to extract requirements to fulfill"""
 
@@ -107,6 +107,9 @@ def check_installed(required_solvers, install_dir, bindings_dir, mirror_link):
     interps = get_env().factory.all_interpolators()
     print("Interpolators: %s" % ", ".join(name for name in interps))
 
+    opts = get_env().factory.all_optimizers()
+    print("Optimizers: %s" % ", ".join(name for name in opts))
+
 
 
 def parse_options():

{PySMT-0.9.7.dev139 → PySMT-0.9.7.dev333}/pysmt/cmd/installers/__init__.py

@@ -20,6 +20,8 @@ from pysmt.cmd.installers.yices import YicesInstaller
 from pysmt.cmd.installers.btor import BtorInstaller
 from pysmt.cmd.installers.pico import PicoSATInstaller
 from pysmt.cmd.installers.bdd import CuddInstaller
+from pysmt.cmd.installers.optimsat import OptiMSatInstaller
 
 assert MSatInstaller and Z3Installer and CVC5Installer and YicesInstaller
 assert BtorInstaller and PicoSATInstaller and CuddInstaller and CVC4Installer
+assert OptiMSatInstaller

{PySMT-0.9.7.dev139 → PySMT-0.9.7.dev333}/pysmt/cmd/installers/cvcfive.py

@@ -35,7 +35,6 @@ class CVC5Installer(SolverInstaller):
         pass
 
     def compile(self):
-        print(self.bindings_dir)
         SolverInstaller.run_python("-m pip install --upgrade --target=%s cvc5==%s" % (self.bindings_dir, self.solver_version))
 
     def get_installed_version(self):

PySMT-0.9.7.dev333/pysmt/cmd/installers/optimsat.py

@@ -0,0 +1,89 @@
+# Copyright 2014 Andrea Micheli and Marco Gario
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import glob
+
+from pysmt.cmd.installers.base import SolverInstaller
+
+
+class OptiMSatInstaller(SolverInstaller):
+
+    SOLVER = "optimsat"
+
+    def __init__(self, install_dir, bindings_dir, solver_version,
+                 mirror_link=None):
+        # Getting the right archive name
+        os_name = self.os_name
+        arch = str(self.bits) + "-bit"
+        ext = "tar.gz"
+        if os_name == "windows":
+            ext = "zip"
+            arch += "-mingw"
+        elif os_name == "darwin":
+            os_name = "macos"
+
+        archive_name = "optimathsat-%s-%s-%s.%s" % (solver_version, os_name,
+                                                    arch, ext)
+
+        native_link = "http://optimathsat.disi.unitn.it/releases/optimathsat-%s/{archive_name}" % solver_version
+
+        SolverInstaller.__init__(self, install_dir=install_dir,
+                                 bindings_dir=bindings_dir,
+                                 solver_version=solver_version,
+                                 archive_name=archive_name,
+                                 native_link = native_link,
+                                 mirror_link=mirror_link)
+
+        self.python_bindings_dir = os.path.join(self.extract_path, "python")
+
+
+    def compile(self):
+        if self.os_name == "windows":
+            libdir = os.path.join(self.python_bindings_dir, "../lib")
+            incdir = os.path.join(self.python_bindings_dir, "../include")
+            gmp_h_url = "https://github.com/mikand/tamer-windows-deps/raw/master/gmp/include/gmp.h"
+            mpir_dll_url = "https://github.com/Legrandin/mpir-windows-builds/blob/master/mpir-2.6.0_VS2015_%s/mpir.dll?raw=true" % self.bits
+            mpir_lib_url = "https://github.com/Legrandin/mpir-windows-builds/blob/master/mpir-2.6.0_VS2015_%s/mpir.lib?raw=true" % self.bits
+
+            SolverInstaller.do_download(gmp_h_url, os.path.join(incdir, "gmp.h"))
+            SolverInstaller.do_download(mpir_dll_url, os.path.join(libdir, "mpir.dll"))
+            SolverInstaller.do_download(mpir_lib_url, os.path.join(libdir, "mpir.lib"))
+
+        if self.os_name in {"darwin"}:
+            SolverInstaller.run_python("./setup.py build_ext", self.python_bindings_dir)
+        else:
+            SolverInstaller.run_python("./setup.py build_ext -R $ORIGIN", self.python_bindings_dir)
+
+
+    def move(self):
+        pdir = self.python_bindings_dir
+        bdir = os.path.join(pdir, "build")
+        sodir = glob.glob(bdir + "/lib.*")[0]
+        libdir = os.path.join(self.python_bindings_dir, "../lib")
+
+        # First, we need the SWIG-generated wrapper
+        for f in os.listdir(sodir):
+            if f.endswith(".so") or f.endswith(".pyd"):
+                SolverInstaller.mv(os.path.join(sodir, f), self.bindings_dir)
+        SolverInstaller.mv(os.path.join(pdir, "optimathsat.py"), self.bindings_dir)
+
+        # Since MathSAT 5.5.0 we also need the SO/DLL/DYLIB of mathsat in the PATH
+        # Under Windows, we also need the DLLs of MPIR in the PATH
+        for f in os.listdir(libdir):
+            if f.endswith(".so") or f.endswith(".dll") or f.endswith(".dylib"):
+                SolverInstaller.mv(os.path.join(libdir, f), self.bindings_dir)
+
+    def get_installed_version(self):
+        return self.get_installed_version_script(self.bindings_dir, "optimsat")

{PySMT-0.9.7.dev139 → PySMT-0.9.7.dev333}/pysmt/cmd/shell.py

@@ -21,13 +21,14 @@ import sys
 import argparse
 from warnings import warn
 
-from pysmt import git_version
+from pysmt import __version__
 from pysmt.shortcuts import *
 from pysmt.typing import INT, REAL, BOOL, BVType, BV32
 
 from pysmt.smtlib.parser import SmtLibParser
-from pysmt.smtlib.script import evaluate_command
-from pysmt.smtlib.commands import CHECK_SAT, GET_VALUE
+from pysmt.smtlib.script import InterpreterOMT, InterpreterSMT
+from pysmt.smtlib.commands import CHECK_SAT, GET_VALUE, GET_OBJECTIVES, ECHO
+from pysmt.logics import PYSMT_LOGICS
 
 welcome_msg = \
 """Welcome to pySMT!!!
@@ -60,6 +61,7 @@ class PysmtShell(object):
     def __init__(self, argv):
         self.env = get_env()
         self.solvers = list(self.env.factory.all_solvers().keys())
+        self.optimizers = list(self.env.factory.all_optimizers().keys())
         self.parser = self.get_parser()
         self.args = self.parser.parse_args(argv)
 
@@ -68,7 +70,7 @@ class PysmtShell(object):
         parser = argparse.ArgumentParser(description="Command-line interface " \
                                          "for pySMT problems")
         parser.add_argument('--version', action='version',
-                        version='%(prog)s {version}'.format(version=git_version()))
+                        version='%(prog)s {version}'.format(version=__version__))
         parser.add_argument('--file', '-f', metavar='filename', type=str,
                             help='A script file to read from instead of stdin')
 
@@ -80,6 +82,14 @@ class PysmtShell(object):
                             choices=['auto'] + self.solvers,
                             default=None,
                             help='The solver to use (default: auto)')
+        parser.add_argument('--optimizer', '-o', metavar='opt_name', type=str,
+                            choices=['auto'] + self.optimizers,
+                            default=None,
+                            help='The OMT optimizer to use (default: auto)')
+        parser.add_argument('--logic', '-l', metavar='logic_name', type=str,
+                            choices=['auto'] + [str(l) for l in PYSMT_LOGICS],
+                            default=None,
+                            help='The logic to use for solver/optimizer selection (default: auto)')
         return parser
 
 
@@ -95,31 +105,56 @@ class PysmtShell(object):
             code.interact(welcome_msg)
 
 
-    def print_result(self, cmd, result):
+    def _print(self, val, stream_out):
+        stream_out.write(val)
+        stream_out.write("\n")
+        stream_out.flush()
+
+
+    def print_result(self, stream_out, cmd, result):
         name, _ = cmd
-        if name == CHECK_SAT:
+        if name == ECHO:
+            self._print(result, stream_out)
+        elif name == CHECK_SAT:
             if result == True:
-                print("sat")
+                self._print("sat", stream_out)
             else:
-                print("unsat")
+                self._print("unsat", stream_out)
         elif name == GET_VALUE:
-            print("(")
+            self._print("(", stream_out)
             for k, r in result.items():
-                print("  (%s %s)" % (k,r))
-            print(")")
+                self._print("  (%s %s)" % (k,r), stream_out)
+            self._print(")", stream_out)
+        elif name == GET_OBJECTIVES:
+            self._print("(objectives", stream_out)
+            for r in result:
+                self._print("  (%s %s)" % (r[0], r[1]), stream_out)
+            self._print(")", stream_out)
 
 
-    def smtlib_solver(self, stream):
+    def smtlib_solver(self, stream_in, stream_out):
         smt_parser = SmtLibParser()
-        name = self.args.solver
-        if name == "auto":
-            solver = Solver()
+        s_name = self.args.solver
+        opt_name = self.args.optimizer
+        logic = self.args.logic
+        if logic == "auto":
+            logic = None
+
+        if opt_name is not None:
+            if opt_name == "auto":
+                solver = Optimizer(logic=logic)
+            else:
+                solver = Optimizer(name=opt_name, logic=logic)
+            inter = InterpreterOMT()
         else:
-            solver = Solver(name=name)
-
-        for cmd in smt_parser.get_command_generator(stream):
-            r = evaluate_command(cmd, solver)
-            self.print_result(cmd, r)
+            if s_name == "auto":
+                solver = Solver(logic=logic)
+            else:
+                solver = Solver(name=s_name, logic=logic)
+            inter = InterpreterSMT()
+        for cmd in smt_parser.get_command_generator(stream_in):
+            r = inter.evaluate(cmd, solver)
+            self.print_result(stream_out, cmd, r)
 
 
     def main(self):
@@ -131,10 +166,12 @@ class PysmtShell(object):
                 warn("The solver option will be ignored in interactive mode")
             self.interactive()
         else:
-            input_stream = sys.stdin
-            if self.args.file is not None:
-                input_stream = open(self.args.file, "r")
-            self.smtlib_solver(input_stream)
+            if self.args.file is None:
+                self.smtlib_solver(sys.stdin, sys.stdout)
+            else:
+                with open(self.args.file, "r") as input_stream:
+                    self.smtlib_solver(input_stream, sys.stdout)
+
 
 def main_interactive():
     shell = PysmtShell(sys.argv[1:])

{PySMT-0.9.7.dev139 → PySMT-0.9.7.dev333}/pysmt/configuration.py

@@ -122,7 +122,7 @@ def write_environment_configuration(config_filename, environment):
 
     config.add_section("global")
     inf = "true" if environment.enable_infix_notation else "false"
-    pl = " ".join(factory.solver_preference_list)
+    pl = " ".join(factory.preferences['Solver'])
     config.set("global", "use_infix_notation", inf)
     config.set("global", "solver_preference_list", pl)
 

{PySMT-0.9.7.dev139 → PySMT-0.9.7.dev333}/pysmt/decorators.py

@@ -49,7 +49,7 @@ def clear_pending_pop(f):
 
     Some functions (e.g., get_value) required the state of the solver
     to stay unchanged after a call to solve. Therefore, we can leave
-    th solver in an intermediate state in which there is a formula
+    the solver in an intermediate state in which there is a formula
     asserted in the stack that is not needed (e.g., when solving under
     assumptions). In order to guarantee that methods operate on the
     correct set of formulae, all methods of the solver that rely on

{PySMT-0.9.7.dev139 → PySMT-0.9.7.dev333}/pysmt/exceptions.py

@@ -148,3 +148,48 @@ class PysmtSyntaxError(PysmtException, SyntaxError):
 
 class PysmtIOError(PysmtException, IOError):
     pass
+
+class PysmtInfinityError(PysmtException):
+    """Infinite value in expressions."""
+    pass
+
+class PysmtInfinitesimalError(PysmtException):
+    """Infinite value in expressions."""
+    pass
+
+class PysmtUnboundedOptimizationError(PysmtException):
+    """Infinite optimal value in optimization."""
+    pass
+
+class GoalNotSupportedError(PysmtException):
+    """
+    Goal not supported by the solver.
+
+    The possible modes are the optimization modes, in case a specific goal is
+    not supported by a specific mode.
+    The possible modes are:
+    - basic
+    - boxed
+    - lexicographic
+    - pareto
+    """
+    def __init__(self, solver, goal, mode=None):
+        self._solver = solver
+        self._goal = goal
+        self._mode = mode
+
+    @property
+    def solver(self):
+        return self._solver
+
+    @property
+    def goal(self):
+        return self._goal
+
+    @property
+    def mode(self):
+        return self._mode
+
+    def __str__(self):
+        mode_str = (" in mode '%s'" % self.mode) if self.mode else ""
+        return "Optimizer '%s' does not support goal '%s'%s" % tuple(map(str, (type(self.solver).__name__, self.goal, mode_str)))