Merge branch 'feature/risk_trajectory' into feature/cb_refactoring

Author: spjuhel

CHANGELOG.md

@@ -21,9 +21,6 @@ Removed:
 
 - `ImpactFunc` and `ImpactFuncSet` now support equality comparisons via `==` [#1027](https://github.com/CLIMADA-project/climada_python/pull/1027)
 
-- `climada.entity.impact_funcs.base.ImpactFunc.__eq__` method
-- `climada.entity.impact_funcs.impact_func_set.ImpactFuncSet.__eq__` method
-
 ### Changed
 
 - `Hazard.local_exceedance_intensity`, `Hazard.local_return_period` and `Impact.local_exceedance_impact`, `Impact.local_return_period`, using the `climada.util.interpolation` module: New default (no binning), binning on decimals, and faster implementation [#1012](https://github.com/CLIMADA-project/climada_python/pull/1012)

climada/trajectories/risk_trajectory.py

@@ -25,6 +25,7 @@
 import itertools
 import logging
 
+import matplotlib.dates as mdates
 import matplotlib.pyplot as plt
 import pandas as pd
 
@@ -344,9 +345,10 @@ def eai_metrics(self, npv: bool = True, **kwargs):
         This computation may become quite expensive for big areas with high resolution.
 
         """
-        return self._compute_metrics(
+        df = self._compute_metrics(
             npv=npv, metric_name="eai", metric_meth="calc_eai_gdf", **kwargs
         )
+        return df
 
     def aai_metrics(self, npv: bool = True, **kwargs):
         """Return the average annual impacts for each date.
@@ -567,6 +569,7 @@ def plot_per_date_waterfall(
         ax=None,
         start_date: datetime.date | None = None,
         end_date: datetime.date | None = None,
+        figsize=(12, 6),
     ):
         """Plot a waterfall chart of risk components over a specified date range.
 
@@ -596,7 +599,9 @@ def plot_per_date_waterfall(
         compared to the risk associated with future exposure and present hazard.
         """
         if ax is None:
-            _, ax = plt.subplots(figsize=(12, 6))
+            fig, ax = plt.subplots(figsize=figsize)
+        else:
+            fig = ax.figure  # get parent figure from the axis
         start_date = self.start_date if start_date is None else start_date
         end_date = self.end_date if end_date is None else end_date
         risk_component = self._calc_waterfall_plot_data(
@@ -611,16 +616,30 @@ def plot_per_date_waterfall(
                 "interaction contribution",
             ]
         ]
-        risk_component.plot(ax=ax, kind="bar", stacked=True)
+        # risk_component.plot(x="date", ax=ax, kind="bar", stacked=True)
+        ax.stackplot(
+            risk_component.index,
+            [risk_component[col] for col in risk_component.columns],
+            labels=risk_component.columns,
+        )
+        ax.legend()
+        # bottom = [0] * len(risk_component)
+        # for col in risk_component.columns:
+        #     bottom =  [b + v for b, v in zip(bottom, risk_component[col])]
         # Construct y-axis label and title based on parameters
         value_label = "USD"
-        title_label = (
-            f"Risk between {start_date} and {end_date} (Annual Average impact)"
-        )
+        title_label = f"Risk between {start_date} and {end_date} (Average impact)"
+
+        locator = mdates.AutoDateLocator()
+        formatter = mdates.ConciseDateFormatter(locator)
+
+        ax.xaxis.set_major_locator(locator)
+        ax.xaxis.set_major_formatter(formatter)
 
         ax.set_title(title_label)
         ax.set_ylabel(value_label)
-        return ax
+        ax.set_ylim(0.0, 1.1 * ax.get_ylim()[1])
+        return fig, ax
 
     def plot_waterfall(
         self,
@@ -722,10 +741,11 @@ def plot_waterfall(
 
         # Construct y-axis label and title based on parameters
         value_label = "USD"
-        title_label = f"Risk at {start_date} and {end_date} (Annual Average impact)"
+        title_label = f"Risk at {start_date} and {end_date} (Average impact)"
 
         ax.set_title(title_label)
         ax.set_ylabel(value_label)
+        ax.set_ylim(0.0, 1.1 * ax.get_ylim()[1])
         ax.tick_params(
             axis="x",
             labelrotation=90,

climada/trajectories/riskperiod.py

@@ -685,12 +685,10 @@ def calc_eai_gdf(self):
         df = df.reset_index().melt(
             id_vars="date", var_name="coord_id", value_name="risk"
         )
-        eai_gdf = self.snapshot0.exposure.gdf
+        eai_gdf = self.snapshot0.exposure.gdf[["group_id"]]
         eai_gdf["coord_id"] = eai_gdf.index
         eai_gdf = eai_gdf.merge(df, on="coord_id")
-        eai_gdf = eai_gdf.rename(
-            columns={"group_id": "group", "value": "exposure_value"}
-        )
+        eai_gdf = eai_gdf.rename(columns={"group_id": "group"})
         eai_gdf["metric"] = "eai"
         eai_gdf["measure"] = self.measure.name if self.measure else "no_measure"
         return eai_gdf