fixes impfset change helper

Author: spjuhel

climada/entity/measures/helper.py

@@ -175,25 +175,40 @@ def impfset_change(impfset: ImpactFuncSet, **_kwargs) -> ImpactFuncSet:
             if impfset_modifier.new_impfset_path is not None
             else impfset
         )
-        funcs = changed_impfset.get_func(
-            impfset_modifier.haz_type, impfset_modifier.impf_id
-        )
+        if impfset_modifier.impf_ids is None or impfset_modifier.impf_ids == "all":
+            ids_to_change = impfset.get_ids(haz_type=impfset_modifier.haz_type)
+        elif isinstance(impfset_modifier.impf_ids, list):
+            ids_to_change = impfset_modifier.impf_ids
+        elif isinstance(impfset_modifier.impf_ids, (str, int)):
+            ids_to_change = [impfset_modifier.impf_ids]
+        else:
+            raise ValueError(
+                f"Impact function ids to changes are invalid: {impfset_modifier.impf_ids}"
+            )
+
+        funcs = changed_impfset.get_func(haz_type=impfset_modifier.haz_type)
         funcs = [funcs] if isinstance(funcs, ImpactFunc) else funcs
+
         for impf in funcs:
             # Apply Intensity Mod
-            if impf.id in impfset_modifier.impf_intensity_modifier:
-                mult, shift = impfset_modifier.impf_intensity_modifier[impf.id]
-                impf.intensity = np.maximum(impf.intensity * mult - shift, 0.0)
-
-            # Apply MDD Mod
-            if impf.id in impfset_modifier.impf_mdd_modifier:
-                mult, shift = impfset_modifier.impf_mdd_modifier[impf.id]
-                impf.mdd = np.maximum(impf.mdd * mult + shift, 0.0)
-
-            # Apply PAA Mod
-            if impf.id in impfset_modifier.impf_paa_modifier:
-                mult, shift = impfset_modifier.impf_paa_modifier[impf.id]
-                impf.paa = np.maximum(impf.paa * mult + shift, 0.0)
+            if impf.id in ids_to_change:
+                mult, add = (
+                    impfset_modifier.impf_int_mult,
+                    impfset_modifier.impf_int_add,
+                )
+                impf.intensity = impf.intensity * mult + add
+
+                mult, add = (
+                    impfset_modifier.impf_mdd_mult,
+                    impfset_modifier.impf_mdd_add,
+                )
+                impf.mdd = impf.mdd * mult + add
+
+                mult, add = (
+                    impfset_modifier.impf_paa_mult,
+                    impfset_modifier.impf_paa_add,
+                )
+                impf.paa = impf.paa * mult + add
 
         return changed_impfset
 

climada/entity/measures/measure_config.py

@@ -116,13 +116,13 @@ class ImpfsetModifierConfig(_ModifierConfig):
     """Configuration for impact function modifiers."""
 
     haz_type: str
-    impf_id: Optional[Union[int, str]] = 1
-    impf_mdd_mult: Optional[float] = 1.0
-    impf_mdd_add: Optional[float] = 0.0
-    impf_paa_mult: Optional[float] = 1.0
-    impf_paa_add: Optional[float] = 0.0
-    impf_int_mult: Optional[float] = 1.0
-    impf_int_add: Optional[float] = 0.0
+    impf_ids: Optional[Union[int, str, list[Union[int, str]]]] = None
+    impf_mdd_mult: float = 1.0
+    impf_mdd_add: float = 0.0
+    impf_paa_mult: float = 1.0
+    impf_paa_add: float = 0.0
+    impf_int_mult: float = 1.0
+    impf_int_add: float = 0.0
     new_impfset_path: Optional[str] = None
     """Excel filepath for new impfset."""
 
@@ -195,7 +195,6 @@ class CostIncomeConfig(_ModifierConfig):
     income_yearly_growth_rate: float = 0.0
     freq: str = "Y"
     custom_cash_flows: Optional[list[dict]] = None
-    # ^ serialized as list of {"date": "2024-01-01", "cost": -100.0, "income": 50.0}
 
     def to_cost_income(self) -> CostIncome:
         df = None
@@ -303,7 +302,6 @@ def from_row(
     ) -> "MeasureConfig":
         """Build a MeasureConfig from a legacy Excel row."""
         row_dict = row.to_dict()
-        impf_id = row_dict.get("impf_id", 1)
         return cls.from_dict(row_dict)