Syntax edits based on pytest outputs

dtcenter · Sep 18, 2024 · d38ac82 · d38ac82
1 parent c87728d
commit d38ac82
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/metcalcpy/agg_eclv.py b/metcalcpy/agg_eclv.py
@@ -200,7 +200,7 @@ def _get_bootstrapped_stats(self, series_data, thresholds):
                             logger.debug(f"Using circular block bootstrap with block length {block_length}.")
 
                     results = bootstrap_and_value(
-                        logger=logger,
+                        logger,
                         data,
                         stat_func=self._calc_stats,
                         num_iterations=self.params['num_iterations'],

diff --git a/metcalcpy/agg_stat.py b/metcalcpy/agg_stat.py
@@ -1066,7 +1066,7 @@ def _get_bootstrapped_stats_for_derived(self, series, distributions, axis="1"):
             try:
                 block_length = int(math.sqrt(len(values_both_arrays))) if 'circular_block_bootstrap' in self.params and parse_bool(self.params['circular_block_bootstrap']) else 1
                 results = bootstrap_and_value(
-                    logger=logger,
+                    logger,
                     values_both_arrays,
                     stat_func=self._calc_stats_derived,
                     num_iterations=self.params['num_iterations'],
@@ -1162,7 +1162,7 @@ def _get_bootstrapped_stats(self, series_data, axis="1"):
 
                 # Perform bootstrapping and CI calculation
                 results = bootstrap_and_value(
-                    logger=logger,
+                    logger,
                     data,
                     stat_func=self._calc_stats,
                     num_iterations=self.params['num_iterations'],

diff --git a/metcalcpy/bootstrap.py b/metcalcpy/bootstrap.py
@@ -317,9 +317,9 @@ def do_division(distr):
         if save_distributions:
             logger.debug("Saving bootstrap distributions to the result.")
             result.set_distributions(bootstrap_dist.flatten('F'))
-        except Exception as e:
-            logger.error(f"An error occurred during the bootstrap and calculation process: {e}", exc_info=True)
-            raise
+    except Exception as e:
+        logger.error(f"An error occurred during the bootstrap and calculation process: {e}", exc_info=True)
+        raise
     return result
 
 
@@ -538,7 +538,7 @@ def apply_cbb(row):
             counter = counter + 1
             if counter == block_length:
                 # start a new block
-                counter = 
+                counter = 0
         return row
 
     if block_length > 1:

diff --git a/metcalcpy/calc_difficulty_index.py b/metcalcpy/calc_difficulty_index.py
@@ -126,7 +126,7 @@ def _difficulty_index(logger, sigmaij, muij, threshold, fieldijn, Aplin, sigma_o
     safe_log(logger, logger.debug, f"Checking input: sigmaij shape: {sigmaij.shape}, muij shape: {muij.shape if isinstance(muij, np.ndarray) else 'scalar'}, "
                  f"threshold: {threshold}, fieldijn shape: {fieldijn.shape}, sigma_over_mu_ref: {sigma_over_mu_ref}, under_factor: {under_factor}")
     # Check for valid input
-    _input_check(sigmaij, muij, threshold, fieldijn, sigma_over_mu_ref, under_factor, safe_log(logger, logger)
+    _input_check(sigmaij, muij, threshold, fieldijn, sigma_over_mu_ref, under_factor, logger)
     safe_log(logger, logger.debug, "Input check passed successfully.")
     # Variance term in range 0 to 1
     safe_log(logger, logger.debug, "Calculating variance term.")
@@ -207,7 +207,7 @@ def forecast_difficulty(logger, sigmaij, muij, threshold, fieldijn,
         safe_log(logger, logger.debug, "Default Aplin object created.")
     safe_log(logger, logger.debug, "Calling _difficulty_index function.")                                                                  
     dij = _difficulty_index(sigmaij, muij, threshold, fieldijn,
-                       Aplin, sigma_over_mu_ref, safe_log(logger, logger)
+                       Aplin, sigma_over_mu_ref, logger)
     safe_log(logger, logger.info, "Forecast difficulty index calculation completed.")
     return dij
 

diff --git a/metcalcpy/piecewise_linear.py b/metcalcpy/piecewise_linear.py
@@ -35,8 +35,8 @@ class PiecewiseLinear():
     Xdomain is a numpy array of knot locations. Yrange is a numpy array.
     """
 
-    def __init__(self, x_domain, y_range, xunits='feet',
-                 left=np.nan, right=np.nan, name="", logger):
+    def __init__(self, logger, x_domain, y_range, xunits='feet',
+                 left=np.nan, right=np.nan, name=""):
 
         self.logger = logger
         len_x = len(x_domain)