some quality of life improvements

Python-Ensemble-Toolbox · Dec 22, 2023 · fb6eeaf · fb6eeaf
1 parent 81aff91
commit fb6eeaf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/popt/cost_functions/ren_npv.py b/popt/cost_functions/ren_npv.py
@@ -51,7 +51,6 @@ def ren_npv(pred_data, keys_opt, report):
         Qwi = np.sum(Qwi, axis=0)
 
         delta_days = (report[1][i] - report[1][i - 1]).days
-
         val = (Qop * npv_const['wop'] + Qgp * npv_const['wgp'] - Qwp * npv_const['wwp'] - Qwi * npv_const['wwi'] -
                Qrenwi * npv_const['wrenwi']) / (
             (1 + npv_const['disc']) ** (delta_days / 365))

diff --git a/popt/loop/ensemble.py b/popt/loop/ensemble.py
@@ -83,7 +83,7 @@ def __set__variable(var_name=None, defalut=None):
         self.bounds = []
         self.cov = np.array([])
         for name in self.prior_info.keys():
-            self.state[name] = self.prior_info[name]['mean']
+            self.state[name] = np.asarray(self.prior_info[name]['mean'])
             num_state_var = len(self.state[name])
             value_cov = self.prior_info[name]['variance'] * np.ones((num_state_var,))
             if 'limits' in self.prior_info[name].keys():
@@ -204,7 +204,7 @@ def function(self, x, *args):
             self.state_func_values = func_values
         else:
             self.ens_func_values = func_values
-
+        
         return func_values
 
     def gradient(self, x, *args):

diff --git a/popt/misc_tools/optim_tools.py b/popt/misc_tools/optim_tools.py
@@ -291,7 +291,6 @@ def save_optimize_results(intermediate_result):
     intermediate_result : scipy.optimize.OptimizeResult
         An instance of an OptimizeResult class
     """
-
     # Cast to OptimizeResult if a ndarray is passed as argument
     if type(intermediate_result) is np.ndarray:
         intermediate_result = OptimizeResult({'x': intermediate_result})
@@ -300,7 +299,7 @@ def save_optimize_results(intermediate_result):
     if 'save_folder' in intermediate_result:
         save_folder = intermediate_result['save_folder']
         if not os.path.exists(save_folder):
-            os.mkdir(save_folder)
+            os.makedirs(save_folder)
     else:
         save_folder = './'