Feature/custom grid litpop #1022
Conversation
| @@ -108,6 +109,7 @@ def from_countries( | |||
| reference_year=DEF_REF_YEAR, | |||
| gpw_version=GPW_VERSION, | |||
| data_dir=SYSTEM_DIR, | |||
| target_grid=None | |||
There was a problem hiding this comment.
Can you please add the docstring for this new variable?
| @@ -290,6 +298,7 @@ def from_nightlight_intensity( | |||
| res_arcsec=15, | |||
| reference_year=DEF_REF_YEAR, | |||
| data_dir=SYSTEM_DIR, | |||
| target_grid=None | |||
There was a problem hiding this comment.
idem, can you please add the docstring?
| @@ -374,6 +392,7 @@ def from_population( | |||
| reference_year=DEF_REF_YEAR, | |||
| gpw_version=GPW_VERSION, | |||
| data_dir=SYSTEM_DIR, | |||
| target_grid=None | |||
There was a problem hiding this comment.
idem, can you please add the docstring?
| @@ -457,6 +485,7 @@ def from_shape_and_countries( | |||
| reference_year=DEF_REF_YEAR, | |||
| gpw_version=GPW_VERSION, | |||
| data_dir=SYSTEM_DIR, | |||
| target_grid=None | |||
There was a problem hiding this comment.
idem, can you please add the docstring?
| @@ -144,31 +141,61 @@ def test_reproject_input_data_downsample(self): | |||
| def test_reproject_input_data_downsample_conserve_sum(self): | |||
There was a problem hiding this comment.
Can you add at least one test with a custom target grid?
There was a problem hiding this comment.
Ideally, you can write a loop to test all the exposed methods (from_countries , from_nightlight_intensity etc ...)
There was a problem hiding this comment.
Great addition! I have noted quickly some small elements to improve the code itself. I will do a review of the desired result of the new feature soon. I am currently wondering how the resampling of the original data (black marble and gpw) is done, how this affects the output results, and whether this is clear to the user at the moment.
|
So, the data is regridded using the method |
climada/test/test_litpop_integr.py
Outdated
| # TESTS = unittest.TestLoader().loadTestsFromTestCase(TestLitPopExposure) | ||
| # TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestAdmin1)) | ||
| # unittest.TextTestRunner(verbosity=2).run(TESTS) | ||
|
|
||
| TESTS = unittest.TestLoader().loadTestsFromTestCase(TestLitPopGridAlignment) |
There was a problem hiding this comment.
| # TESTS = unittest.TestLoader().loadTestsFromTestCase(TestLitPopExposure) | |
| # TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestAdmin1)) | |
| # unittest.TextTestRunner(verbosity=2).run(TESTS) | |
| TESTS = unittest.TestLoader().loadTestsFromTestCase(TestLitPopGridAlignment) | |
| TESTS = unittest.TestLoader().loadTestsFromTestCase(TestLitPopExposure) | |
| TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestAdmin1)) | |
| TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestLitPopGridAlignment)) |
|
The tests are currently failing due to a too-low test coverage. It means that many of the added lines of code are never tested for. This suggests that additional unit tests are required. Also, there are small linter errors that are easy to correct (trailing white spaces for instance). |
Changes proposed in this PR:
Added a target_grid option for creating LitPop exposures. If the argument is not provided, the grid is automatically defined based on the population dataset (GPW) or nightlight dataset (NASA Black Marble), depending on the resolution.
Removed outdated test case (test_reproject_input_data_odd_downsample), as it was no longer relevant with the new grid alignment method.
Added a new test (test_target_grid_alignment) to verify that the reprojection correctly aligns with the target grid.
Why this is needed:
PR Author Checklist
develop)PR Reviewer Checklist