removes risk transfer mechanism (for now)

Author: spjuhel

climada/trajectories/impact_calc_strat.py

@@ -54,8 +54,8 @@ def compute_impacts(
         snapshot0: Snapshot,
         snapshot1: Snapshot,
         future: tuple[int, int, int],
-        risk_transf_attach: float | None,
-        risk_transf_cover: float | None,
+        risk_transf_attach: float | None = None,
+        risk_transf_cover: float | None = None,
         calc_residual: bool = False,
     ):
         impact = self.compute_impacts_pre_transfer(snapshot0, snapshot1, future)

climada/trajectories/risk_trajectory.py

@@ -49,22 +49,8 @@ class RiskTrajectory:
     """Calculates risk trajectories over a series of snapshots.
 
     This class computes risk metrics over a series of snapshots,
-    optionally applying risk discounting and risk transfer adjustments.
+    optionally applying risk discounting.
 
-    Attributes
-    ----------
-    start_date : datetime
-        The start date of the risk trajectory.
-    end_date : datetime
-        The end date of the risk trajectory.
-    risk_disc : DiscRates | None
-        The discount rates for risk, default is None.
-    risk_transf_cover : optional
-        The risk transfer coverage, default is None.
-    risk_transf_attach : optional
-        The risk transfer attachment, default is None.
-    risk_periods : list
-        The computed RiskPeriod objects from the snapshots.
     """
 
     _grouper = ["measure", "metric"]
@@ -77,9 +63,6 @@ def __init__(
         interval_freq: str = "YS",
         all_groups_name: str = "All",
         risk_disc: DiscRates | None = None,
-        risk_transf_cover=None,
-        risk_transf_attach=None,
-        calc_residual: bool = True,
         interpolation_strategy: InterpolationStrategyBase | None = None,
         impact_computation_strategy: ImpactComputationStrategy | None = None,
     ):
@@ -92,9 +75,6 @@ def __init__(
         self.end_date = max([snapshot.date for snapshot in snapshots_list])
         self._interval_freq = interval_freq
         self.risk_disc = risk_disc
-        self._risk_transf_cover = risk_transf_cover
-        self._risk_transf_attach = risk_transf_attach
-        self._calc_residual = calc_residual
         self._interpolation_strategy = interpolation_strategy or AllLinearStrategy()
         self._impact_computation_strategy = (
             impact_computation_strategy or ImpactCalcComputation()
@@ -207,9 +187,6 @@ def pairwise(container: list):
                 interval_freq=self._interval_freq,
                 interpolation_strategy=self._interpolation_strategy,
                 impact_computation_strategy=self._impact_computation_strategy,
-                risk_transf_cover=self.risk_transf_cover,
-                risk_transf_attach=self.risk_transf_attach,
-                calc_residual=self._calc_residual,
             )
             for start_snapshot, end_snapshot in pairwise(
                 sorted(snapshots, key=lambda snap: snap.date)

climada/trajectories/riskperiod.py

@@ -114,9 +114,6 @@ def __init__(
         time_points: int | None = None,
         interpolation_strategy: InterpolationStrategyBase | None = None,
         impact_computation_strategy: ImpactComputationStrategy | None = None,
-        risk_transf_attach: float | None = None,
-        risk_transf_cover: float | None = None,
-        calc_residual: bool = False,
     ):
         LOGGER.debug("Instantiating new CalcRiskPeriod.")
         self._snapshot0 = snapshot0
@@ -132,9 +129,6 @@ def __init__(
         self.impact_computation_strategy = (
             impact_computation_strategy or ImpactCalcComputation()
         )
-        self.risk_transf_attach = risk_transf_attach
-        self.risk_transf_cover = risk_transf_cover
-        self.calc_residual = calc_residual
         self.measure = None  # Only possible to set with apply_measure to make sure snapshots are consistent
 
         self._group_id_E0 = (
@@ -299,12 +293,7 @@ def impact_computation_strategy(self, value, /):
     @lazy_property
     def E0H0V0(self):
         return self.impact_computation_strategy.compute_impacts(
-            self.snapshot0,
-            self.snapshot1,
-            (0, 0, 0),
-            self.risk_transf_attach,
-            self.risk_transf_cover,
-            self.calc_residual,
+            self.snapshot0, self.snapshot1, (0, 0, 0)
         )
 
     @lazy_property
@@ -313,42 +302,24 @@ def E1H0V0(self):
             self.snapshot0,
             self.snapshot1,
             (1, 0, 0),
-            self.risk_transf_attach,
-            self.risk_transf_cover,
-            self.calc_residual,
         )
 
     @lazy_property
     def E0H1V0(self):
         return self.impact_computation_strategy.compute_impacts(
-            self.snapshot0,
-            self.snapshot1,
-            (0, 1, 0),
-            self.risk_transf_attach,
-            self.risk_transf_cover,
-            self.calc_residual,
+            self.snapshot0, self.snapshot1, (0, 1, 0)
         )
 
     @lazy_property
     def E1H1V0(self):
         return self.impact_computation_strategy.compute_impacts(
-            self.snapshot0,
-            self.snapshot1,
-            (1, 1, 0),
-            self.risk_transf_attach,
-            self.risk_transf_cover,
-            self.calc_residual,
+            self.snapshot0, self.snapshot1, (1, 1, 0)
         )
 
     @lazy_property
     def E0H0V1(self):
         return self.impact_computation_strategy.compute_impacts(
-            self.snapshot0,
-            self.snapshot1,
-            (0, 0, 1),
-            self.risk_transf_attach,
-            self.risk_transf_cover,
-            self.calc_residual,
+            self.snapshot0, self.snapshot1, (0, 0, 1)
         )
 
     @lazy_property
@@ -357,9 +328,6 @@ def E1H0V1(self):
             self.snapshot0,
             self.snapshot1,
             (1, 0, 1),
-            self.risk_transf_attach,
-            self.risk_transf_cover,
-            self.calc_residual,
         )
 
     @lazy_property
@@ -368,9 +336,6 @@ def E0H1V1(self):
             self.snapshot0,
             self.snapshot1,
             (0, 1, 1),
-            self.risk_transf_attach,
-            self.risk_transf_cover,
-            self.calc_residual,
         )
 
     @lazy_property
@@ -379,47 +344,10 @@ def E1H1V1(self):
             self.snapshot0,
             self.snapshot1,
             (1, 1, 1),
-            self.risk_transf_attach,
-            self.risk_transf_cover,
-            self.calc_residual,
         )
 
     ###############################
 
-    ######## Risk transfer ########
-
-    @property
-    def risk_transf_attach(self):
-        return self._risk_transfer_attach
-
-    @risk_transf_attach.setter
-    def risk_transf_attach(self, value, /):
-        self._risk_transfer_attach = value
-        self._reset_impact_data()
-
-    @property
-    def risk_transf_cover(self):
-        return self._risk_transfer_cover
-
-    @risk_transf_cover.setter
-    def risk_transf_cover(self, value, /):
-        self._risk_transfer_cover = value
-        self._reset_impact_data()
-
-    @property
-    def calc_residual(self):
-        return self._calc_residual
-
-    @calc_residual.setter
-    def calc_residual(self, value, /):
-        if not isinstance(value, bool):
-            raise ValueError("Not a boolean")
-
-        self._calc_residual = value
-        self._reset_impact_data()
-
-    ###############################
-
     ### Impact Matrices arrays ####
 
     @lazy_property
@@ -826,9 +754,6 @@ def apply_measure(self, measure: Measure):
             self.time_points,
             self.interpolation_strategy,
             self.impact_computation_strategy,
-            self.risk_transf_attach,
-            self.risk_transf_cover,
-            self.calc_residual,
         )
 
         risk_period.measure = measure

climada/trajectories/test/test_risk_trajectory.py

@@ -89,9 +89,6 @@ def test_init_basic(self):
         self.assertEqual(rt.start_date, self.mock_snapshot1.date)
         self.assertEqual(rt.end_date, self.mock_snapshot3.date)
         self.assertIsNone(rt.risk_disc)
-        self.assertIsNone(rt._risk_transf_cover)
-        self.assertIsNone(rt._risk_transf_attach)
-        self.assertTrue(rt._calc_residual)
         self.assertEqual(rt._interpolation_strategy, self.mock_interpolation_strategy)
         self.assertEqual(
             rt._impact_computation_strategy, self.mock_impact_computation_strategy
@@ -110,9 +107,6 @@ def test_init_with_custom_params(self):
             interval_freq="MS",
             all_groups_name="CustomAll",
             risk_disc=mock_disc,
-            risk_transf_cover=0.5,
-            risk_transf_attach=0.1,
-            calc_residual=False,
             interpolation_strategy=Mock(),
             impact_computation_strategy=Mock(),
         )
@@ -121,7 +115,6 @@ def test_init_with_custom_params(self):
         self.assertEqual(rt.risk_disc, mock_disc)
         self.assertEqual(rt._risk_transf_cover, 0.5)
         self.assertEqual(rt._risk_transf_attach, 0.1)
-        self.assertFalse(rt._calc_residual)
 
     ## Test Properties (`@property` and `@setter`)
     def test_default_rp_getter_setter(self):
@@ -143,24 +136,6 @@ def test_default_rp_setter_validation(self):
         with self.assertRaises(ValueError):
             rt.default_rp = [10, "not an int"]
 
-    @patch("climada.trajectories.risk_trajectory.RiskTrajectory._reset_metrics")
-    def test_risk_transf_cover_setter(self, mock_reset_metrics):
-        rt = RiskTrajectory(self.snapshots_list)
-        rt._risk_period_up_to_date = True  # Simulate old state
-        rt.risk_transf_cover = 0.5
-        self.assertEqual(rt._risk_transf_cover, 0.5)
-        self.assertFalse(rt._risk_period_up_to_date)  # Should be set to False
-        mock_reset_metrics.assert_called_once()  # Should call reset_metrics
-
-    @patch("climada.trajectories.risk_trajectory.RiskTrajectory._reset_metrics")
-    def test_risk_transf_attach_setter(self, mock_reset_metrics):
-        rt = RiskTrajectory(self.snapshots_list)
-        rt._risk_period_up_to_date = True  # Simulate old state
-        rt.risk_transf_attach = 0.1
-        self.assertEqual(rt._risk_transf_attach, 0.1)
-        self.assertFalse(rt._risk_period_up_to_date)  # Should be set to False
-        mock_reset_metrics.assert_called_once()  # Should call reset_metrics
-
     # --- Test Core Risk Period Calculation (`risk_periods` property and `_calc_risk_periods`) ---
     # This is critical as many other methods depend on it.