small corrections

Author: gabrielaznar

climada/entity/exposures/base.py

@@ -234,14 +234,11 @@ def remove(self, exp_id):
             return
 
         for (var_name, var_val) in self.__dict__.items():
-            if var_name in self.vars_oblig:
-                if isinstance(var_val, np.ndarray) and var_val.ndim == 1:
-                    setattr(self, var_name, np.delete(var_val, pos_del))
-                elif isinstance(var_val, np.ndarray) and var_val.ndim == 2:
-                    setattr(self, var_name, np.delete(var_val, pos_del, axis=0))
-            else:
-                if isinstance(var_val, np.ndarray) and var_val.size:
-                    setattr(self, var_name, np.delete(var_val, pos_del))
+            if isinstance(var_val, np.ndarray) and var_val.ndim == 1 \
+            and var_val.size:
+                setattr(self, var_name, np.delete(var_val, pos_del))
+            elif isinstance(var_val, np.ndarray) and var_val.ndim == 2:
+                setattr(self, var_name, np.delete(var_val, pos_del, axis=0))
 
         old_assigned = self.assigned.copy()
         for key, val in old_assigned.items():
@@ -285,9 +282,10 @@ def append(self, exposures):
             elif isinstance(var_val, np.ndarray) and var_val.ndim == 2:
                 setattr(self, var_name, np.append(var_val, haz_val, axis=0). \
                         astype(var_val.dtype, copy=False))
-            elif isinstance(var_val, list) and len(var_val):
+            elif isinstance(var_val, list) and var_val:
                 setattr(self, var_name, var_val + haz_val)
 
+        self.coord = self._coord
         for (ass_haz, ass) in exposures.assigned.items():
             if ass_haz in self.assigned:
                 self.assigned[ass_haz] = np.append(
@@ -364,12 +362,12 @@ def get_def_file_var_names(src_format):
     @property
     def lat(self):
         """ Get latitude from coord array """
-        return self.coord[:, 0]
+        return self._coord[:, 0]
 
     @property
     def lon(self):
         """ Get longitude from coord array """
-        return self.coord[:, 1]
+        return self._coord[:, 1]
 
     @property
     def coord(self):

climada/hazard/base.py

@@ -219,7 +219,7 @@ def select(self, date=None, orig=None):
                 setattr(haz, var_name, var_val[sel_idx])
             elif isinstance(var_val, sparse.csr_matrix):
                 setattr(haz, var_name, var_val[sel_idx, :])
-            elif isinstance(var_val, list) and len(var_val):
+            elif isinstance(var_val, list) and var_val:
                 setattr(haz, var_name, [var_val[idx] for idx in sel_idx])
             else:
                 setattr(haz, var_name, var_val)
@@ -241,7 +241,7 @@ def local_exceedance_inten(self, return_periods=(25, 50, 100, 250)):
         inten_stats = np.zeros((len(return_periods), len(cen_pos)))
         chunksize = min(len(cen_pos), 1000)
         for cen_idx, inten_loc in enumerate(Pool().map(self._loc_return_inten,\
-            itertools.repeat(return_periods, len(cen_pos)), cen_pos, \
+            itertools.repeat(np.array(return_periods), len(cen_pos)), cen_pos,\
             chunksize=chunksize)):
             inten_stats[:, cen_idx] = inten_loc
         return inten_stats

climada/test/test_exposures.py

@@ -136,12 +136,12 @@ def test_set_country_pass(self):
         self.assertEqual(np.unique(ent.region_id).size, 2)
         self.assertEqual(np.unique(ent.impact_id).size, 1)
         self.assertEqual(ent.ref_year, 2013)
-        self.assertIn('Switzerland 2013 GDP: ', ent.tag.description[0])
-        self.assertIn('Germany 2013 GDP: ', ent.tag.description[1])
-        self.assertIn('income group: 4', ent.tag.description[0])
-        self.assertIn('income group: 4', ent.tag.description[1])
-        self.assertIn('F182013.v4c_web.stable_lights.avg_vis.p', ent.tag.file_name[0])
-        self.assertIn('F182013.v4c_web.stable_lights.avg_vis.p', ent.tag.file_name[1])
+        self.assertIn('Switzerland 2013 GDP: ', ent.tag.description)
+        self.assertIn('Germany 2013 GDP: ', ent.tag.description)
+        self.assertIn('income group: 4', ent.tag.description)
+        self.assertIn('income group: 4', ent.tag.description)
+        self.assertIn('F182013.v4c_web.stable_lights.avg_vis.p', ent.tag.file_name)
+        self.assertIn('F182013.v4c_web.stable_lights.avg_vis.p', ent.tag.file_name)
 
     def test_cut_nl_nasa_1_pass(self):
         """Test cut_nl_nasa situation 2->3->4->5."""
@@ -171,8 +171,8 @@ def test_cut_nl_nasa_1_pass(self):
                         in_lon, in_lat_nb, in_lon_nb)
 
             self.assertEqual(nl_mat.shape, (2, 1))
-            self.assertEqual(nl_mat.tocsr()[0, 0], 100.0)
-            self.assertEqual(nl_mat.tocsr()[1, 0], 101.0)
+            self.assertEqual(nl_mat.tocsr()[0, 0], 101.0)
+            self.assertEqual(nl_mat.tocsr()[1, 0], 100.0)
 
             idx_info[0] = 4
             idx_info[1] = 3