ModelFlowIb 2.63__tar.gz → 2.64__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.
Files changed (54) hide show
  1. {modelflowib-2.63 → modelflowib-2.64}/ModelFlowIb.egg-info/PKG-INFO +4 -5
  2. {modelflowib-2.63 → modelflowib-2.64}/ModelFlowIb.egg-info/SOURCES.txt +1 -0
  3. {modelflowib-2.63 → modelflowib-2.64}/ModelFlowIb.egg-info/requires.txt +1 -3
  4. {modelflowib-2.63 → modelflowib-2.64}/ModelFlowIb.egg-info/top_level.txt +1 -0
  5. {modelflowib-2.63 → modelflowib-2.64}/PKG-INFO +4 -5
  6. {modelflowib-2.63 → modelflowib-2.64}/modelclass.py +36 -26
  7. {modelflowib-2.63 → modelflowib-2.64}/modelgrabwf2.py +29 -18
  8. {modelflowib-2.63 → modelflowib-2.64}/modelhelp.py +5 -1
  9. {modelflowib-2.63 → modelflowib-2.64}/modelreport.py +4 -2
  10. modelflowib-2.64/modelwidget_input.py +1984 -0
  11. {modelflowib-2.63 → modelflowib-2.64}/pyproject.toml +5 -4
  12. {modelflowib-2.63 → modelflowib-2.64}/ModelFlowIb.egg-info/dependency_links.txt +0 -0
  13. {modelflowib-2.63 → modelflowib-2.64}/modelBLfunk.py +0 -0
  14. {modelflowib-2.63 → modelflowib-2.64}/model_Excel.py +0 -0
  15. {modelflowib-2.63 → modelflowib-2.64}/model_cvx.py +0 -0
  16. {modelflowib-2.63 → modelflowib-2.64}/model_doable.py +0 -0
  17. {modelflowib-2.63 → modelflowib-2.64}/model_dynare.py +0 -0
  18. {modelflowib-2.63 → modelflowib-2.64}/model_financial_stability.py +0 -0
  19. {modelflowib-2.63 → modelflowib-2.64}/model_ifrs9.py +0 -0
  20. {modelflowib-2.63 → modelflowib-2.64}/model_latex.py +0 -0
  21. {modelflowib-2.63 → modelflowib-2.64}/model_latex_class.py +0 -0
  22. {modelflowib-2.63 → modelflowib-2.64}/model_run_numba.py +0 -0
  23. {modelflowib-2.63 → modelflowib-2.64}/modelclass2.py +0 -0
  24. {modelflowib-2.63 → modelflowib-2.64}/modelconstruct.py +0 -0
  25. {modelflowib-2.63 → modelflowib-2.64}/modeldash.py +0 -0
  26. {modelflowib-2.63 → modelflowib-2.64}/modeldashboot.py +0 -0
  27. {modelflowib-2.63 → modelflowib-2.64}/modeldashsidebar.py +0 -0
  28. {modelflowib-2.63 → modelflowib-2.64}/modeldekom.py +0 -0
  29. {modelflowib-2.63 → modelflowib-2.64}/modeldiff.py +0 -0
  30. {modelflowib-2.63 → modelflowib-2.64}/modeldisplay.py +0 -0
  31. {modelflowib-2.63 → modelflowib-2.64}/modelestimation.py +0 -0
  32. {modelflowib-2.63 → modelflowib-2.64}/modelfeedback.py +0 -0
  33. {modelflowib-2.63 → modelflowib-2.64}/modelgrab.py +0 -0
  34. {modelflowib-2.63 → modelflowib-2.64}/modelinvert.py +0 -0
  35. {modelflowib-2.63 → modelflowib-2.64}/modeljupyter.py +0 -0
  36. {modelflowib-2.63 → modelflowib-2.64}/modeljupytermagic.py +0 -0
  37. {modelflowib-2.63 → modelflowib-2.64}/modelmacrograb.py +0 -0
  38. {modelflowib-2.63 → modelflowib-2.64}/modelmanipulation.py +0 -0
  39. {modelflowib-2.63 → modelflowib-2.64}/modelmf.py +0 -0
  40. {modelflowib-2.63 → modelflowib-2.64}/modelnet.py +0 -0
  41. {modelflowib-2.63 → modelflowib-2.64}/modelnewton.py +0 -0
  42. {modelflowib-2.63 → modelflowib-2.64}/modelnormalize.py +0 -0
  43. {modelflowib-2.63 → modelflowib-2.64}/modelpattern.py +0 -0
  44. {modelflowib-2.63 → modelflowib-2.64}/modelpatternrev.py +0 -0
  45. {modelflowib-2.63 → modelflowib-2.64}/modelsandbox.py +0 -0
  46. {modelflowib-2.63 → modelflowib-2.64}/modelsandbox_Mixin.py +0 -0
  47. {modelflowib-2.63 → modelflowib-2.64}/modeltodo.py +0 -0
  48. {modelflowib-2.63 → modelflowib-2.64}/modeluserfunk.py +0 -0
  49. {modelflowib-2.63 → modelflowib-2.64}/modeluserfunk_old.py +0 -0
  50. {modelflowib-2.63 → modelflowib-2.64}/modelvis.py +0 -0
  51. {modelflowib-2.63 → modelflowib-2.64}/modelwidget.py +0 -0
  52. /modelflowib-2.63/modelwidget_input.py → /modelflowib-2.64/modelwidget_input_old.py +0 -0
  53. {modelflowib-2.63 → modelflowib-2.64}/modelwidget_shinypy.py +0 -0
  54. {modelflowib-2.63 → modelflowib-2.64}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ModelFlowIb
3
- Version: 2.63
3
+ Version: 2.64
4
4
  Summary: A tool to solve and manage dynamic economic models
5
5
  Author-email: Ib Hansen <your@email.com>
6
6
  License: MIT
@@ -25,10 +25,9 @@ Requires-Dist: dash
25
25
  Requires-Dist: dash-bootstrap-components
26
26
  Requires-Dist: dash-interactive-graphviz
27
27
  Requires-Dist: lmfit
28
- Provides-Extra: jupyter
29
- Requires-Dist: jupyter; extra == "jupyter"
30
- Requires-Dist: ipywidgets; extra == "jupyter"
31
- Requires-Dist: ipysheet; extra == "jupyter"
28
+ Requires-Dist: jupyter
29
+ Requires-Dist: ipywidgets
30
+ Requires-Dist: ipydatagrid
32
31
  Provides-Extra: shiny
33
32
  Requires-Dist: shiny; extra == "shiny"
34
33
  Requires-Dist: shinywidgets; extra == "shiny"
@@ -42,6 +42,7 @@ modeluserfunk_old.py
42
42
  modelvis.py
43
43
  modelwidget.py
44
44
  modelwidget_input.py
45
+ modelwidget_input_old.py
45
46
  modelwidget_shinypy.py
46
47
  pyproject.toml
47
48
  ModelFlowIb.egg-info/PKG-INFO
@@ -19,11 +19,9 @@ dash
19
19
  dash-bootstrap-components
20
20
  dash-interactive-graphviz
21
21
  lmfit
22
-
23
- [jupyter]
24
22
  jupyter
25
23
  ipywidgets
26
- ipysheet
24
+ ipydatagrid
27
25
 
28
26
  [shiny]
29
27
  shiny
@@ -43,4 +43,5 @@ modeluserfunk_old
43
43
  modelvis
44
44
  modelwidget
45
45
  modelwidget_input
46
+ modelwidget_input_old
46
47
  modelwidget_shinypy
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ModelFlowIb
3
- Version: 2.63
3
+ Version: 2.64
4
4
  Summary: A tool to solve and manage dynamic economic models
5
5
  Author-email: Ib Hansen <your@email.com>
6
6
  License: MIT
@@ -25,10 +25,9 @@ Requires-Dist: dash
25
25
  Requires-Dist: dash-bootstrap-components
26
26
  Requires-Dist: dash-interactive-graphviz
27
27
  Requires-Dist: lmfit
28
- Provides-Extra: jupyter
29
- Requires-Dist: jupyter; extra == "jupyter"
30
- Requires-Dist: ipywidgets; extra == "jupyter"
31
- Requires-Dist: ipysheet; extra == "jupyter"
28
+ Requires-Dist: jupyter
29
+ Requires-Dist: ipywidgets
30
+ Requires-Dist: ipydatagrid
32
31
  Provides-Extra: shiny
33
32
  Requires-Dist: shiny; extra == "shiny"
34
33
  Requires-Dist: shinywidgets; extra == "shiny"
@@ -1505,7 +1505,6 @@ class Model_help_Mixin():
1505
1505
  cxtime.show()
1506
1506
  if error:
1507
1507
  raise error
1508
- return
1509
1508
 
1510
1509
  @staticmethod
1511
1510
  def update_from_list(indf, basis, lprint=False):
@@ -2918,7 +2917,8 @@ class Description_Mixin():
2918
2917
  def string_substitution(self,astring):
2919
2918
  try:
2920
2919
  return astring.format_map(self.substitution)
2921
- except:
2920
+ except Exception as e:
2921
+ print(e)
2922
2922
  print('No substitution performed')
2923
2923
  print(f'String:{astring}')
2924
2924
  print('Dictionary: ')
@@ -4761,7 +4761,7 @@ class Display_Mixin():
4761
4761
  xtranspose = transpose
4762
4762
 
4763
4763
 
4764
- if any([i in keys for i in df.index]) :
4764
+ if any([i in keys for i in df.index]) or any(i in self.allvar_set for i in df.index) :
4765
4765
  tt = pd.DataFrame([[get_des(v) for t in df.columns] for v in df.index ],index=df.index,columns=df.columns)
4766
4766
  else:
4767
4767
  tt = pd.DataFrame([[get_des(v) for v in df.columns ]for t in df.index] ,index=df.index,columns=df.columns)
@@ -6098,7 +6098,8 @@ class Json_Mixin():
6098
6098
  return content.decode('utf-8')
6099
6099
 
6100
6100
  if pinfile.exists():
6101
- json_string = read_file(pinfile)
6101
+ with model.timer('read',False):
6102
+ json_string = read_file(pinfile)
6102
6103
  else:
6103
6104
  if infile.startswith(r'https:'):
6104
6105
  urlfile = infile
@@ -6110,17 +6111,20 @@ class Json_Mixin():
6110
6111
  input = json.loads(json_string)
6111
6112
  version = input['version']
6112
6113
  frml = input['frml']
6113
- lastdf = pd.read_json(StringIO(input['lastdf']))
6114
+ with model.timer('read lastdf',False):
6115
+
6116
+ lastdf = pd.read_json(StringIO(input['lastdf']))
6114
6117
  current_per = pd.read_json(StringIO(input['current_per']), typ='series').values
6115
6118
  modelname = input['modelname']
6116
6119
  # breakpoint()
6117
6120
  mmodel = cls(frml, modelname=modelname, funks=funks,**kwargs)
6118
- mmodel.oldkwargs = input['oldkwargs']
6121
+ mmodel.oldkwargs = input.get('oldkwargs',{})
6119
6122
  mmodel.json_current_per = current_per
6120
6123
  mmodel.set_var_description(input.get('var_description', {}))
6121
6124
  mmodel.equations_latex = input.get('equations_latex', '')
6122
6125
  if input.get('wb_MFMSAOPTIONS', None) : mmodel.wb_MFMSAOPTIONS = input.get('wb_MFMSAOPTIONS', None)
6123
- mmodel.keep_solutions = {k : pd.read_json(StringIO(jdf)) for k,jdf in input.get('keep_solutions',{}).items()}
6126
+ with model.timer('read keepsolutions',False):
6127
+ mmodel.keep_solutions = {k : pd.read_json(StringIO(jdf)) for k,jdf in input.get('keep_solutions',{}).items()}
6124
6128
  mmodel.var_groups = input.get('var_groups', {})
6125
6129
  mmodel.reports = input.get('reports',{} )
6126
6130
  mmodel.model_description = input.get('model_description', '')
@@ -8223,6 +8227,7 @@ class Solver_Mixin():
8223
8227
  self.declared_endo_list = [ v[:-6] if v.endswith('___RES') else v
8224
8228
  for v in endovar]
8225
8229
 
8230
+
8226
8231
  # Mask: which equations are residual form (G(y,x)=0)?
8227
8232
  self.is_residual_eq = np.array( [v.endswith('___RES') for v in endovar],
8228
8233
  dtype=bool )
@@ -8250,9 +8255,11 @@ class Solver_Mixin():
8250
8255
 
8251
8256
  # --- Column locations (indices in values) -------------------------------
8252
8257
  col_index = databank.columns.get_loc
8258
+ self.columns = databank.columns
8259
+ self.col_index = col_index
8253
8260
  # breakpoint()
8254
8261
  # Equations (rows of Jacobian) correspond to newton_diff_implicit.endovar
8255
- newton_col = [col_index(c) for c in self.newton_diff_implicit.endovar]
8262
+ newton_col = [col_index(c) for c in self.newton_diff_implicit.endovar] # with ___res
8256
8263
  newton_col_residual = [col_index(c) for c in [v for v in self.newton_diff_implicit.endovar if v.endswith('___RES') ] ]
8257
8264
 
8258
8265
  # Unknowns: declared endogenous (base names; no ___RES)
@@ -8263,11 +8270,11 @@ class Solver_Mixin():
8263
8270
  convplace = [col_index(c) for c in convvar]
8264
8271
 
8265
8272
  # Positions of original endogenous variables (for copying previous period)
8266
- endoplace = [col_index(c) for c in list(self.endogene)]
8273
+ endoplace = [col_index(c) for c in list(self.endogene)] # with___res
8267
8274
 
8268
8275
  # Names for debugging
8269
- eq_names = self.newton_diff_implicit.endovar
8270
- unk_names = self.newton_diff_implicit.declared_endo_list
8276
+ eq_names = self.newton_diff_implicit.endovar # with ___res
8277
+ unk_names = self.newton_diff_implicit.declared_endo_list # with declared endo
8271
8278
 
8272
8279
  # --- Dump setup ---------------------------------------------------------
8273
8280
  if ldumpvar:
@@ -8275,6 +8282,7 @@ class Solver_Mixin():
8275
8282
  endo_and_declares = list(self.newton_diff_implicit.declared_endo_set| self.endogene ) # so we can dump both true endo and ___res
8276
8283
  self.dump = self.list_names(endo_and_declares, dumpvar)
8277
8284
  dumpplac = [col_index(v) for v in self.dump]
8285
+ # debug_var(self.dump,dumpplac)
8278
8286
 
8279
8287
  # ======================================================================
8280
8288
  # 2) Main simulation loops (FAIR outer loop + per-period Newton)
@@ -8344,14 +8352,13 @@ class Solver_Mixin():
8344
8352
  # Convergence measure BEFORE update (Newton style)
8345
8353
  newton_conv = np.max(np.abs(residual))
8346
8354
 
8347
- if not silent:
8355
+ if debug_newton and not silent:
8356
+ # Debug: show worst offending equations
8348
8357
  print(
8349
8358
  f'Iteration {iteration:>2} | {self.periode} | '
8350
8359
  f'max residual (before step): {newton_conv:>25,.6f}'
8351
8360
  )
8352
8361
 
8353
- # Debug: show worst offending equations
8354
- if debug_newton and not silent:
8355
8362
  worst_idx = np.argsort(-np.abs(residual))[:debug_top]
8356
8363
  # print(' Worst residuals:',worst_idx)
8357
8364
  for i in worst_idx:
@@ -8366,11 +8373,11 @@ class Solver_Mixin():
8366
8373
  if ldumpvar:
8367
8374
  self.dumplist.append(
8368
8375
  [fairiteration, self.periode, iteration + 1] +
8369
- [outvalues[row, p] for p in dumpplac]
8376
+ [values[row, p] for p in dumpplac]
8370
8377
  )
8371
8378
 
8372
8379
 
8373
- if newton_conv <= newton_absconv:
8380
+ if newton_conv <= newton_absconv and iteration >= first_test:
8374
8381
  break
8375
8382
 
8376
8383
  # 2) Optional Jacobian refresh for non-linear cases
@@ -8409,7 +8416,7 @@ class Solver_Mixin():
8409
8416
  values[row, newton_col_unknown] = (
8410
8417
  y_old - base_damp * update
8411
8418
  )
8412
- # values[row,newton_col_residual] = outvalues[row,newton_col_residual] # TO KEEP THE RES UPDATED
8419
+ values[row,newton_col_residual] = outvalues[row,newton_col_residual] # TO KEEP THE RES UPDATED
8413
8420
 
8414
8421
  ittotal += 1
8415
8422
 
@@ -8424,12 +8431,13 @@ class Solver_Mixin():
8424
8431
  f'(max res≈{newton_conv:,.6g})'
8425
8432
  )
8426
8433
  else:
8427
- print(
8428
- f'{self.periode} solved in '
8429
- f'{iteration + 1} iterations '
8430
- f'(max res≈{newton_conv:,.6g})'
8431
- )
8432
-
8434
+ if not silent:
8435
+ print(
8436
+ f'{self.periode} solved in '
8437
+ f'{iteration + 1} iterations '
8438
+ f'(max res≈{newton_conv:,.6g})'
8439
+ )
8440
+
8433
8441
  # ======================================================================
8434
8442
  # 3) Dumping & statistics
8435
8443
  # ======================================================================
@@ -9107,9 +9115,9 @@ class model(Zip_Mixin, Json_Mixin, Model_help_Mixin, Solver_Mixin, Display_Mixin
9107
9115
 
9108
9116
 
9109
9117
  # wrapper'
9110
- if not hasattr(pd.DataFrame,'upd'):
9118
+ if "upd" not in pd.DataFrame.__dict__:
9111
9119
  @pd.api.extensions.register_dataframe_accessor("upd")
9112
- class upd():
9120
+ class upd:
9113
9121
  '''Extend a dataframe to update variables from string
9114
9122
 
9115
9123
  look at :any:`Model_help_Mixin.update` for syntax
@@ -9117,10 +9125,12 @@ if not hasattr(pd.DataFrame,'upd'):
9117
9125
 
9118
9126
 
9119
9127
  '''
9128
+ __doc__ = model.update.__doc__
9129
+
9120
9130
  def __init__(self, pandas_obj):
9121
9131
  # self._validate(pandas_obj)
9122
9132
  self._obj = pandas_obj
9123
- self.__doc__ = model.update.__doc__
9133
+ # self.__doc__ = model.update.__doc__
9124
9134
  # print(self._obj)
9125
9135
 
9126
9136
  def __call__(self,updates, lprint=False,scale = 1.0,create=True,keep_growth=False,):
@@ -75,10 +75,15 @@ def wf1_to_wf2(filename,modelname='',eviews_run_lines= []):
75
75
 
76
76
  '''
77
77
  try:
78
- import pyeviews as evp
79
- except:
80
- raise Exception('You have not pyeviews installed try:\n'+
81
- '!conda install pyeviews -c conda-forge -y')
78
+ import py2eviews as evp
79
+ except:
80
+ try:
81
+ import pyeviews as evp
82
+ print('You have installed pyewiews not py2eviews it may works but try:\n'+
83
+ '!conda install py2eviews -c -c eviews -y')
84
+ except:
85
+ raise Exception('You have not py2eviews installed try:\n'+
86
+ '!conda install py2eviews -c -c eviews -y')
82
87
  from pathlib import Path
83
88
  wfpath = Path(filename)
84
89
  if wfpath.suffix not in {'.wf1','.wf2'} :
@@ -152,14 +157,17 @@ def wf2_to_clean(wf2name,modelname='',save_file = False,freq='A'):
152
157
  object_namecounts = {_type: [o['_name'] for o in this_object] for _type,this_object in object_dict.items() }
153
158
  # breakpoint()
154
159
  # Now extract the model
155
- thismodel_dict = object_dict['model'][0]
156
- thismodel_raw = thismodel_dict['data'][0]
157
- # breakpoint()
158
- thismodel_raw_list = [l for l in thismodel_raw.split('\n') if len(l) > 1]
159
-
160
- this_clean = [l for l in thismodel_raw_list if l[:4] not in {'@INN','@ADD'}] # The original frmls
161
- this_add_vars = [l.split()[1] for l in thismodel_raw_list if l[:4] in {'@ADD'}] # variable with add factors
162
- this_frml = '\n'.join(this_clean)
160
+ try:
161
+ thismodel_dict = object_dict['model'][0]
162
+ thismodel_raw = thismodel_dict['data'][0]
163
+ # breakpoint()
164
+ thismodel_raw_list = [l for l in thismodel_raw.split('\n') if len(l) > 1]
165
+
166
+ this_clean = [l for l in thismodel_raw_list if l[:4] not in {'@INN','@ADD'}] # The original frmls
167
+ this_add_vars = [l.split()[1] for l in thismodel_raw_list if l[:4] in {'@ADD'}] # variable with add factors
168
+ this_frml = '\n'.join(this_clean)
169
+ except:
170
+ this_frml = ''
163
171
  # Take all series and make a dataframe
164
172
  series_list = object_dict['series_double']
165
173
 
@@ -194,9 +202,12 @@ def wf2_to_clean(wf2name,modelname='',save_file = False,freq='A'):
194
202
  mfmsa_dict = {o['_name']:o.get('value','empty') for o in string_list if o.get('_name','').startswith('MFMSA') }
195
203
  mfmsa_options = mfmsa_dict.get('MFMSAOPTIONS','')
196
204
 
197
- estimates = {eq['_name'].upper()+f'.@COEF({idata+1})': str(data)
198
- for eq in object_dict['equation7'] for idata,data in enumerate(eq['results']['data']) }
199
-
205
+ try:
206
+ estimates = {eq['_name'].upper()+f'.@COEF({idata+1})': str(data)
207
+ for eq in object_dict['equation7'] for idata,data in enumerate(eq['results']['data']) }
208
+ except:
209
+ estimates = {}
210
+
200
211
  # breakpoint()
201
212
  model_all_about['modelname'] = modelname
202
213
  model_all_about['frml'] = this_frml
@@ -409,8 +420,6 @@ class GrabWfModel():
409
420
  var_groups = var_groups,
410
421
  )
411
422
  self.mmodel.eviews_dict = {v: f.eviews for v,f in self.all_frml_dict.items()}
412
- self.mmodel.var_description = self.var_description
413
- self.mmodel.model_description = self.model_description
414
423
 
415
424
 
416
425
  if self.cty:
@@ -432,6 +441,8 @@ class GrabWfModel():
432
441
  self.cty_name = cty_name
433
442
 
434
443
  print(f'Country {cty}:{cty_name}')
444
+ self.mmodel.var_description = self.var_description
445
+ self.mmodel.model_description = self.model_description
435
446
 
436
447
  # self.mmodel.set_var_description(self.model_all_about['var_description'])
437
448
 
@@ -1057,7 +1068,7 @@ if __name__ == '__main__':
1057
1068
 
1058
1069
 
1059
1070
  filedict = {f.stem[:3].lower():f for f in Path(r'C:\wb new\Modelflow\ib\developement\original').glob('*.wf1')}
1060
- filedict = {f.stem[:3].lower():f for f in Path(r'C:\wb new\Modelflow\ib\developement\original').glob('*.wf1')}
1071
+ filedict = {f.stem[:3].lower():f for f in Path(r'C:\wb new\Modelflow\ib\developement\original').glob('*.wf2')}
1061
1072
  modelname = 'pak'
1062
1073
  filename = filedict[modelname]
1063
1074
 
@@ -348,7 +348,11 @@ def debug_var(*args, **kwargs):
348
348
 
349
349
  # --- Print positional args ---
350
350
  for label, value in zip(arg_labels[:len(args)], args):
351
- print(f" {label} = {pformat(value)}")
351
+ if pd.DataFrame == type(value):
352
+ print(f"{label} = ")
353
+ print(f"{pformat(value)}")
354
+ else:
355
+ print(f" {label} = {pformat(value)}")
352
356
 
353
357
  # --- Print keyword args (explicit ones only) ---
354
358
  # Align labels for the kwargs we actually received (explicit, not **expansion members)
@@ -710,7 +710,9 @@ class LatexRepo:
710
710
  \usepackage{graphicx}
711
711
  \usepackage{pgf}
712
712
  \usepackage{lscape}
713
- \usepackage{{amsmath,amssymb}}
713
+ \usepackage{amsmath,amssymb}
714
+ \usepackage{placeins} % for \FloatBarrier
715
+
714
716
 
715
717
  \begin{document}
716
718
 
@@ -1575,7 +1577,7 @@ class DisplayTextDef(DisplayDef):
1575
1577
 
1576
1578
  @property
1577
1579
  def latex(self) :
1578
- return self.mmodel.string_substitution(self.latex_text)
1580
+ return self.latex_text
1579
1581
 
1580
1582
 
1581
1583