mathjson-solver 1.16.0__tar.gz → 1.17.0__tar.gz

{mathjson_solver-1.16.0/src/mathjson_solver.egg-info → mathjson_solver-1.17.0}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: mathjson-solver
-Version: 1.16.0
+Version: 1.17.0
 Summary: Utilities for MathJSON evaluation
 Home-page: https://github.com/LongenesisLtd/mathjson-solver
 Author: Martins Mednis
 Author-email: mrt@mednis.info
 Project-URL: Bug Tracker, https://github.com/LongenesisLtd/mathjson-solver/issues
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
@@ -33,8 +32,6 @@ A reliable Python library for numerically evaluating mathematical expressions in
 
 **What is MathJSON?** MathJSON represents mathematical expressions as JSON arrays, like `["Add", 1, 2, 3]` for 1+2+3. This format is safe, structured, and easy to generate programmatically.
 
-Inspired by [CortexJS Compute Engine](https://cortexjs.io/compute-engine/) though designed as an independent implementation focused on our specific use cases.
-
 ## Table of Contents
 - [Installation](#installation)
 - [Quick Start](#quick-start)
@@ -80,21 +77,32 @@ except MathJSONException as e:
     # Math error: Problem in Divide. ['Divide', 1, 0]. division by zero
 ```
 
+**Think Functional:** MathJSON Solver embraces functional programming principles. Instead of writing loops and modifying variables, you compose expressions that transform data. Functions like `Map`, `Reduce`, and `Filter` let you process arrays elegantly, while immutable operations ensure predictable, side-effect-free calculations. Don't worry if you're new to functional programming — the examples will guide you naturally into this powerful paradigm.
+
+```python
+# Functional approach: transform data with expressions
+solver(["Map", ["Array", 1, 2, 3, 4], ["Multiply"], 2])  # [2, 4, 6, 8]
+solver(["Reduce", ["Array", 1, 2, 3, 4], 0, ["Add", "acc", "item"],
+        ["Variable", "acc"], ["Variable", "item"], ["Variable", "i"]])  # 10
+```
+
 ## Supported Operations
 
 The library supports a comprehensive set of mathematical operations:
 
-* **Arithmetic:** Add, Sum, Subtract, Multiply, Divide, Negate, Power, Square, Root, Sqrt, Abs, Round
+* **Arithmetic:** Add, Sum, Subtract, Multiply, Divide, Negate, Power, Square, Root, Sqrt, Abs, Round, Floor, Ceil
 * **Trigonometry:** Sin, Cos, Tan, Arcsin, Arccos, Arctan
 * **Logarithms:** Log, Log2, Log10, Exp
 * **Comparison:** Equal, StrictEqual, NotEqual, Greater, GreaterEqual, Less, LessEqual
-* **Logic & Sets:** Any, All, Not, In, NotIn, ContainsAnyOf, ContainsAllOf, ContainsNoneOf
+* **Logic & Sets:** Any, All, Not, And, Or, In, NotIn, ContainsAnyOf, ContainsAllOf, ContainsNoneOf
 * **Statistics:** Average, Max, Min, Median, Length
-* **Arrays:** Array creation and manipulation with Map function
+* **Functional Programming:** Map, Reduce, Filter
+* **Arrays:** Array creation, GenerateRange, AtIndex, Slice, Appended, CumulativeSum, CumulativeProduct
 * **Control Flow:** If statements, Switch-Case, Constants definition
 * **Type Conversion:** Int, Float, Str, IsDefined
-* **Date/Time:** Strptime, Strftime, Today, Now, TimeDelta functions
-* **Advanced:** HasMatchingSublist, TrapezoidalIntegrate (requires numpy), Variable references
+* **Date/Time:** Strptime, Strftime, Today, Now, TimeDelta functions (Weeks, Days, Hours, Minutes)
+* **Integration:** TrapezoidalIntegrate (requires numpy), Interp, FindIntervalIndex, Variable references
+* **Advanced:** HasMatchingSublist for pattern matching
 * **Constants:** Pi
 
 [View complete documentation with examples →](https://github.com/LongenesisLtd/mathjson-solver/blob/main/docs/README.md)
@@ -161,6 +169,10 @@ We welcome contributions! Please feel free to:
 
 [View license information](https://github.com/LongenesisLtd/mathjson-solver/blob/main/LICENSE)
 
+## References
+
+This implementation was inspired by the [CortexJS Compute Engine](https://cortexjs.io/compute-engine/), though designed as an independent implementation focused on our specific use cases.
+
 ---
 
 Made with ❤️ by [Longenesis](https://longenesis.com/team)

{mathjson_solver-1.16.0 → mathjson_solver-1.17.0}/README.md

@@ -8,8 +8,6 @@ A reliable Python library for numerically evaluating mathematical expressions in
 
 **What is MathJSON?** MathJSON represents mathematical expressions as JSON arrays, like `["Add", 1, 2, 3]` for 1+2+3. This format is safe, structured, and easy to generate programmatically.
 
-Inspired by [CortexJS Compute Engine](https://cortexjs.io/compute-engine/) though designed as an independent implementation focused on our specific use cases.
-
 ## Table of Contents
 - [Installation](#installation)
 - [Quick Start](#quick-start)
@@ -55,21 +53,32 @@ except MathJSONException as e:
     # Math error: Problem in Divide. ['Divide', 1, 0]. division by zero
 ```
 
+**Think Functional:** MathJSON Solver embraces functional programming principles. Instead of writing loops and modifying variables, you compose expressions that transform data. Functions like `Map`, `Reduce`, and `Filter` let you process arrays elegantly, while immutable operations ensure predictable, side-effect-free calculations. Don't worry if you're new to functional programming — the examples will guide you naturally into this powerful paradigm.
+
+```python
+# Functional approach: transform data with expressions
+solver(["Map", ["Array", 1, 2, 3, 4], ["Multiply"], 2])  # [2, 4, 6, 8]
+solver(["Reduce", ["Array", 1, 2, 3, 4], 0, ["Add", "acc", "item"],
+        ["Variable", "acc"], ["Variable", "item"], ["Variable", "i"]])  # 10
+```
+
 ## Supported Operations
 
 The library supports a comprehensive set of mathematical operations:
 
-* **Arithmetic:** Add, Sum, Subtract, Multiply, Divide, Negate, Power, Square, Root, Sqrt, Abs, Round
+* **Arithmetic:** Add, Sum, Subtract, Multiply, Divide, Negate, Power, Square, Root, Sqrt, Abs, Round, Floor, Ceil
 * **Trigonometry:** Sin, Cos, Tan, Arcsin, Arccos, Arctan
 * **Logarithms:** Log, Log2, Log10, Exp
 * **Comparison:** Equal, StrictEqual, NotEqual, Greater, GreaterEqual, Less, LessEqual
-* **Logic & Sets:** Any, All, Not, In, NotIn, ContainsAnyOf, ContainsAllOf, ContainsNoneOf
+* **Logic & Sets:** Any, All, Not, And, Or, In, NotIn, ContainsAnyOf, ContainsAllOf, ContainsNoneOf
 * **Statistics:** Average, Max, Min, Median, Length
-* **Arrays:** Array creation and manipulation with Map function
+* **Functional Programming:** Map, Reduce, Filter
+* **Arrays:** Array creation, GenerateRange, AtIndex, Slice, Appended, CumulativeSum, CumulativeProduct
 * **Control Flow:** If statements, Switch-Case, Constants definition
 * **Type Conversion:** Int, Float, Str, IsDefined
-* **Date/Time:** Strptime, Strftime, Today, Now, TimeDelta functions
-* **Advanced:** HasMatchingSublist, TrapezoidalIntegrate (requires numpy), Variable references
+* **Date/Time:** Strptime, Strftime, Today, Now, TimeDelta functions (Weeks, Days, Hours, Minutes)
+* **Integration:** TrapezoidalIntegrate (requires numpy), Interp, FindIntervalIndex, Variable references
+* **Advanced:** HasMatchingSublist for pattern matching
 * **Constants:** Pi
 
 [View complete documentation with examples →](https://github.com/LongenesisLtd/mathjson-solver/blob/main/docs/README.md)
@@ -136,6 +145,10 @@ We welcome contributions! Please feel free to:
 
 [View license information](https://github.com/LongenesisLtd/mathjson-solver/blob/main/LICENSE)
 
+## References
+
+This implementation was inspired by the [CortexJS Compute Engine](https://cortexjs.io/compute-engine/), though designed as an independent implementation focused on our specific use cases.
+
 ---
 
 Made with ❤️ by [Longenesis](https://longenesis.com/team)

{mathjson_solver-1.16.0 → mathjson_solver-1.17.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mathjson-solver
-version = 1.16.0
+version = 1.17.0
 author = Martins Mednis
 author_email = mrt@mednis.info
 description = Utilities for MathJSON evaluation
@@ -11,8 +11,8 @@ project_urls =
 	Bug Tracker = https://github.com/LongenesisLtd/mathjson-solver/issues
 classifiers = 
 	Programming Language :: Python :: 3
-	License :: OSI Approved :: MIT License
 	Operating System :: OS Independent
+license_expr = MIT
 
 [options]
 package_dir = 

{mathjson_solver-1.16.0 → mathjson_solver-1.17.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="mathjson-solver",
-    version="1.16.0",
+    version="1.17.0",
     author="Martins Mednis",
     author_email="mrt@mednis.info",
     description="Utilities for MathJSON evaluation",
@@ -15,9 +15,9 @@ setuptools.setup(
     project_urls={
         "Bug Tracker": "https://github.com/LongenesisLtd/mathjson-solver/issues",
     },
+    license_expr="MIT",
     classifiers=[
         "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
     package_dir={"": "src"},

{mathjson_solver-1.16.0 → mathjson_solver-1.17.0}/src/mathjson_solver/__main__.py

@@ -4,8 +4,6 @@ from functools import reduce
 import math
 from copy import deepcopy
 from statistics import median
-import logging
-import traceback
 import datetime
 
 NUMPY_AVAILABLE = False
@@ -72,6 +70,16 @@ def _CumulativeProduct(l: list) -> list:
     return res
 
 
+def _CumulativeSum(l: list) -> list:
+    res = []
+    for i, x in enumerate(l):
+        if i == 0:
+            res.append(x)
+        else:
+            res.append(reduce(lambda a, b: a + b, l[: i + 1]))
+    return res
+
+
 def find_interpolation_bounds_indexes(
     l: list, target: int | float
 ) -> Union[Union[int, float], tuple[Union[int, float], Union[int, float]]]:
@@ -344,7 +352,6 @@ def create_mathjson_solver(solver_parameters):
                     s_ = [float(f(x, c)) for x in f(s[1], c) if is_numeric(f(x, c))]
                 else:
                     s_ = [float(f(x, c)) for x in s[1][1:] if is_numeric(f(x, c))]
-                # print(f"{s_} {sum(s_)}/{len(s_)}")
                 try:
                     return sum(s_) / len(s_)
                 except ZeroDivisionError:
@@ -377,6 +384,12 @@ def create_mathjson_solver(solver_parameters):
             def Float(s):
                 return float(f(s[1], c))
 
+            def Floor(s):
+                return math.floor(f(s[1], c))
+
+            def Ceil(s):
+                return math.ceil(f(s[1], c))
+
             def Constants(s):
                 for x in s[1:-1]:
                     c[x[0]] = f(x[1], c)
@@ -419,12 +432,9 @@ def create_mathjson_solver(solver_parameters):
                             try:
                                 return f(x[1], c)
                             except MathJSONException:
-                                logging.error(
-                                    "MathJSONException: %s", traceback.format_exc()
-                                )
+                                # Branch failed, try next condition
                                 continue
                     except MathJSONException:
-                        logging.error("MathJSONException: %s", traceback.format_exc())
                         return f(s[-1], c)  # return default value (else)
 
                 return f(s[-1], c)
@@ -635,6 +645,26 @@ def create_mathjson_solver(solver_parameters):
                 except TypeError:
                     return False
 
+            def BooleanAnd(s):
+                """
+                Boolean AND operation.
+                ["And", condition1, condition2, ...]
+                """
+                for x in s[1:]:
+                    if not f(x, c):
+                        return False
+                return True
+
+            def BooleanOr(s):
+                """
+                Boolean OR operation.
+                ["Or", condition1, condition2, ...]
+                """
+                for x in s[1:]:
+                    if f(x, c):
+                        return True
+                return False
+
             # sin, cos, tan, arcsin, arccos, arctan
             def Sin(s):
                 return math.sin(f(s[1], c))
@@ -846,6 +876,18 @@ def create_mathjson_solver(solver_parameters):
                 return ["Array"] + _CumulativeProduct(array)
                 # return _CumulativeProduct(array)
 
+            def CumulativeSum(s):
+                """
+                ["CumulativeSum", array]
+                The `array` must be an array of numeric values.
+                """
+                array = f(s[1], c)
+                if not (isinstance(array, list) and array[0] == "Array"):
+                    raise ValueError("Parameter 1 must be an array.")
+                array = [f(x, c) for x in array[1:]]
+                return ["Array"] + _CumulativeSum(array)
+                # return
+
             def Interp(s):
                 """
                 ["Interp", x_array, y_array, target_x]
@@ -902,11 +944,53 @@ def create_mathjson_solver(solver_parameters):
                     c[variable_name] = variable_value
                     values.append(f(function_expression, c))
                 h = (end - start) / n
-                # print("values=", values)
                 return h * (0.5 * values[0] + np.sum(values[1:-1]) + 0.5 * values[-1])
 
                 # return total_area
 
+            def Reduce(s):
+                """
+                ["Reduce", list, initial_value, function, str_name_of_accumulator, str_name_of_current, str_name_of_index]
+                """
+                the_list = f(s[1], c)[1:]
+                initial_value = f(s[2], c)
+                function_expression = s[3]
+
+                _accumulator = s[4]
+                name_accumulator = _accumulator[1]
+
+                _current = s[5]
+                name_current = _current[1]
+
+                _index = s[6]
+                name_index = _index[1]
+
+                c[name_accumulator] = initial_value
+
+                for i, x in enumerate(the_list):
+                    c[name_current] = x
+                    c[name_index] = i
+                    c[name_accumulator] = f(function_expression, c)
+
+                return c[name_accumulator]
+
+            def Appended(s):
+                """
+                ["Appended", array, value]
+                The `array` must be an array of values.
+                The `value` is the value to append to the array.
+                """
+                array = f(s[1], c)
+
+                if not (isinstance(array, list) and array[0] == "Array"):
+                    raise ValueError("Parameter 1 must be an array.")
+
+                value = f(s[2], c)
+
+                array = [x for x in array[1:]]
+                array.append(value)
+                return ["Array"] + array
+
             constructs = {
                 "Sum": Sum,
                 "Add": Add,
@@ -946,6 +1030,8 @@ def create_mathjson_solver(solver_parameters):
                 # "NotEqual": lambda s: f(s[1], c) != f(s[2], c),
                 "NotEqual": lambda s: comparison_safe_converter(f(s[1], c))
                 != comparison_safe_converter(f(s[2], c)),
+                "And": BooleanAnd,
+                "Or": BooleanOr,
                 "Abs": lambda s: abs(f(s[1], c)),
                 "Round": lambda s: (
                     round(f(s[1], c), f(s[2], c))
@@ -971,6 +1057,8 @@ def create_mathjson_solver(solver_parameters):
                 "ContainsNoneOf": Contains_none_of,
                 "Int": Int,
                 "Float": Float,
+                "Floor": Floor,
+                "Ceil": Ceil,
                 "Str": Str,
                 "Not": Not,
                 # "IsDefined": lambda s: s[1] in c,
@@ -999,9 +1087,12 @@ def create_mathjson_solver(solver_parameters):
                 "AtIndex": AtIndex,
                 "Slice": Slice,
                 "CumulativeProduct": CumulativeProduct,
+                "CumulativeSum": CumulativeSum,
                 "Interp": Interp,
                 "FindIntervalIndex": FindIntervalIndex,
                 "TrapezoidalIntegrate": TrapezoidalIntegrate,
+                "Reduce": Reduce,
+                "Appended": Appended,
                 "Sin": Sin,
                 "Cos": Cos,
                 "Tan": Tan,
@@ -1021,13 +1112,13 @@ def create_mathjson_solver(solver_parameters):
                 #     return s[0]
                 # except Exception as e:
                 except TypeError as e:
-                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                    raise MathJSONException(e, s, mathjson_construct=s[0]) from e
                 except ValueError as e:
-                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                    raise MathJSONException(e, s, mathjson_construct=s[0]) from e
                 except IndexError as e:
-                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                    raise MathJSONException(e, s, mathjson_construct=s[0]) from e
                 except ZeroDivisionError as e:
-                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                    raise MathJSONException(e, s, mathjson_construct=s[0]) from e
             else:
                 # raise MathJSONException(
                 #     NotImplementedError(f"'{s[0]}' is not supported"), s
@@ -1073,6 +1164,8 @@ def extract_variables(s: Union[list, int, float, str], li: set, ignore_list: set
         "Less",
         "LessEqual",
         "NotEqual",
+        "And",
+        "Or",
         "Abs",
         "Round",
         "Max",

{mathjson_solver-1.16.0 → mathjson_solver-1.17.0/src/mathjson_solver.egg-info}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: mathjson-solver
-Version: 1.16.0
+Version: 1.17.0
 Summary: Utilities for MathJSON evaluation
 Home-page: https://github.com/LongenesisLtd/mathjson-solver
 Author: Martins Mednis
 Author-email: mrt@mednis.info
 Project-URL: Bug Tracker, https://github.com/LongenesisLtd/mathjson-solver/issues
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
@@ -33,8 +32,6 @@ A reliable Python library for numerically evaluating mathematical expressions in
 
 **What is MathJSON?** MathJSON represents mathematical expressions as JSON arrays, like `["Add", 1, 2, 3]` for 1+2+3. This format is safe, structured, and easy to generate programmatically.
 
-Inspired by [CortexJS Compute Engine](https://cortexjs.io/compute-engine/) though designed as an independent implementation focused on our specific use cases.
-
 ## Table of Contents
 - [Installation](#installation)
 - [Quick Start](#quick-start)
@@ -80,21 +77,32 @@ except MathJSONException as e:
     # Math error: Problem in Divide. ['Divide', 1, 0]. division by zero
 ```
 
+**Think Functional:** MathJSON Solver embraces functional programming principles. Instead of writing loops and modifying variables, you compose expressions that transform data. Functions like `Map`, `Reduce`, and `Filter` let you process arrays elegantly, while immutable operations ensure predictable, side-effect-free calculations. Don't worry if you're new to functional programming — the examples will guide you naturally into this powerful paradigm.
+
+```python
+# Functional approach: transform data with expressions
+solver(["Map", ["Array", 1, 2, 3, 4], ["Multiply"], 2])  # [2, 4, 6, 8]
+solver(["Reduce", ["Array", 1, 2, 3, 4], 0, ["Add", "acc", "item"],
+        ["Variable", "acc"], ["Variable", "item"], ["Variable", "i"]])  # 10
+```
+
 ## Supported Operations
 
 The library supports a comprehensive set of mathematical operations:
 
-* **Arithmetic:** Add, Sum, Subtract, Multiply, Divide, Negate, Power, Square, Root, Sqrt, Abs, Round
+* **Arithmetic:** Add, Sum, Subtract, Multiply, Divide, Negate, Power, Square, Root, Sqrt, Abs, Round, Floor, Ceil
 * **Trigonometry:** Sin, Cos, Tan, Arcsin, Arccos, Arctan
 * **Logarithms:** Log, Log2, Log10, Exp
 * **Comparison:** Equal, StrictEqual, NotEqual, Greater, GreaterEqual, Less, LessEqual
-* **Logic & Sets:** Any, All, Not, In, NotIn, ContainsAnyOf, ContainsAllOf, ContainsNoneOf
+* **Logic & Sets:** Any, All, Not, And, Or, In, NotIn, ContainsAnyOf, ContainsAllOf, ContainsNoneOf
 * **Statistics:** Average, Max, Min, Median, Length
-* **Arrays:** Array creation and manipulation with Map function
+* **Functional Programming:** Map, Reduce, Filter
+* **Arrays:** Array creation, GenerateRange, AtIndex, Slice, Appended, CumulativeSum, CumulativeProduct
 * **Control Flow:** If statements, Switch-Case, Constants definition
 * **Type Conversion:** Int, Float, Str, IsDefined
-* **Date/Time:** Strptime, Strftime, Today, Now, TimeDelta functions
-* **Advanced:** HasMatchingSublist, TrapezoidalIntegrate (requires numpy), Variable references
+* **Date/Time:** Strptime, Strftime, Today, Now, TimeDelta functions (Weeks, Days, Hours, Minutes)
+* **Integration:** TrapezoidalIntegrate (requires numpy), Interp, FindIntervalIndex, Variable references
+* **Advanced:** HasMatchingSublist for pattern matching
 * **Constants:** Pi
 
 [View complete documentation with examples →](https://github.com/LongenesisLtd/mathjson-solver/blob/main/docs/README.md)
@@ -161,6 +169,10 @@ We welcome contributions! Please feel free to:
 
 [View license information](https://github.com/LongenesisLtd/mathjson-solver/blob/main/LICENSE)
 
+## References
+
+This implementation was inspired by the [CortexJS Compute Engine](https://cortexjs.io/compute-engine/), though designed as an independent implementation focused on our specific use cases.
+
 ---
 
 Made with ❤️ by [Longenesis](https://longenesis.com/team)

{mathjson_solver-1.16.0 → mathjson_solver-1.17.0}/src/mathjson_solver.egg-info/SOURCES.txt

@@ -9,18 +9,24 @@ src/mathjson_solver.egg-info/PKG-INFO
 src/mathjson_solver.egg-info/SOURCES.txt
 src/mathjson_solver.egg-info/dependency_links.txt
 src/mathjson_solver.egg-info/top_level.txt
-tests/test_CumulativeProduct.py
-tests/test_Slice.py
 tests/test_TrapezoidalIntegratel.py
 tests/test_atindex.py
+tests/test_cumulative.py
 tests/test_equal.py
 tests/test_exceptions.py
 tests/test_extract_variables.py
 tests/test_findinterval.py
 tests/test_gail_model.py
+tests/test_gail_model_nci_validated_no_beta.py
+tests/test_gail_model_nci_validated_with_beta.py
 tests/test_interpolate.py
+tests/test_nci_discrete_implementation_no_beta.py
+tests/test_nci_discrete_implementation_with_beta.py
 tests/test_range.py
+tests/test_reduce_simple.py
 tests/test_scalars.py
 tests/test_sets.py
 tests/test_simple_cases.py
+tests/test_slice.py
+tests/test_state_tuples_reduce.py
 tests/test_with_pytest.py

mathjson_solver-1.16.0/tests/test_CumulativeProduct.py → mathjson_solver-1.17.0/tests/test_cumulative.py

@@ -16,3 +16,14 @@ def test_CumulativeProduct1():
     solver = create_solver(parameters)
     # assert solver(expression) == expected_result
     assert solver(expression) == expected_result
+
+
+def test_CumulativeSum1():
+    parameters = {"test_array": ["Array", 1, 2, 3, 4, 5]}
+
+    expression = ["CumulativeSum", "test_array"]
+
+    expected_result = ["Array", 1, 3, 6, 10, 15]
+    solver = create_solver(parameters)
+    # assert solver(expression) == expected_result
+    assert solver(expression) == expected_result

{mathjson_solver-1.16.0 → mathjson_solver-1.17.0}/tests/test_equal.py

@@ -43,6 +43,11 @@ from mathjson_solver import create_solver
         ({}, ["NotEqual", 1, 2], True),
         ({}, ["NotEqual", "aaa", "bbb"], True),
         ({}, ["NotEqual", "aaa", 0], True),
+        ({}, ["And", True, True], True),
+        ({}, ["And", True, False], False),
+        ({}, ["Or", True, False], True),
+        ({}, ["Or", True, True], True),
+        ({}, ["Or", False, False], False),
     ],
 )
 def test_solver_comparison(parameters, expression, expected_result):