Update fit_fcn.py

Argonne-National-Laboratory · Nov 4, 2021 · 7821587 · 7821587
1 parent f9d11e8
commit 7821587
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/calculate/optimize/fit_fcn.py b/src/calculate/optimize/fit_fcn.py
@@ -348,13 +348,13 @@ def append_output(output_dict, calc_resid_output):
                 loss_alpha = 2.0
 
             else:
-                loss_alpha_fcn = lambda alpha: self.calculate_obj_fcn(loss_resid, alpha, log_opt_rates, output_dict)
+                loss_alpha_fcn = lambda alpha: self.calculate_obj_fcn(x, loss_resid, alpha, log_opt_rates, output_dict)
 
                 res = minimize_scalar(loss_alpha_fcn, bounds=[-100, 2], method='bounded')
                 loss_alpha = res.x
 
         print([loss_alpha, *exp_loss_alpha])
-        obj_fcn = self.calculate_obj_fcn(loss_resid, loss_alpha, log_opt_rates, output_dict)
+        obj_fcn = self.calculate_obj_fcn(x, loss_resid, loss_alpha, log_opt_rates, output_dict)
 
         # For updating
         self.i += 1
@@ -388,7 +388,7 @@ def append_output(output_dict, calc_resid_output):
         else:
             return obj_fcn, x, output_dict['shock']
 
-    def calculate_obj_fcn(self, loss_resid, alpha, log_opt_rates, output_dict, loss_outlier=0):
+    def calculate_obj_fcn(self, x, loss_resid, alpha, log_opt_rates, output_dict, loss_outlier=0):
         if np.size(loss_resid) == 1:  # optimizing single experiment
             loss_outlier = 0
             loss_exp = loss_resid