Rename cross_calibrate.py to ensemble.py

Author: peanutfun

climada/util/calibrate/__init__.py

@@ -26,4 +26,9 @@
     BayesianOptimizerOutputEvaluator,
     select_best,
 )
+from .ensemble import (
+    AverageEnsembleOptimizer,
+    EnsembleOptimizerOutput,
+    TragedyEnsembleOptimizer,
+)
 from .scipy_optimizer import ScipyMinimizeOptimizer

climada/util/calibrate/cross_calibrate.py climada/util/calibrate/ensemble.pyclimada/util/calibrate/cross_calibrate.py renamed to climada/util/calibrate/ensemble.py

@@ -15,7 +15,7 @@
 with CLIMADA. If not, see <https://www.gnu.org/licenses/>.
 
 ---
-Cross-calibration on top of a single calibration module
+Ensemble calibration on top of the single-function calibration module
 """
 
 import logging

…l/calibrate/test/test_cross_calibrate.py …ada/util/calibrate/test/test_ensemble.pyclimada/util/calibrate/test/test_cross_calibrate.py renamed to climada/util/calibrate/test/test_ensemble.py climada/util/calibrate/test/test_cross_calibrate.py renamed to climada/util/calibrate/test/test_ensemble.py

@@ -15,7 +15,7 @@
 with CLIMADA. If not, see <https://www.gnu.org/licenses/>.
 
 ---
-Tests for cross calibration module
+Tests for ensemble calibration module
 """
 
 import copy
@@ -30,7 +30,7 @@
 import pandas.testing as pdt
 
 from climada.util.calibrate.base import Input, Output
-from climada.util.calibrate.cross_calibrate import (
+from climada.util.calibrate.ensemble import (
     AverageEnsembleOptimizer,
     EnsembleOptimizer,
     EnsembleOptimizerOutput,
@@ -39,7 +39,8 @@
     event_info_from_input,
     sample_data,
 )
-from climada.util.calibrate.test.test_base import ConcreteOptimizer, exposure, hazard
+
+from .test_base import ConcreteOptimizer, exposure, hazard
 
 
 class TestEnsembleOptimizerOutput(unittest.TestCase):
@@ -225,7 +226,7 @@ def setUp(self):
             assign_centroids=False,
         )
 
-    @patch("climada.util.calibrate.cross_calibrate.ProcessPool")
+    @patch("climada.util.calibrate.ensemble.ProcessPool")
     def test_run(self, pool_class_mock, opt_class_mock):
         """Test initialization"""
         # Mock the optimizer class

doc/climada/climada.util.calibrate.rst

@@ -36,7 +36,7 @@ Ensemble Optimizers
 
 Calibration creating ensembles of impact functions.
 
-.. automodule:: climada.util.calibrate.cross_calibrate
+.. automodule:: climada.util.calibrate.ensemble
    :members:
    :show-inheritance:
    :inherited-members:  abc.ABC