change MeasureSet so that two measures with same name but different haz_type can coexist

Author: gabrielaznar

climada/entity/impact_funcs/base.py

@@ -86,7 +86,7 @@ def plot(self, graph=None):
         if self.name != str(self.id):
             title += ': %s' % self.name
         graph.add_subplot('Intensity (%s)' % self.intensity_unit, \
-                         'Percentage (%)', title)
+                         'Impact (%)', title)
         graph.add_curve(self.intensity, self.mdd * 100, 'b', label='MDD')
         graph.add_curve(self.intensity, self.paa * 100, 'r', label='PAA')
         graph.add_curve(self.intensity, self.mdd * self.paa * 100, 'k--', \

climada/entity/impact_funcs/impact_func_set.py

@@ -83,7 +83,7 @@ def __init__(self):
             >>> fun_1.paa = np.array([0, 1])
             >>> fun_1.mdd = np.array([0, 0.5])
             >>> imp_fun = ImpactFuncSet()
-            >>> imp_fun.add_func(fun_1)
+            >>> imp_fun.append(fun_1)
             >>> imp_fun.check()
 
             Read impact functions from file and checks consistency data.
@@ -96,10 +96,10 @@ def __init__(self):
     def clear(self):
         """Reinitialize attributes."""
         self.tag = Tag()
-        self._data = dict() # {hazard_id : {id:ImpactFunc}}
+        self._data = dict() # {hazard_type : {id:ImpactFunc}}
 
-    def add_func(self, func):
-        """Add a ImpactFunc. Overwrite existing if same id.
+    def append(self, func):
+        """Append a ImpactFunc. Overwrite existing if same id and haz_type.
 
         Parameters:
             func (ImpactFunc): ImpactFunc instance
@@ -111,17 +111,15 @@ def add_func(self, func):
             LOGGER.error("Input value is not of type ImpactFunc.")
             raise ValueError
         if not func.haz_type:
-            LOGGER.error("Input ImpactFunc's hazard type not set.")
-            raise ValueError
+            LOGGER.warning("Input ImpactFunc's hazard type not set.")
         if not func.id:
-            LOGGER.error("Input ImpactFunc's id not set.")
-            raise ValueError
+            LOGGER.warning("Input ImpactFunc's id not set.")
         if func.haz_type not in self._data:
             self._data[func.haz_type] = dict()
         self._data[func.haz_type][func.id] = func
 
     def remove_func(self, haz_type=None, fun_id=None):
-        """Remove vulenerability(ies) with provided hazard type and/or id.
+        """Remove impact function(s) with provided hazard type and/or id.
         If no input provided, all impact functions are removed.
 
         Parameters:
@@ -188,7 +186,7 @@ def get_hazard_types(self, fun_id=None):
             fun_id (int, optional): id of an impact function
 
         Returns:
-            list
+            list(str)
         """
         if fun_id is None:
             return list(self._data.keys())
@@ -257,12 +255,12 @@ def check(self):
                     raise ValueError
                 vul.check()
 
-    def append(self, impact_funcs):
+    def extend(self, impact_funcs):
         """Append impact functions of input ImpactFuncSet to current
-        ImpactFuncSet. Overwrite ImpactFunc if same id.
+        ImpactFuncSet. Overwrite ImpactFunc if same id and haz_type.
 
         Parameters:
-            impact_funcs (ImpactFuncSet): ImpactFuncSet instance to append
+            impact_funcs (ImpactFuncSet): ImpactFuncSet instance to extend
 
         Raises:
             ValueError
@@ -277,7 +275,7 @@ def append(self, impact_funcs):
         new_func = impact_funcs.get_func()
         for _, vul_dict in new_func.items():
             for _, vul in vul_dict.items():
-                self.add_func(vul)
+                self.append(vul)
 
     def plot(self, haz_type=None, fun_id=None):
         """Plot impact functions of selected hazard (all if not provided) and
@@ -385,7 +383,7 @@ def _get_hdf5_str(imp, idxs, file_name, var_name):
                 func.intensity = np.take(imp[var_names['var_name']['inten']], imp_rows)
                 func.mdd = np.take(imp[var_names['var_name']['mdd']], imp_rows)
                 func.paa = np.take(imp[var_names['var_name']['paa']], imp_rows)
-                self.add_func(func)
+                self.append(func)
         except KeyError as err:
             LOGGER.error("Not existing variable: %s", str(err))
             raise err
@@ -467,7 +465,7 @@ def _get_xls_funcs(dfr, var_names):
                 func.mdd = df_func[var_names['col_name']['mdd']].values
                 func.paa = df_func[var_names['col_name']['paa']].values
 
-                self.add_func(func)
+                self.append(func)
 
         except KeyError as err:
             LOGGER.error("Not existing variable: %s", str(err))