mathjson-solver 1.9.1__tar.gz → 1.11.0__tar.gz

{mathjson_solver-1.9.1/src/mathjson_solver.egg-info → mathjson_solver-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: mathjson-solver
-Version: 1.9.1
+Version: 1.11.0
 Summary: Utilities for MathJSON evaluation
 Home-page: https://github.com/LongenesisLtd/mathjson-solver
 Author: Martins Mednis
@@ -12,6 +12,15 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: project-url
+Dynamic: requires-python
+Dynamic: summary
 
 # MathJSON Solver
 
@@ -21,14 +30,6 @@ _MathJSON Solver_ is a Python module to numerically evaluate MathJSON expression
 
 Please ask questions and share feedback in our Gitter chat [https://gitter.im/mathjson-solver/community](https://gitter.im/mathjson-solver/community).
 
-## What's new
-
-### 1.4.2
-Added `Str` construct. It tries to convert value to string.
-
-### 1.4.0
-We changed the behavior of `Average` to be more forgiving. In version 1.4.0 `Average` accepts arrays like `[2, 4 ,"6"]` and internally converts numeric strings to floats.
-Also, it skips values that cannot be converted to numeric. Internally `Average` will convert array `[2, "three", 4 ,"6"]` to `[2.0, 4.0 ,6.0]`. When given an empty array, `Average` now returns `None` instead of throwing an error.
 
 ## How to use
 ```python
@@ -44,75 +45,64 @@ print(answer)
 # 9, because 2+3+4=9
 ```
 
-## How to run tests
-Make sure you have `pytest` installed. Then `cd` into project directory and run:
-```bash
-pytest
-```
-
-## Contributing Code
-
-We welcome your contributions in the form of pull requests.
-
-1. Fork the repo;
-2. Make improvements;
-3. Make a pull request to share your improvements with the community and to include it into official release.
-
-
 ## Currently supported constructs
-### Math
-* `Sum` (alias `Add`)
-* `Subtract`
-* `Multiply`
-* `Divide`
-* `Negate`
-* `Power`
-* `Root`
-* `Sqrt`
-* `Square`
-* `Exp`
-* `Log`
-* `Log2`
-* `Log10`
-
-
-### Aggregation
-* `Array`
-* `Max`
-* `Min`
-* `Average`
-* `Median`
-* `Len`
-* `All`
-* `Any`
-
-
-### Conditions
-* `If`
-* `Switch`
-* `Equal`
-* `Greater`
-* `GreaterEqual`
-* `Less`
-* `LessEqual`
-* `NotEqual`
-
-### Membership operators
-* `In`
-* `NotIn`
-* `ContainsAnyOf`
-* `ContainsAllOf`
-* `ContainsNoneOf`
-
-### Typecasting
-* `Str`
-* `Int`
-* `Float`
-* `Not`
-
-### Additional constructs
-* `Constants`
-
+* `Add` - Iteratively adds up the given values. Compatible with time delta.
+* `Sum` - Internally uses python's `sum`. Not compatible with time delta.
+* `Subtract` -
+* `Constants` -
+* `Switch` -
+* `If` -
+* `Multiply` -
+* `Divide` -
+* `Negate` -
+* `Power` -
+* `Root` -
+* `Sqrt` -
+* `Square` -
+* `Exp` -
+* `Log` -
+* `Log2` -
+* `Log10` -
+* `Equal` -
+* `Greater` -
+* `GreaterEqual` -
+* `Less` -
+* `LessEqual` -
+* `NotEqual` -
+* `Abs` -
+* `Round` -
+* `Max` -
+* `Min` -
+* `Average` - Internally tries to convert strings to numbers, making calculation of average from `[2, 4 ,"6"]` actually possible. Also, it ignores un-convertible elements so arrays like `[2, "three", 4 ,"6"]` don't crash the solver.
+* `Median` -
+* `Length` -
+* `Any` -
+* `All` -
+* `Array` -
+* `In` -
+* `Not_in` -
+* `Contains_any_of` -
+* `Contains_all_of` -
+* `Contains_none_of` -
+* `NotIn` -
+* `ContainsAnyOf` -
+* `ContainsAllOf` -
+* `ContainsNoneOf` -
+* `Int` -
+* `Float` -
+* `Str` -
+* `Not` -
+* `IsDefined` - Checks if a value is in parameters.
+* `Map` -
+* `HasMatchingSublist` -
+* `Strptime` -
+* `Strftime` -
+* `Today` -
+* `Now` -
+* `TimeDeltaWeeks` -
+* `TimeDeltaHours` -
+* `TimeDeltaMinutes` -
+* `TimeDeltaDays` -
 
 ## Examples
 ```python
@@ -133,7 +123,7 @@ We welcome your contributions in the form of pull requests.
 ["Log2", 8]                       # log2(8)=3.0
 ["Log10", 1000]                   # log10(1000)=3.0
 ["Equal", 10, 10]                 # 10==10 = True
-["Equal", 10, 12]                 # 10==10 = False
+["Equal", 10, 12]                 # 10==12 = False
 ["Abs", -3.5]                     # |-3.5| = 3.5
 ["Round", -5.123456, 2]           # -5.12
 ["Round", -5.123456, 0]           # -5.0
@@ -236,7 +226,7 @@ elif 2 == 2 then 20
 else 9000
 ```
 
-`If` expression do not need to be strictly _boolean_. Any value that is not _false_ are considered _true_.
+`If` expressions do not need to be strictly _boolean_. Any value that is not _false_ are considered _true_.
 
 ### Switch-Case statement
 ```
@@ -267,3 +257,18 @@ except MathJSONException:
 ```
 
 Left unhandled, the exception will look like `MathJSONException("Problem in Divide. ['Divide', 1, 0]. division by zero")`.
+
+
+## How to run tests
+Make sure you have `pytest` installed. Then `cd` into project directory and run:
+```bash
+pytest
+```
+
+## Contributing Code
+
+We welcome your contributions in the form of pull requests.
+
+1. Fork the repo;
+2. Make improvements;
+3. Make a pull request to share your improvements with the community and to include it into official release.

{mathjson_solver-1.9.1 → mathjson_solver-1.11.0}/README.md

@@ -6,14 +6,6 @@ _MathJSON Solver_ is a Python module to numerically evaluate MathJSON expression
 
 Please ask questions and share feedback in our Gitter chat [https://gitter.im/mathjson-solver/community](https://gitter.im/mathjson-solver/community).
 
-## What's new
-
-### 1.4.2
-Added `Str` construct. It tries to convert value to string.
-
-### 1.4.0
-We changed the behavior of `Average` to be more forgiving. In version 1.4.0 `Average` accepts arrays like `[2, 4 ,"6"]` and internally converts numeric strings to floats.
-Also, it skips values that cannot be converted to numeric. Internally `Average` will convert array `[2, "three", 4 ,"6"]` to `[2.0, 4.0 ,6.0]`. When given an empty array, `Average` now returns `None` instead of throwing an error.
 
 ## How to use
 ```python
@@ -29,75 +21,64 @@ print(answer)
 # 9, because 2+3+4=9
 ```
 
-## How to run tests
-Make sure you have `pytest` installed. Then `cd` into project directory and run:
-```bash
-pytest
-```
-
-## Contributing Code
-
-We welcome your contributions in the form of pull requests.
-
-1. Fork the repo;
-2. Make improvements;
-3. Make a pull request to share your improvements with the community and to include it into official release.
-
-
 ## Currently supported constructs
-### Math
-* `Sum` (alias `Add`)
-* `Subtract`
-* `Multiply`
-* `Divide`
-* `Negate`
-* `Power`
-* `Root`
-* `Sqrt`
-* `Square`
-* `Exp`
-* `Log`
-* `Log2`
-* `Log10`
-
-
-### Aggregation
-* `Array`
-* `Max`
-* `Min`
-* `Average`
-* `Median`
-* `Len`
-* `All`
-* `Any`
-
-
-### Conditions
-* `If`
-* `Switch`
-* `Equal`
-* `Greater`
-* `GreaterEqual`
-* `Less`
-* `LessEqual`
-* `NotEqual`
-
-### Membership operators
-* `In`
-* `NotIn`
-* `ContainsAnyOf`
-* `ContainsAllOf`
-* `ContainsNoneOf`
-
-### Typecasting
-* `Str`
-* `Int`
-* `Float`
-* `Not`
-
-### Additional constructs
-* `Constants`
-
+* `Add` - Iteratively adds up the given values. Compatible with time delta.
+* `Sum` - Internally uses python's `sum`. Not compatible with time delta.
+* `Subtract` -
+* `Constants` -
+* `Switch` -
+* `If` -
+* `Multiply` -
+* `Divide` -
+* `Negate` -
+* `Power` -
+* `Root` -
+* `Sqrt` -
+* `Square` -
+* `Exp` -
+* `Log` -
+* `Log2` -
+* `Log10` -
+* `Equal` -
+* `Greater` -
+* `GreaterEqual` -
+* `Less` -
+* `LessEqual` -
+* `NotEqual` -
+* `Abs` -
+* `Round` -
+* `Max` -
+* `Min` -
+* `Average` - Internally tries to convert strings to numbers, making calculation of average from `[2, 4 ,"6"]` actually possible. Also, it ignores un-convertible elements so arrays like `[2, "three", 4 ,"6"]` don't crash the solver.
+* `Median` -
+* `Length` -
+* `Any` -
+* `All` -
+* `Array` -
+* `In` -
+* `Not_in` -
+* `Contains_any_of` -
+* `Contains_all_of` -
+* `Contains_none_of` -
+* `NotIn` -
+* `ContainsAnyOf` -
+* `ContainsAllOf` -
+* `ContainsNoneOf` -
+* `Int` -
+* `Float` -
+* `Str` -
+* `Not` -
+* `IsDefined` - Checks if a value is in parameters.
+* `Map` -
+* `HasMatchingSublist` -
+* `Strptime` -
+* `Strftime` -
+* `Today` -
+* `Now` -
+* `TimeDeltaWeeks` -
+* `TimeDeltaHours` -
+* `TimeDeltaMinutes` -
+* `TimeDeltaDays` -
 
 ## Examples
 ```python
@@ -118,7 +99,7 @@ We welcome your contributions in the form of pull requests.
 ["Log2", 8]                       # log2(8)=3.0
 ["Log10", 1000]                   # log10(1000)=3.0
 ["Equal", 10, 10]                 # 10==10 = True
-["Equal", 10, 12]                 # 10==10 = False
+["Equal", 10, 12]                 # 10==12 = False
 ["Abs", -3.5]                     # |-3.5| = 3.5
 ["Round", -5.123456, 2]           # -5.12
 ["Round", -5.123456, 0]           # -5.0
@@ -221,7 +202,7 @@ elif 2 == 2 then 20
 else 9000
 ```
 
-`If` expression do not need to be strictly _boolean_. Any value that is not _false_ are considered _true_.
+`If` expressions do not need to be strictly _boolean_. Any value that is not _false_ are considered _true_.
 
 ### Switch-Case statement
 ```
@@ -252,3 +233,18 @@ except MathJSONException:
 ```
 
 Left unhandled, the exception will look like `MathJSONException("Problem in Divide. ['Divide', 1, 0]. division by zero")`.
+
+
+## How to run tests
+Make sure you have `pytest` installed. Then `cd` into project directory and run:
+```bash
+pytest
+```
+
+## Contributing Code
+
+We welcome your contributions in the form of pull requests.
+
+1. Fork the repo;
+2. Make improvements;
+3. Make a pull request to share your improvements with the community and to include it into official release.

{mathjson_solver-1.9.1 → mathjson_solver-1.11.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mathjson-solver
-version = 1.9.1
+version = 1.11.0
 author = Martins Mednis
 author_email = mrt@mednis.info
 description = Utilities for MathJSON evaluation

{mathjson_solver-1.9.1 → mathjson_solver-1.11.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="mathjson-solver",
-    version="1.9.1",
+    version="1.11.0",
     author="Martins Mednis",
     author_email="mrt@mednis.info",
     description="Utilities for MathJSON evaluation",

{mathjson_solver-1.9.1 → mathjson_solver-1.11.0}/src/mathjson_solver/__main__.py

@@ -6,6 +6,7 @@ from copy import deepcopy
 from statistics import median
 import logging
 import traceback
+import datetime
 
 
 class MathJSONException(Exception):
@@ -141,6 +142,31 @@ def create_mathjson_solver(solver_parameters):
             def Arr(s):
                 return s
 
+            def Add(s):
+                l_res = []
+                tmp = 0
+                for i, x in enumerate(s[1:]):
+                    res = f(x, c)
+                    if i == 0:
+                        tmp = res
+                    else:
+                        tmp = tmp + res
+
+                    # if isinstance(res, list):
+                    #     l_res.append(sum([xx for xx in res[1:]]))
+                    # else:
+                    #     l_res.append(res)
+
+                return tmp
+
+                # tmp = 0
+                # for i, x in enumerate(l):
+                #     if i == 0:
+                #         tmp = x
+                #     else:
+                #         tmp = tmp + x
+                # return tmp
+
             def Sum(s):
                 l_res = []
                 for x in s[1:]:
@@ -343,9 +369,37 @@ def create_mathjson_solver(solver_parameters):
                     conditions=conditions,
                 )
 
+            def Strptime(s):
+                datetime_str = f(s[1], c)
+                parameters = f(s[2], c)
+                return datetime.datetime.strptime(datetime_str, parameters)
+
+            def Strftime(s):
+                dt = f(s[1], c)
+                parameters = f(s[2], c)
+                return dt.strftime(parameters)
+
+            def Now(s):
+                return datetime.datetime.now()
+
+            def Today(s):
+                return datetime.date.today()
+
+            def TimeDeltaDays(s):
+                return datetime.timedelta(days=f(s[1], c))
+
+            def TimeDeltaMinutes(s):
+                return datetime.timedelta(minutes=f(s[1], c))
+
+            def TimeDeltaHours(s):
+                return datetime.timedelta(hours=f(s[1], c))
+
+            def TimeDeltaWeeks(s):
+                return datetime.timedelta(weeks=f(s[1], c))
+
             constructs = {
                 "Sum": Sum,
-                "Add": Sum,
+                "Add": Add,
                 "Subtract": lambda s: reduce(
                     lambda a, b: a - b, [f(x, c) for x in s[1:]]
                 ),
@@ -401,11 +455,29 @@ def create_mathjson_solver(solver_parameters):
                 "IsDefined": lambda s: s[1] in c,
                 "Map": Map,
                 "HasMatchingSublist": HasMatchingSublist,
+                "Strptime": Strptime,
+                "Strftime": Strftime,
+                "Today": Today,
+                "Now": Now,
+                "TimeDeltaWeeks": TimeDeltaWeeks,
+                "TimeDeltaHours": TimeDeltaHours,
+                "TimeDeltaMinutes": TimeDeltaMinutes,
+                "TimeDeltaDays": TimeDeltaDays,
             }
             if s[0] in constructs:
                 try:
                     return constructs[s[0]](s)
-                except Exception as e:
+
+                # except RecursionError:
+                #     return s[0]
+                # except Exception as e:
+                except TypeError as e:
+                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                except ValueError as e:
+                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                except IndexError as e:
+                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                except ZeroDivisionError as e:
                     raise MathJSONException(e, s, mathjson_construct=s[0])
             else:
                 # raise MathJSONException(
@@ -413,7 +485,10 @@ def create_mathjson_solver(solver_parameters):
                 # )
                 return s
         elif s in solver_parameters:
-            return f(solver_parameters[s], c)
+            try:
+                return f(solver_parameters[s], c)
+            except RecursionError:
+                return solver_parameters[s]
         elif s in c:
             return f(c[s], c)
         else:
@@ -474,6 +549,14 @@ def extract_variables(s: Union[list, int, float, str], li: set, ignore_list: set
         "IsDefined",
         "Map",
         "HasMatchingSublist",
+        "Strptime",
+        "Strftime",
+        "Today",
+        "Now",
+        "TimeDeltaWeeks",
+        "TimeDeltaHours",
+        "TimeDeltaMinutes",
+        "TimeDeltaDays",
     ]
     if isinstance(s, str):
         if s in ignore_list:

{mathjson_solver-1.9.1 → mathjson_solver-1.11.0/src/mathjson_solver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: mathjson-solver
-Version: 1.9.1
+Version: 1.11.0
 Summary: Utilities for MathJSON evaluation
 Home-page: https://github.com/LongenesisLtd/mathjson-solver
 Author: Martins Mednis
@@ -12,6 +12,15 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: project-url
+Dynamic: requires-python
+Dynamic: summary
 
 # MathJSON Solver
 
@@ -21,14 +30,6 @@ _MathJSON Solver_ is a Python module to numerically evaluate MathJSON expression
 
 Please ask questions and share feedback in our Gitter chat [https://gitter.im/mathjson-solver/community](https://gitter.im/mathjson-solver/community).
 
-## What's new
-
-### 1.4.2
-Added `Str` construct. It tries to convert value to string.
-
-### 1.4.0
-We changed the behavior of `Average` to be more forgiving. In version 1.4.0 `Average` accepts arrays like `[2, 4 ,"6"]` and internally converts numeric strings to floats.
-Also, it skips values that cannot be converted to numeric. Internally `Average` will convert array `[2, "three", 4 ,"6"]` to `[2.0, 4.0 ,6.0]`. When given an empty array, `Average` now returns `None` instead of throwing an error.
 
 ## How to use
 ```python
@@ -44,75 +45,64 @@ print(answer)
 # 9, because 2+3+4=9
 ```
 
-## How to run tests
-Make sure you have `pytest` installed. Then `cd` into project directory and run:
-```bash
-pytest
-```
-
-## Contributing Code
-
-We welcome your contributions in the form of pull requests.
-
-1. Fork the repo;
-2. Make improvements;
-3. Make a pull request to share your improvements with the community and to include it into official release.
-
-
 ## Currently supported constructs
-### Math
-* `Sum` (alias `Add`)
-* `Subtract`
-* `Multiply`
-* `Divide`
-* `Negate`
-* `Power`
-* `Root`
-* `Sqrt`
-* `Square`
-* `Exp`
-* `Log`
-* `Log2`
-* `Log10`
-
-
-### Aggregation
-* `Array`
-* `Max`
-* `Min`
-* `Average`
-* `Median`
-* `Len`
-* `All`
-* `Any`
-
-
-### Conditions
-* `If`
-* `Switch`
-* `Equal`
-* `Greater`
-* `GreaterEqual`
-* `Less`
-* `LessEqual`
-* `NotEqual`
-
-### Membership operators
-* `In`
-* `NotIn`
-* `ContainsAnyOf`
-* `ContainsAllOf`
-* `ContainsNoneOf`
-
-### Typecasting
-* `Str`
-* `Int`
-* `Float`
-* `Not`
-
-### Additional constructs
-* `Constants`
-
+* `Add` - Iteratively adds up the given values. Compatible with time delta.
+* `Sum` - Internally uses python's `sum`. Not compatible with time delta.
+* `Subtract` -
+* `Constants` -
+* `Switch` -
+* `If` -
+* `Multiply` -
+* `Divide` -
+* `Negate` -
+* `Power` -
+* `Root` -
+* `Sqrt` -
+* `Square` -
+* `Exp` -
+* `Log` -
+* `Log2` -
+* `Log10` -
+* `Equal` -
+* `Greater` -
+* `GreaterEqual` -
+* `Less` -
+* `LessEqual` -
+* `NotEqual` -
+* `Abs` -
+* `Round` -
+* `Max` -
+* `Min` -
+* `Average` - Internally tries to convert strings to numbers, making calculation of average from `[2, 4 ,"6"]` actually possible. Also, it ignores un-convertible elements so arrays like `[2, "three", 4 ,"6"]` don't crash the solver.
+* `Median` -
+* `Length` -
+* `Any` -
+* `All` -
+* `Array` -
+* `In` -
+* `Not_in` -
+* `Contains_any_of` -
+* `Contains_all_of` -
+* `Contains_none_of` -
+* `NotIn` -
+* `ContainsAnyOf` -
+* `ContainsAllOf` -
+* `ContainsNoneOf` -
+* `Int` -
+* `Float` -
+* `Str` -
+* `Not` -
+* `IsDefined` - Checks if a value is in parameters.
+* `Map` -
+* `HasMatchingSublist` -
+* `Strptime` -
+* `Strftime` -
+* `Today` -
+* `Now` -
+* `TimeDeltaWeeks` -
+* `TimeDeltaHours` -
+* `TimeDeltaMinutes` -
+* `TimeDeltaDays` -
 
 ## Examples
 ```python
@@ -133,7 +123,7 @@ We welcome your contributions in the form of pull requests.
 ["Log2", 8]                       # log2(8)=3.0
 ["Log10", 1000]                   # log10(1000)=3.0
 ["Equal", 10, 10]                 # 10==10 = True
-["Equal", 10, 12]                 # 10==10 = False
+["Equal", 10, 12]                 # 10==12 = False
 ["Abs", -3.5]                     # |-3.5| = 3.5
 ["Round", -5.123456, 2]           # -5.12
 ["Round", -5.123456, 0]           # -5.0
@@ -236,7 +226,7 @@ elif 2 == 2 then 20
 else 9000
 ```
 
-`If` expression do not need to be strictly _boolean_. Any value that is not _false_ are considered _true_.
+`If` expressions do not need to be strictly _boolean_. Any value that is not _false_ are considered _true_.
 
 ### Switch-Case statement
 ```
@@ -267,3 +257,18 @@ except MathJSONException:
 ```
 
 Left unhandled, the exception will look like `MathJSONException("Problem in Divide. ['Divide', 1, 0]. division by zero")`.
+
+
+## How to run tests
+Make sure you have `pytest` installed. Then `cd` into project directory and run:
+```bash
+pytest
+```
+
+## Contributing Code
+
+We welcome your contributions in the form of pull requests.
+
+1. Fork the repo;
+2. Make improvements;
+3. Make a pull request to share your improvements with the community and to include it into official release.

{mathjson_solver-1.9.1 → mathjson_solver-1.11.0}/tests/test_with_pytest.py

@@ -45,6 +45,60 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
         ({}, ["Constants", ["a", 1], ["b", 2], ["c", 100], ["Sum", "a", "b"]], 3),
         ({}, ["Constants", ["a", 1], ["b", ["Add", 2, "a"]], "b"], 3),
         ({"x": 1}, ["Add", 2, "x"], 3),
+        ({"value": 1}, ["Switch", "value", 0, [1, 11], [2, 22]], 11),
+        ({"value": 3}, ["Switch", "value", 0, [1, 11], [2, 22]], 0),
+        (
+            {"[uzwuoy][-1][14]": 1},
+            ["Switch", "[uzwuoy][-1][14]", 0, [1, 11], [2, 22]],
+            11,
+        ),
+        ({"14": 1}, ["Switch", "14", 0, [1, 11], [2, 22]], 11),
+        ({"14": "1"}, ["Switch", "14", 0, ["0", 0], ["1", 1], ["2", 2]], 1),
+        ({"29": "1"}, ["Switch", "29", 0, ["0", 0], ["1", 1], ["2", 2]], 1),
+        ({"29": "2"}, ["Switch", "29", 0, ["0", 0], ["1", 1], ["2", 2]], 2),
+        ({"a": "a"}, ["Switch", "a", 0, ["0", 0], ["1", 1], ["2", 2]], 0),
+        (
+            {"14": "1", "29": "1"},
+            [
+                "Add",
+                ["Switch", "14", 0, ["0", 0], ["1", 1], ["2", 2]],
+                ["Switch", "29", 0, ["0", 0], ["1", 1], ["2", 2]],
+            ],
+            2,
+        ),
+        ({}, ["Switch", "14", 6, ["0", 0], ["1", 1], ["2", 2]], 6),
+        ({}, ["Switch", "1", 6, ["0", 0], ["1", 1], ["2", 2]], 1),  # BKUS
+        (
+            {"1": "2"},
+            ["Switch", "1", 6, ["0", 0], ["1", 1], ["2", 2]],
+            1,
+        ),  # Because all "1"s become "2"
+        (
+            {"1": "3"},
+            ["Switch", "1", 6, ["0", 0], ["1", 1], ["2", 2]],
+            1,
+        ),  # Because string "1" is equal string "1"
+        # The following test works.
+        # It is commented out because otherwise black auto-formatter would expand it to 100+ lines
+        # (
+        #     {"14": "1", "29": "1", "30": "1", "31": "1", "32": "1", "33": "1", "35": "1", "45": "1", "50": "1", "52": "1", "71": "1", "91": "1", "112": "1"},
+        #     ["Add",
+        #       ["Switch","14",0,["0",0],["1",1],["2",2]],
+        #       ["Switch","29",0,["0",0],["1",1],["2",2]],
+        #       ["Switch","30",0,["0",0],["1",1],["2",2]],
+        #       ["Switch","31",0,["0",0],["1",1],["2",2]],
+        #       ["Switch","32",0,["0",0],["1",1],["2",2]],
+        #       ["Switch","33",0,["0",0],["1",1],["2",2]],
+        #       ["Switch","35",0,["0",0],["1",1],["2",2]],
+        #       ["Switch","45",0,["0",0],["1",1],["2",2]],
+        #       ["Switch","50",0,["0",0],["1",1],["2",2]],
+        #       ["Switch","52",0,["0",0],["1",1],["2",2]],
+        #       ["Switch","71",0,["0",0],["1",1],["2",2]],
+        #       ["Switch","91",0,["0",0],["1",1],["2",2]],
+        #       ["Switch","112",0,["0",0],["1",1],["2",2]]
+        #     ],
+        #     13
+        # ),
         ({"color": "red"}, ["Switch", "color", 0, ["blue", 10], ["red", 30]], 30),
         ({"color": "green"}, ["Switch", "color", 0, ["blue", 10], ["red", 30]], 0),
         ({"color": "green"}, ["Switch", "undefined", 0, ["blue", 10], ["red", 30]], 0),
@@ -52,6 +106,7 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
         ({"a": 10, "b": 10}, ["If", [["Equal", "a", "b"], 10], 9000], 10),
         ({"a": 10, "b": 20}, ["If", [["Equal", "a", "b"], 10], 9000], 9000),
         ({"a": 10}, ["If", [["Equal", "a", "b"], 10], 9000], 9000),
+        # The following test checks if Sum failure (1+"b") is handled correctly in If.
         ({"a": 10}, ["If", [["Equal", "a", ["Sum", 1, "b"]], 10], 9000], 9000),
         ({}, ["Array", 1, 2, 3, 5, 2], ["Array", 1, 2, 3, 5, 2]),
         ({}, ["Max", ["Array", 1, 2, 3, 5, 2]], 5),
@@ -93,6 +148,9 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
         ({}, ["Length", ["Array", 1, 2, 3, 5, 2, 9]], 6),
         ({"a": ["Array", 1, 2, 3, 5, 2, 9]}, ["Length", "a"], 6),
         ({}, ["Length", ["Array"]], 0),
+        # Next test illustrates an invalid formula, where 'Length' receives an invalid array.
+        ({}, ["Length", ["Greater", ["Array", 3, 5, 6, 4, 8, 1, 0, 1], 5]], 2),
+        ({}, ["Sum", ["Array", True, False, True, False, False]], 2),
         ({}, ["Int", "12"], 12),
         ({}, ["Int", "12.2"], 12),
         ({}, ["Float", "12.2"], 12.2),
@@ -180,6 +238,12 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
             ["Map", ["Array", 1, 2, 3], ["GreaterEqual"], 2],
             ["Array", False, True, True],
         ),
+        (
+            {},
+            ["Sum", ["Map", ["Array", 1, 2, 3, 4, 1, 1, 0, 1], ["GreaterEqual"], 2]],
+            3,
+        ),
+        ({}, ["Sum", ["Array", True, False, True, False, False]], 2),
         # ["HasMatchingSublist", list, required_match_count, position, contiguous, function, more parameters]
         (
             {},
@@ -259,6 +323,78 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
             ],
             False,
         ),
+        (
+            {},
+            ["Strftime", ["Strptime", "2025-01-10T10:05", "%Y-%m-%dT%H:%M"], "%Y"],
+            "2025",
+        ),
+        ({}, ["Strftime", ["Today"], "%Y"], "2025"),
+        ({}, ["Strftime", ["Now"], "%Y"], "2025"),
+        (
+            {},
+            [
+                "Strftime",
+                [
+                    "Add",
+                    ["Strptime", "2025-01-10T10:05", "%Y-%m-%dT%H:%M"],
+                    ["TimeDeltaDays", 3],
+                ],
+                "%d",
+            ],
+            "13",
+        ),
+        (
+            {},
+            [
+                "Strftime",
+                [
+                    "Subtract",
+                    ["Strptime", "2025-01-10T10:05", "%Y-%m-%dT%H:%M"],
+                    ["TimeDeltaDays", 3],
+                ],
+                "%d",
+            ],
+            "07",
+        ),
+        (
+            {},
+            [
+                "Strftime",
+                [
+                    "Add",
+                    ["Strptime", "2025-01-10T10:05", "%Y-%m-%dT%H:%M"],
+                    ["TimeDeltaMinutes", 5],
+                ],
+                "%M",
+            ],
+            "10",
+        ),
+        (
+            {},
+            [
+                "Strftime",
+                [
+                    "Add",
+                    ["Strptime", "2025-01-10T10:05", "%Y-%m-%dT%H:%M"],
+                    ["TimeDeltaHours", 2],
+                ],
+                "%H",
+            ],
+            "12",
+        ),
+        (
+            {},
+            [
+                "Strftime",
+                [
+                    "Add",
+                    ["Strptime", "2025-01-10T10:05", "%Y-%m-%dT%H:%M"],
+                    ["TimeDeltaWeeks", 1],
+                ],
+                "%d",
+            ],
+            "17",
+        ),
     ],
 )
 def test_solver_simple(parameters, expression, expected_result):