mathjson-solver 1.20.0__tar.gz → 1.20.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/PKG-INFO +1 -1
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/SECURITY.md +2 -2
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/docs/README.md +2 -2
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/pyproject.toml +1 -1
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/src/mathjson_solver/__main__.py +2 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_datetime.py +14 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/.github/ISSUE_TEMPLATE/bug_report.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/.github/workflows/python-app.yml +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/.github/workflows/test-coverage.yml +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/.gitignore +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/CODE_OF_CONDUCT.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/CONTRIBUTING.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/LICENSE +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/README.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/docs/integration-test-cases.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/logo.png +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/logo.svg +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/src/mathjson_solver/__init__.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_TrapezoidalIntegratel.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_atindex.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_cumulative.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_equal.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_exceptions.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_extract_variables.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_findinterval.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_gail_model.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_interpolate.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_range.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_reduce_simple.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_scalars.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_sets.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_simple_cases.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_slice.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_state_tuples_reduce.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/tests/test_with_pytest.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/NCI_50_CASES_WORKSHEET.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/NCI_AGE35-39_ANALYSIS.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/NCI_AGE35-44_ANALYSIS.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/NCI_COMPARISON_REPORT.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/NCI_COMPLETE_VALIDATION_ANALYSIS.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/NCI_VALIDATION_WORKSHEET.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/R_CODE_VERIFICATION_ANALYSIS.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/corrected_comparison.txt +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/final_comparison.txt +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/full_comparison.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/gail_continuous_model_visualization.html +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/gail_continuous_model_visualization.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/generate_comprehensive_comparison.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/test_interval_analysis.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/updated_comparison.txt +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/DESCRIPTION +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/NAMESPACE +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/R/absolute.risk.R +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/R/check.summary.R +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/R/error.table.R +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/R/error.table.all.R +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/R/list.constants.R +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/R/recode.check.R +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/R/relative.risk.R +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/R/risk.summary.R +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/data/BrCa_1_AR.rda +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/data/BrCa_beta.rda +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/data/BrCa_lambda1.rda +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/data/BrCa_lambda2.rda +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/data/exampledata.rda +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/BCRA-package.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/BrCa_1_AR.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/BrCa_beta.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/BrCa_lambda1.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/BrCa_lambda2.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/absolute.risk.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/check.summary.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/error.table.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/error.table.all.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/exampledata.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/list.constants.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/recode.check.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/relative.risk.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/man/risk.summary.Rd +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/CLEAN_MODEL_USAGE.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/COSTANTINO1999_RESULTS_TABLE.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/EXACT_PATIENT_EXAMPLES.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/FINAL_IMPLEMENTATION_SUMMARY.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/GAIL_MODEL_IMPLEMENTATION_REPORT.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/INTEGRATION_MODEL_VALIDATION_COMPARISON.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/NCI_VALIDATION_STRATEGY.md +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/best_so_far/man_test_gail_model_nci_validated_no_beta.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/best_so_far/man_test_nci_discrete_implementation_no_beta.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/gail_continuous_model_mathjson.json +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/publications/costantino_1999.pdf +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/publications/gail_1989.pdf +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/tests/generate_exact_patient_examples.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/tests/test_bcpt_validation_integration.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/tests/test_gail_approximated_model_nci_validated.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/tests/test_gail_exact_nci_implementation.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/tests/test_gail_exact_with_cumulative.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/tests/test_gail_exact_with_reduce.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/tests/test_gail_model_costantino_integration.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/tests/test_gail_model_nci_validated_fixed.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/tests/test_nci_calculator_validation.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/tests/test_patient_examples_comparison.py +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/untracked/chart.csv +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/untracked/cvd_risk.json +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/untracked/image.png +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/untracked/score2.csv +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/untracked/score2_mid.csv +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/untracked/score2_results2.xlsx +0 -0
- {mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/untracked/score2_table.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: mathjson-solver
|
|
3
|
-
Version: 1.20.
|
|
3
|
+
Version: 1.20.1
|
|
4
4
|
Summary: Utilities for MathJSON evaluation
|
|
5
5
|
Project-URL: Homepage, https://github.com/LongenesisLtd/mathjson-solver
|
|
6
6
|
Project-URL: Bug Tracker, https://github.com/LongenesisLtd/mathjson-solver/issues
|
|
@@ -327,7 +327,7 @@ If a constant definition raises an exception (e.g. because a referenced paramete
|
|
|
327
327
|
# Result: 11.25 (c_old was never needed)
|
|
328
328
|
```
|
|
329
329
|
|
|
330
|
-
A constant that failed to compute
|
|
330
|
+
A constant that failed to compute resolves to `None`, which is falsy. Use `["IsFalse", "c_old"]` to detect it (or `["IsTrue", "c_old"]` to confirm it computed successfully).
|
|
331
331
|
|
|
332
332
|
### If Statement
|
|
333
333
|
```
|
|
@@ -824,7 +824,7 @@ The logical complement of `IsDefined`. Returns `True` if the name is not defined
|
|
|
824
824
|
["Constants", ["x", 5], ["IsUndefined", "y"]] # True
|
|
825
825
|
```
|
|
826
826
|
|
|
827
|
-
Note: when a `Constants` definition raises an exception, that constant is set to `None` (see null-propagation below). In that case `IsUndefined` still returns `False` — the name is defined, just with a `None` value. Use `["
|
|
827
|
+
Note: when a `Constants` definition raises an exception, that constant is set to `None` (see null-propagation below). In that case `IsUndefined` still returns `False` — the name is defined, just with a `None` value. Use `["IsFalse", "val"]` to detect a failed constant (since `None` is falsy).
|
|
828
828
|
|
|
829
829
|
---
|
|
830
830
|
|
|
@@ -617,6 +617,8 @@ def create_mathjson_solver(solver_parameters):
|
|
|
617
617
|
|
|
618
618
|
def Strftime(s):
|
|
619
619
|
dt = _try_parse_datetime(f(s[1], c))
|
|
620
|
+
if not isinstance(dt, (datetime.datetime, datetime.date)):
|
|
621
|
+
raise ValueError(f"Strftime: could not parse input as datetime: {dt!r}")
|
|
620
622
|
parameters = f(s[2], c)
|
|
621
623
|
return dt.strftime(parameters)
|
|
622
624
|
|
|
@@ -134,6 +134,20 @@ class TestStrftime:
|
|
|
134
134
|
result = solver(["Strftime", "2025-06-15T14:30:45", "%Y-%m-%d %H:%M:%S"])
|
|
135
135
|
assert result == "2025-06-15 14:30:45"
|
|
136
136
|
|
|
137
|
+
def test_strftime_raises_on_unparseable_input(self):
|
|
138
|
+
"""Strftime must raise MathJSONException (not AttributeError) for unparseable input."""
|
|
139
|
+
from mathjson_solver import MathJSONException
|
|
140
|
+
solver = create_solver({})
|
|
141
|
+
with pytest.raises(MathJSONException):
|
|
142
|
+
solver(["Strftime", "not-a-date", "%Y-%m-%d"])
|
|
143
|
+
|
|
144
|
+
def test_strftime_raises_on_none_input(self):
|
|
145
|
+
"""Strftime must raise MathJSONException when input resolves to None."""
|
|
146
|
+
from mathjson_solver import MathJSONException
|
|
147
|
+
solver = create_solver({})
|
|
148
|
+
with pytest.raises(MathJSONException):
|
|
149
|
+
solver(["Strftime", None, "%Y-%m-%d"])
|
|
150
|
+
|
|
137
151
|
|
|
138
152
|
class TestDatetimeChaining:
|
|
139
153
|
"""Test complex datetime operation chains."""
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/NCI_50_CASES_WORKSHEET.md
RENAMED
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/NCI_AGE35-39_ANALYSIS.md
RENAMED
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/NCI_AGE35-44_ANALYSIS.md
RENAMED
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/NCI_COMPARISON_REPORT.md
RENAMED
|
File without changes
|
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/NCI_VALIDATION_WORKSHEET.md
RENAMED
|
File without changes
|
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/corrected_comparison.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/test_interval_analysis.py
RENAMED
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommited2/updated_comparison.txt
RENAMED
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/DESCRIPTION
RENAMED
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/NAMESPACE
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/BCRA_2.0/BCRA/R/error.table.R
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/EXACT_PATIENT_EXAMPLES.md
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/NCI_VALIDATION_STRATEGY.md
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mathjson_solver-1.20.0 → mathjson_solver-1.20.1}/unsorted_uncommitted/publications/gail_1989.pdf
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|