VeniVidiVici
/
invest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mild improvements to validation. 

RE:#722
This commit is contained in:
James Douglass 2023-01-23 16:25:48 -08:00
parent 90925c5e67
commit 2262ae5d54
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/natcap/invest/urban_nature_access.py
View File

@ -219,6 +219,7 @@ ARGS_SPEC = {
'aggregate_by_pop_group': {
'type': 'boolean',
'name': 'Aggregate by population groups',
'required': False,
'about': gettext(
'Whether to aggregate statistics by population group '
'within each administrative unit. If selected, population '
@ -232,6 +233,7 @@ ARGS_SPEC = {
'name': 'uniform search radius',
'units': u.m,
'expression': 'value > 0',
'required': f'search_radius_mode == "{RADIUS_OPT_UNIFORM}"',
'about': gettext(
'The search radius to use when running the model under a '
'uniform search radius'),
@ -239,6 +241,7 @@ ARGS_SPEC = {
'population_group_radii_table': {
'name': 'population group radii table',
'type': 'csv',
'required': f'search_radius_mode == "{RADIUS_OPT_POP_GROUP}"',
'columns': {
"pop_group": {
"type": "ratio",
@ -401,6 +404,8 @@ def execute(args):
decay_function = args['decay_function']
LOGGER.info(f'Using decay function {decay_function}')
aggregate_by_pop_groups = args.get('aggregate_by_pop_group', False)
# Align the population raster to the LULC.
lulc_raster_info = pygeoprocessing.get_raster_info(
args['lulc_raster_path'])
@ -453,8 +458,8 @@ def execute(args):
proportional_population_tasks = {}
pop_group_proportion_paths = {}
pop_group_proportion_tasks = {}
if (args['search_radius_mode'] == RADIUS_OPT_POP_GROUP or
args.get('aggregate_by_pop_group', False)):
if (args['search_radius_mode'] == RADIUS_OPT_POP_GROUP
or aggregate_by_pop_groups):
aoi_reprojection_task.join()
split_population_fields = list(
filter(lambda x: re.match(POP_FIELD_REGEX, x),
@ -1021,7 +1026,7 @@ def execute(args):
supply_population_tasks = []
pop_paths = [(None, file_registry['aligned_population'])]
if args.get('aggregate_by_pop_group', False):
if aggregate_by_pop_groups:
pop_paths.extend(list(proportional_population_paths.items()))
for pop_group, proportional_pop_path in pop_paths:
@ -1071,8 +1076,7 @@ def execute(args):
'undersupplied_population'],
'oversupplied_populations_path': file_registry[
'oversupplied_population'],
'include_pop_groups':
args.get('aggregate_by_pop_group', False),
'include_pop_groups': aggregate_by_pop_groups,
},
task_name=(
'Aggregate supply-demand to admin units (single rasters)'),

8
tests/test_urban_nature_access.py
View File

@ -744,6 +744,7 @@ class UNATests(unittest.TestCase):
self.assertIn(valid_mode_string, str(cm.exception))
def test_square_pixels(self):
"""UNA: Assert we can make square pixels as expected."""
from natcap.invest import urban_nature_access
raster_path = os.path.join(self.workspace_dir, 'raster.tif')
@ -759,3 +760,10 @@ class UNATests(unittest.TestCase):
computed_pixel_size = (
urban_nature_access._square_off_pixels(raster_path))
self.assertEqual(computed_pixel_size, expected_pixel_size)
def test_validate(self):
"""UNA: Basic test for validation."""
from natcap.invest import urban_nature_access
args = _build_model_args(self.workspace_dir)
args['search_radius_mode'] = urban_nature_access.RADIUS_OPT_GREENSPACE
self.assertEqual(urban_nature_access.validate(args), [])