rename to select + use class there.

Author: gabrielaznar

climada/entity/exposures/base.py

@@ -261,7 +261,7 @@ def append(self, exposures):
             self.id[dup_id] = new_id
             new_id += 1
 
-    def select_region(self, reg_id):
+    def select(self, reg_id):
         """Return reference exposure of given region.
 
         Parameters:
@@ -277,7 +277,7 @@ def select_region(self, reg_id):
             LOGGER.info('No exposure with region id %s.', reg_id)
             return None
 
-        sel_exp = Exposures()
+        sel_exp = self.__class__()
         sel_exp.tag.file_name = self.tag.file_name
         sel_exp.tag.description = 'Region ' + str(reg_id)
         sel_exp.ref_year = self.ref_year

climada/entity/exposures/black_marble.py

@@ -117,7 +117,7 @@ def set_region(self, centroids,
         # TODO: accept input centroids as well
         raise NotImplementedError
 
-    def select_region(self, reg_id):
+    def select(self, reg_id):
         """ Select exposures with input region.
 
         Parameters:
@@ -128,10 +128,10 @@ def select_region(self, reg_id):
             Exposures
         """
         if isinstance(reg_id, int):
-            return Exposures.select_region(self, reg_id)
+            return Exposures.select(self, reg_id)
 
         try:
-            return Exposures.select_region(self, \
+            return Exposures.select(self, \
                 int(iso_cntry.get(reg_id).numeric))
         except KeyError:
             LOGGER.info('No country %s found.', reg_id)

climada/entity/exposures/test/test_base.py

@@ -347,12 +347,12 @@ def test_check_wrongId_fail(self):
         self.assertIn('There are exposures with the same identifier.',
                       cm.output[0])
 
-class TestSelectRegion(unittest.TestCase):
+class TestSelect(unittest.TestCase):
     """Test select_region from the Exposures class"""
     def test_sel_reg_pass(self):
         """Select region"""
         expo = good_exposures()
-        sel_expo = expo.select_region(1)
+        sel_expo = expo.select(1)
 
         self.assertEqual(sel_expo.value.size, 1)
         self.assertEqual(sel_expo.value[0], 1)
@@ -372,11 +372,12 @@ def test_sel_reg_pass(self):
         self.assertEqual(sel_expo.coord.shape[0], 1)
         self.assertEqual(sel_expo.coord[0, 0], 1)
         self.assertEqual(sel_expo.coord[0, 1], 2)
+        self.assertIsInstance(sel_expo, Exposures)
 
     def test_sel_wrong_pass(self):
         """Select non-existent region"""
         expo = good_exposures()
-        sel_expo = expo.select_region(5)
+        sel_expo = expo.select(5)
         self.assertEqual(sel_expo, None)
 
 # Execute Tests
@@ -386,5 +387,5 @@ def test_sel_wrong_pass(self):
 TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestReadParallel))
 TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestConstructor))
 TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestRemove))
-TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestSelectRegion))
+TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestSelect))
 unittest.TextTestRunner(verbosity=2).run(TESTS)

climada/entity/exposures/test/test_black_marble.py

@@ -86,19 +86,21 @@ def test_select_reg_pass(self):
         exp.region_id[:101] = exp.region_id[:101]*780
         exp.region_id[101:] = exp.region_id[101:]*894
 
-        sel_exp = exp.select_region('TTO')
+        sel_exp = exp.select('TTO')
         self.assertEqual(sel_exp.value.size, 101)
-        sel_exp = exp.select_region('Trinidad and Tobago')
+        sel_exp = exp.select('Trinidad and Tobago')
         self.assertEqual(sel_exp.value.size, 101)
-        sel_exp = exp.select_region('TT')
+        sel_exp = exp.select('TT')
         self.assertEqual(sel_exp.value.size, 101)
+        self.assertIsInstance(sel_exp, BlackMarble)
 
-        sel_exp = exp.select_region('ZMB')
+        sel_exp = exp.select('ZMB')
         self.assertEqual(sel_exp.value.size, 99)
-        sel_exp = exp.select_region('Zambia')
+        sel_exp = exp.select('Zambia')
         self.assertEqual(sel_exp.value.size, 99)
-        sel_exp = exp.select_region('ZM')
+        sel_exp = exp.select('ZM')
         self.assertEqual(sel_exp.value.size, 99)
+        self.assertIsInstance(sel_exp, BlackMarble)
 
     def test_select_not_included_pass(self):
         """Select country that is not contained."""
@@ -112,7 +114,7 @@ def test_select_not_included_pass(self):
         exp.region_id[:101] = exp.region_id[:101]*780
         exp.region_id[101:] = exp.region_id[101:]*894
 
-        sel_exp = exp.select_region('UGA')
+        sel_exp = exp.select('UGA')
         self.assertEqual(sel_exp, None)
 
     def test_select_wrong_fail(self):
@@ -127,7 +129,7 @@ def test_select_wrong_fail(self):
         exp.region_id[:101] = exp.region_id[:101]*780
         exp.region_id[101:] = exp.region_id[101:]*894
 
-        sel_exp = exp.select_region('TTU')
+        sel_exp = exp.select('TTU')
         self.assertEqual(sel_exp, None)
 
 class TestProvinces(unittest.TestCase):