Only require DIST to be specified for parametric estimation if start …

…option init is chosen.
OpenSourceEconomics · Mar 24, 2020 · 2434dd6 · 2434dd6
1 parent 8581fcf
commit 2434dd6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/grmpy/estimate/estimate_par.py b/grmpy/estimate/estimate_par.py
@@ -369,6 +369,19 @@ def adjust_output(opt_rslt, init_dict, x0, X1, X0, Z1, Z0, Y1, Y0, dict_=None):
     rslt["CHOICE"]["p_values"] = np.array(rslt["AUX"]["p_values"][num_untreated:-4])
     rslt["CHOICE"]["t_values"] = np.array(rslt["AUX"]["t_values"][num_untreated:-4])
 
+    # In case user selected start option "auto",
+    # "DIST" key has not been defined yet.
+    if "DIST" not in rslt:
+        rslt.update({"DIST": {"params": None}})
+        rslt.update({"DIST": {"starting_values": None}})
+        rslt.update({"DIST": {"order": None}})
+        rslt.update({"DIST": {"standard_errors": None}})
+        rslt.update({"DIST": {"confidence_intervals": None}})
+        rslt.update({"DIST": {"p_values": None}})
+        rslt.update({"DIST": {"t_values": None}})
+    else:
+        pass
+
     rslt["DIST"]["params"] = np.array(x[-4:])
     rslt["DIST"]["starting_values"] = np.array(init_dict["AUX"]["starting_values"][-4:])
 
@@ -379,6 +392,7 @@ def adjust_output(opt_rslt, init_dict, x0, X1, X0, Z1, Z0, Y1, Y0, dict_=None):
     )
     rslt["DIST"]["p_values"] = np.array(rslt["AUX"]["p_values"][-4:])
     rslt["DIST"]["t_values"] = np.array(rslt["AUX"]["t_values"][-4:])
+
     for subkey in [
         "num_covars_choice",
         "num_covars_treated",

diff --git a/grmpy/read/read.py b/grmpy/read/read.py
@@ -17,7 +17,8 @@ def read(file, semipar=False, include_constant=False):
     with open(file) as y:
         init_dict = yaml.load(y, Loader=yaml.FullLoader)
 
-    # Process the initialization file
+    # Process the initialization file and create dictionary.
+    # Include constants if necessary.
     attr_dict = create_attr_dict_est(init_dict, semipar, include_constant)
 
     return attr_dict
@@ -34,7 +35,7 @@ def read_simulation(file):
     with open(file) as y:
         init_dict = yaml.load(y, Loader=yaml.FullLoader)
 
-    # Process the initialization file
+    # Process the initialization file and create dictionary.
     attr_dict = create_attr_dict_sim(init_dict)
 
     return attr_dict

diff --git a/grmpy/read/read_auxiliary.py b/grmpy/read/read_auxiliary.py
@@ -15,7 +15,7 @@ def create_attr_dict_est(init_dict, semipar=False, include_constant=False):
         else:
             pass
 
-        init_dict = read_keys_semipar(init_dict, init_values)
+        init_dict = read_keys_basic(init_dict, init_values)
 
     # semipar is False
     else:
@@ -24,7 +24,10 @@ def create_attr_dict_est(init_dict, semipar=False, include_constant=False):
         else:
             pass
 
-        init_dict = read_keys_par(init_dict, init_values)
+        if init_dict["ESTIMATION"]["start"] == "init":
+            init_dict = read_keys_par(init_dict, init_values)
+        else:
+            read_keys_basic(init_dict, init_values)
 
     init_dict = provide_auxiliary_information(init_dict, init_values)
 
@@ -90,7 +93,7 @@ def read_keys_par(init_dict, init_values):
     return init_dict
 
 
-def read_keys_semipar(init_dict, init_values):
+def read_keys_basic(init_dict, init_values):
     """This function reads the information provided by the
     ["TREATED", "UNTREATED", "CHOICE"] keys for
     semiparametric estimation.