python-constraint2 2.3.1__tar.gz → 2.3.2__tar.gz

{python_constraint2-2.3.1 → python_constraint2-2.3.2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: python-constraint2
-Version: 2.3.1
+Version: 2.3.2
 Summary: python-constraint is a module for efficiently solving CSPs (Constraint Solving Problems) over finite domains.
 License: BSD-2-Clause
 Keywords: CSP,constraint solving problems,problem solver,SMT,satisfiability modulo theory,SAT
-Author: Gustavo Niemeyer
-Author-email: gustavo@niemeyer.net
+Author: Floris-Jan Willemsen
+Author-email: fjwillemsen97@gmail.com
 Maintainer: Floris-Jan Willemsen
 Maintainer-email: fjwillemsen97@gmail.com
 Requires-Python: >= 3.9
@@ -74,11 +74,11 @@ This interactive Python session demonstrates basic operations:
     >>> problem = Problem()
     >>> problem.addVariable("a", [1,2,3])
     >>> problem.addVariable("b", [4,5,6])
-    >>> problem.getSolutions()
+    >>> problem.getSolutions()  # doctest: +NORMALIZE_WHITESPACE
     [{'a': 3, 'b': 6}, {'a': 3, 'b': 5}, {'a': 3, 'b': 4},
      {'a': 2, 'b': 6}, {'a': 2, 'b': 5}, {'a': 2, 'b': 4},
      {'a': 1, 'b': 6}, {'a': 1, 'b': 5}, {'a': 1, 'b': 4}]
-
+    
     >>> problem.addConstraint("a*2 == b") # string constraints are preferable over the black-box problem.addConstraint(lambda a, b: a*2 == b, ("a", "b"))
     >>> problem.getSolutions()
     [{'a': 3, 'b': 6}, {'a': 2, 'b': 4}]
@@ -86,7 +86,7 @@ This interactive Python session demonstrates basic operations:
     >>> problem = Problem()
     >>> problem.addVariables(["a", "b"], [1, 2, 3])
     >>> problem.addConstraint(AllDifferentConstraint())
-    >>> problem.getSolutions()
+    >>> problem.getSolutions()  # doctest: +NORMALIZE_WHITESPACE
     [{'a': 3, 'b': 2}, {'a': 3, 'b': 1}, {'a': 2, 'b': 3},
      {'a': 2, 'b': 1}, {'a': 1, 'b': 2}, {'a': 1, 'b': 3}]
 
@@ -105,11 +105,9 @@ The following example solves the classical Eight Rooks problem:
     >>> for col1 in cols:
     ...     for col2 in cols:
     ...         if col1 < col2:
-    ...             problem.addConstraint(lambda row1, row2: row1 != row2,
-    ...                                   (col1, col2))
+    ...             problem.addConstraint(lambda row1, row2: row1 != row2, (col1, col2))
     >>> solutions = problem.getSolutions()
-    >>> solutions
-    >>> solutions
+    >>> solutions   # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
     [{0: 7, 1: 6, 2: 5, 3: 4, 4: 3, 5: 2, 6: 1, 7: 0},
      {0: 7, 1: 6, 2: 5, 3: 4, 4: 3, 5: 2, 6: 0, 7: 1},
      {0: 7, 1: 6, 2: 5, 3: 4, 4: 3, 5: 1, 6: 2, 7: 0},
@@ -136,12 +134,10 @@ This example solves a 4x4 magic square:
     >>> problem.addConstraint(ExactSumConstraint(34), [0, 5, 10, 15])
     >>> problem.addConstraint(ExactSumConstraint(34), [3, 6, 9, 12])
     >>> for row in range(4):
-    ...     problem.addConstraint(ExactSumConstraint(34),
-                                  [row * 4 + i for i in range(4)])
+    ...     problem.addConstraint(ExactSumConstraint(34), [row * 4 + i for i in range(4)])
     >>> for col in range(4):
-    ...     problem.addConstraint(ExactSumConstraint(34),
-                                  [col + 4 * i for i in range(4)])
-    >>> solutions = problem.getSolutions()
+    ...     problem.addConstraint(ExactSumConstraint(34), [col + 4 * i for i in range(4)])
+    >>> solutions = problem.getSolutions()  # doctest: +SKIP
 
 Features
 --------
@@ -214,6 +210,7 @@ For an overview of recent changes, visit the `Changelog <https://github.com/pyth
 
 Planned development:
 
+- Support constant modifiers on parsed (variable) constraints instead defaulting to `FunctionConstraint`, e.g. :code:`problem.addConstraint("a+2 == b")` or :code:`problem.addConstraint("x / y == 100")`
 - Rewrite hotspots in C / Pyx instead of pure python mode
 - Improvements to make the ParallelSolver competitive (experiments reveal the freethreading mode to be promising)
 - Versioned documentation

{python_constraint2-2.3.1 → python_constraint2-2.3.2}/README.rst

@@ -41,11 +41,11 @@ This interactive Python session demonstrates basic operations:
     >>> problem = Problem()
     >>> problem.addVariable("a", [1,2,3])
     >>> problem.addVariable("b", [4,5,6])
-    >>> problem.getSolutions()
+    >>> problem.getSolutions()  # doctest: +NORMALIZE_WHITESPACE
     [{'a': 3, 'b': 6}, {'a': 3, 'b': 5}, {'a': 3, 'b': 4},
      {'a': 2, 'b': 6}, {'a': 2, 'b': 5}, {'a': 2, 'b': 4},
      {'a': 1, 'b': 6}, {'a': 1, 'b': 5}, {'a': 1, 'b': 4}]
-
+    
     >>> problem.addConstraint("a*2 == b") # string constraints are preferable over the black-box problem.addConstraint(lambda a, b: a*2 == b, ("a", "b"))
     >>> problem.getSolutions()
     [{'a': 3, 'b': 6}, {'a': 2, 'b': 4}]
@@ -53,7 +53,7 @@ This interactive Python session demonstrates basic operations:
     >>> problem = Problem()
     >>> problem.addVariables(["a", "b"], [1, 2, 3])
     >>> problem.addConstraint(AllDifferentConstraint())
-    >>> problem.getSolutions()
+    >>> problem.getSolutions()  # doctest: +NORMALIZE_WHITESPACE
     [{'a': 3, 'b': 2}, {'a': 3, 'b': 1}, {'a': 2, 'b': 3},
      {'a': 2, 'b': 1}, {'a': 1, 'b': 2}, {'a': 1, 'b': 3}]
 
@@ -72,11 +72,9 @@ The following example solves the classical Eight Rooks problem:
     >>> for col1 in cols:
     ...     for col2 in cols:
     ...         if col1 < col2:
-    ...             problem.addConstraint(lambda row1, row2: row1 != row2,
-    ...                                   (col1, col2))
+    ...             problem.addConstraint(lambda row1, row2: row1 != row2, (col1, col2))
     >>> solutions = problem.getSolutions()
-    >>> solutions
-    >>> solutions
+    >>> solutions   # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
     [{0: 7, 1: 6, 2: 5, 3: 4, 4: 3, 5: 2, 6: 1, 7: 0},
      {0: 7, 1: 6, 2: 5, 3: 4, 4: 3, 5: 2, 6: 0, 7: 1},
      {0: 7, 1: 6, 2: 5, 3: 4, 4: 3, 5: 1, 6: 2, 7: 0},
@@ -103,12 +101,10 @@ This example solves a 4x4 magic square:
     >>> problem.addConstraint(ExactSumConstraint(34), [0, 5, 10, 15])
     >>> problem.addConstraint(ExactSumConstraint(34), [3, 6, 9, 12])
     >>> for row in range(4):
-    ...     problem.addConstraint(ExactSumConstraint(34),
-                                  [row * 4 + i for i in range(4)])
+    ...     problem.addConstraint(ExactSumConstraint(34), [row * 4 + i for i in range(4)])
     >>> for col in range(4):
-    ...     problem.addConstraint(ExactSumConstraint(34),
-                                  [col + 4 * i for i in range(4)])
-    >>> solutions = problem.getSolutions()
+    ...     problem.addConstraint(ExactSumConstraint(34), [col + 4 * i for i in range(4)])
+    >>> solutions = problem.getSolutions()  # doctest: +SKIP
 
 Features
 --------
@@ -181,6 +177,7 @@ For an overview of recent changes, visit the `Changelog <https://github.com/pyth
 
 Planned development:
 
+- Support constant modifiers on parsed (variable) constraints instead defaulting to `FunctionConstraint`, e.g. :code:`problem.addConstraint("a+2 == b")` or :code:`problem.addConstraint("x / y == 100")`
 - Rewrite hotspots in C / Pyx instead of pure python mode
 - Improvements to make the ParallelSolver competitive (experiments reveal the freethreading mode to be promising)
 - Versioned documentation