ModelFlowIb 2.91__tar.gz → 2.92__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.
- {modelflowib-2.91 → modelflowib-2.92}/PKG-INFO +1 -1
- {modelflowib-2.91 → modelflowib-2.92}/modelclass.py +6 -3
- {modelflowib-2.91 → modelflowib-2.92}/modelconstruct_estimation.py +3 -3
- {modelflowib-2.91 → modelflowib-2.92}/modelflowib.egg-info/PKG-INFO +1 -1
- {modelflowib-2.91 → modelflowib-2.92}/pyproject.toml +1 -1
- {modelflowib-2.91 → modelflowib-2.92}/README.md +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/license.md +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelBLfunk.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/model_Excel.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/model_cvx.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/model_dynare.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/model_financial_stability.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/model_latex.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/model_latex_class.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/model_parquet_mixin.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelcausality.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelconstruct.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modeldash.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modeldashboot.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modeldashsidebar.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modeldekom.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modeldiff.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modeldisplay.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelestimation.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelestimator_new.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelflowib.egg-info/SOURCES.txt +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelflowib.egg-info/dependency_links.txt +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelflowib.egg-info/requires.txt +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelflowib.egg-info/top_level.txt +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelgrab.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelgrabexcel.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelgrabgdx.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelgrabgekkobank.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelgrabwf2.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelhelp.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelhtml.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelinput_shiny.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelinvert.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modeljupyter.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modeljupytermagic.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelmacrograb.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelmanipulation.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelmf.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelnet.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelnewton.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelnormalize.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelpattern.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelreport.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelsolver_ng.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modeluserfunk.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelvis.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelwidget.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelwidget_core.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/modelwidget_input.py +0 -0
- {modelflowib-2.91 → modelflowib-2.92}/setup.cfg +0 -0
|
@@ -2105,13 +2105,16 @@ class Model_help_Mixin():
|
|
|
2105
2105
|
if nofit and v.endswith('_FITTED'): continue
|
|
2106
2106
|
check = self.get_values(v,pct=True).T
|
|
2107
2107
|
check.columns = ['Before check','After calculation','Difference','Pct']
|
|
2108
|
-
|
|
2108
|
+
# NaN >= tol is False, so a calculated NaN has to be caught separately
|
|
2109
|
+
isnan = check['After calculation'].isna()
|
|
2110
|
+
if (check.Difference.abs() >= tol).any() or isnan.any():
|
|
2109
2111
|
err=err+1
|
|
2110
2112
|
maxdiff = check.Difference.abs().max()
|
|
2111
2113
|
maxpct = check.Pct.abs().max()
|
|
2114
|
+
nantext = f' NaN in {isnan.sum()} periods from {check.index[isnan][0]}' if isnan.any() else ''
|
|
2112
2115
|
if err==1 :
|
|
2113
|
-
print('\nVariable with residuals above threshold')
|
|
2114
|
-
print(f"{v:{self.maxnavlen}}, Max difference:{maxdiff:15.8f} Max Pct {maxpct:15.10f}% It is number {i:5} in the solveorder and error number {err}")
|
|
2116
|
+
print('\nVariable with residuals above threshold or NaN result')
|
|
2117
|
+
print(f"{v:{self.maxnavlen}}, Max difference:{maxdiff:15.8f} Max Pct {maxpct:15.10f}% It is number {i:5} in the solveorder and error number {err}{nantext}")
|
|
2115
2118
|
if showall:
|
|
2116
2119
|
print(f'{self.allvar[v]["frml"]}')
|
|
2117
2120
|
print(f'{self.var_description[v]}')
|
|
@@ -598,14 +598,14 @@ def eviews_to_modelflow(stmt: str, behavioral_opts: str = '<>') -> str:
|
|
|
598
598
|
|
|
599
599
|
``@IDENTITY`` equations get ``<>``, all other equations get
|
|
600
600
|
``behavioral_opts`` (for instance ``'<STOC>'``). EViews functions are
|
|
601
|
-
translated with :meth:`modelgrabwf2.
|
|
601
|
+
translated with :meth:`modelgrabwf2.GrabWfModel.trans_eviews`
|
|
602
602
|
(``D(`` -> ``DIFF(``, ``@PC`` -> ``PCT_GROWTH``, ``^`` -> ``**`` ...).
|
|
603
603
|
"""
|
|
604
|
-
from modelgrabwf2 import
|
|
604
|
+
from modelgrabwf2 import GrabWfModel
|
|
605
605
|
|
|
606
606
|
m = re.match(r'\s*@IDENTITY\s+(.*)', stmt, flags=re.IGNORECASE | re.DOTALL)
|
|
607
607
|
opts, body = ('<>', m.group(1)) if m else (behavioral_opts, stmt)
|
|
608
|
-
return f'{opts} {
|
|
608
|
+
return f'{opts} {GrabWfModel.trans_eviews(body).strip()}'
|
|
609
609
|
|
|
610
610
|
|
|
611
611
|
# type_input presets for Makemodel; explicit eq_start/eq_end/comment_start/transform win
|
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "modelflowib" # PyPI distribution name
|
|
7
|
-
version = "2.
|
|
7
|
+
version = "2.92" # OVERWRITTEN at build time from MF_VERSION
|
|
8
8
|
# (set_pyproject_version.py / make_pip.py -v)
|
|
9
9
|
description = "A tool to solve and manage dynamic economic and financial models"
|
|
10
10
|
readme = "README.md"
|
|
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
|
|
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
|