Merge branch 'develop' into feature/gulmc

OasisLMF · mtazzari · Dec 8, 2022 · Oct 12, 2022 · Oct 13, 2022 · Oct 13, 2022
commit 50517c69c78bf9d3102b3616a7fce7e282b8825c
diff --git a/oasislmf/pytools/gul/manager.py b/oasislmf/pytools/gul/manager.py
@@ -24,18 +24,15 @@
     ITEM_MAP_KEY_TYPE, ITEM_MAP_VALUE_TYPE,
     gulSampleslevelRec_size, gulSampleslevelHeader_size, coverage_type, gul_header,
 )
+from oasislmf.pytools.gul.core import split_tiv_classic, split_tiv_multiplicative, get_gul, setmaxloss, compute_mean_loss
 from oasislmf.pytools.gul.io import (
     write_negative_sidx, write_sample_header,
     write_sample_rec, read_getmodel_stream,
 )
-
 from oasislmf.pytools.gul.random import (
     get_random_generator, compute_norm_cdf_lookup,
     compute_norm_inv_cdf_lookup, get_corr_rval, generate_correlated_hash_vector
 )
-
-from oasislmf.pytools.gul.random import get_random_generator
-from oasislmf.pytools.gul.core import split_tiv_classic, split_tiv_multiplicative, get_gul, setmaxloss, compute_mean_loss
 from oasislmf.pytools.gul.utils import append_to_dict_value, binary_search
 
 
@@ -221,7 +218,7 @@ def run(run_dir, ignore_file_type, sample_size, loss_threshold, alloc_rule, debu
 
         do_correlation = False
         if ignore_correlation:
-            logger.info(f"Correlated random number generation: switched OFF because --ignore-correlation is True.")
+            logger.info("Correlated random number generation: switched OFF because --ignore-correlation is True.")
 
         else:
             file_path = os.path.join(input_path, 'correlations.bin')
@@ -232,11 +229,11 @@ def run(run_dir, ignore_file_type, sample_size, loss_threshold, alloc_rule, debu
             if Nperil_correlation_groups > 0 and any(data['correlation_value'] > 0):
                 do_correlation = True
             else:
-                logger.info(f"Correlated random number generation: switched OFF because 0 peril correlation groups were detected or "
+                logger.info("Correlated random number generation: switched OFF because 0 peril correlation groups were detected or "
                             "the correlation value is zero for all peril correlation groups.")
 
         if do_correlation:
-            logger.info(f"Correlated random number generation: switched ON.")
+            logger.info("Correlated random number generation: switched ON.")
 
             corr_data_by_item_id = np.ndarray(Nperil_correlation_groups + 1, dtype=Correlation)
             corr_data_by_item_id[0] = (0, 0.)