Leave DIST in for entire parametric estimation. The codes' dependenci…

…es on DIST are more complex than originally thought.
OpenSourceEconomics · Mar 24, 2020 · d8dcf95 · d8dcf95
1 parent 2434dd6
commit d8dcf95
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 23 deletions.
diff --git a/grmpy/estimate/estimate_par.py b/grmpy/estimate/estimate_par.py
@@ -369,19 +369,6 @@ 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:])
 
@@ -392,7 +379,6 @@ 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,8 +17,7 @@ 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 and create dictionary.
-    # Include constants if necessary.
+    # Process the initialization file
     attr_dict = create_attr_dict_est(init_dict, semipar, include_constant)
 
     return attr_dict
@@ -35,7 +34,7 @@ def read_simulation(file):
     with open(file) as y:
         init_dict = yaml.load(y, Loader=yaml.FullLoader)
 
-    # Process the initialization file and create dictionary.
+    # Process the initialization file
     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_basic(init_dict, init_values)
+        init_dict = read_keys_semipar(init_dict, init_values)
 
     # semipar is False
     else:
@@ -24,10 +24,7 @@ def create_attr_dict_est(init_dict, semipar=False, include_constant=False):
         else:
             pass
 
-        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 = read_keys_par(init_dict, init_values)
 
     init_dict = provide_auxiliary_information(init_dict, init_values)
 
@@ -93,7 +90,7 @@ def read_keys_par(init_dict, init_values):
     return init_dict
 
 
-def read_keys_basic(init_dict, init_values):
+def read_keys_semipar(init_dict, init_values):
     """This function reads the information provided by the
     ["TREATED", "UNTREATED", "CHOICE"] keys for
     semiparametric estimation.