also check calls for vals defined in t

econpizza/parser/__init__.py

@@ -246,7 +246,7 @@ def compile_stst_inputs(model):
         evars, par_names, init_guesses, fixed_evaluated)
 
     # get the initial decision functions
-    if model.get('decisions'):
+    if model.get('distributions'):
         dist_names = list(model['distributions'].keys())
         # for now assume that this must be present
         init_wf = jnp.array([init_guesses[dec_input]
@@ -330,7 +330,8 @@ def load(
     check_dublicates(model.get("parameters"))
     evars = check_determinancy(model["variables"], eqns)
     # check if each variable is defined in time t (only defining xSS does not give a valid root)
-    check_if_defined(evars, eqns, model.get('skip_check_if_defined'))
+    check_if_defined(evars, eqns, model.get('decisions'),
+                     model.get('skip_check_if_defined'))
 
     # create fixed (time invariant) grids
     grids.create_grids(model.get('distributions'), model["context"], verbose)

econpizza/parser/checks.py

@@ -4,20 +4,34 @@
 import sys
 import jax.numpy as jnp
 from .build_functions import func_pre_stst
+import re
 
 
-def check_if_defined(evars, eqns, skipped_vars):
+def _strip_comments(code):
+    code = str(code)
+    return re.sub(r'(?m)^ *#.*\n?', '', code)
+
+
+def check_if_defined(evars, eqns, decisions, skipped_vars):
     """Check if all variables are defined in period t.
     """
     skipped_vars = [] if skipped_vars is None else skipped_vars
+    calls = _strip_comments(
+        decisions['calls']) if decisions is not None else ''
 
     for v in evars:
         v_in_eqns = [
             v in e.replace(v + "SS", "").replace(v + "Lag",
                                                  "").replace(v + "Prime", "")
             for e in eqns
         ]
-        if not any(v_in_eqns) and not v in skipped_vars:
+        v_in_calls = v in calls.replace(
+            v + "SS", "").replace(v + "Lag", "").replace(v + "Prime", "")
+        print(v)
+        print(calls.replace(v + "SS", "").replace(v +
+              "Lag", "").replace(v + "Prime", ""))
+
+        if not any(v_in_eqns) and not v_in_calls and not v in skipped_vars:
             raise Exception(f"Variable `{v}` is not defined for time t.")
     return