PySMT 0.9.7.dev446__tar.gz → 0.9.7.dev452__tar.gz

{pysmt-0.9.7.dev446/PySMT.egg-info → pysmt-0.9.7.dev452}/PKG-INFO

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

{pysmt-0.9.7.dev446 → pysmt-0.9.7.dev452/PySMT.egg-info}/PKG-INFO

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

{pysmt-0.9.7.dev446 → pysmt-0.9.7.dev452}/pysmt/__init__.py

@@ -19,7 +19,7 @@
 from typing import Tuple, Union
 
 
-VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 446)
+VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 452)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{pysmt-0.9.7.dev446 → pysmt-0.9.7.dev452}/pysmt/solvers/portfolio.py

@@ -232,7 +232,13 @@ def _run_solver(idx, solver, logic, options, formula, signaling_queue, ctrl_pipe
     """
     from pysmt.environment import get_env
 
-    Solver = get_env().factory.Solver
+    env = get_env()
+    # The formula is pickled across the process boundary, so its FNodes
+    # belong to no FormulaManager here (this is always the case with the
+    # 'spawn'/'forkserver' start methods). Contextualize it in our own env.
+    formula = env.formula_manager.normalize(formula)
+
+    Solver = env.factory.Solver
     with Solver(name=solver, logic=logic, **options) as s:
         s.add_assertion(formula)
         try:
@@ -258,7 +264,7 @@ def _run_solver(idx, solver, logic, options, formula, signaling_queue, ctrl_pipe
                 model = list(s.get_model())
                 ctrl_pipe.send(model)
             elif cmd == "get_value":
-                args = get_env().formula_manager.normalize(args)
+                args = env.formula_manager.normalize(args)
                 ctrl_pipe.send(s.get_value(args))
             else:
                 raise ValueError("Unknown command '%s'" % cmd)

{pysmt-0.9.7.dev446 → pysmt-0.9.7.dev452}/pysmt/test/test_portfolio.py

@@ -25,11 +25,26 @@ from pysmt.solvers.portfolio import Portfolio
 from pysmt.smtlib.parser import get_formula_fname
 from pysmt.shortcuts import TRUE, Implies, Equals, Symbol, FALSE
 from pysmt.shortcuts import reset_env, is_sat
-from pysmt.typing import REAL
+from pysmt.typing import REAL, BOOL
 
 
 class PortfolioTestCase(TestCase):
 
+    @skipIfSolverNotAvailable("z3")
+    def test_basic_z3(self):
+        mgr = self.env.formula_manager
+        x = mgr.Symbol('x', BOOL)
+        y = mgr.Symbol('y', BOOL)
+        formula = mgr.And(x, y)
+        with Portfolio(["z3"],
+                       environment=self.env,
+                       logic=QF_LRA) as solver:
+            res = solver.is_sat(formula)
+            self.assertTrue(res)
+            model = solver.get_model()
+            formula_val_term = model.get_value(formula)
+            self.assertTrue(formula_val_term.is_true())
+
     @skipIfSolverNotAvailable("z3")
     @skipIfSolverNotAvailable("msat")
     @skipIfSolverNotAvailable("cvc5")