Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Urban Nature Access - Split radii by population groups #1150

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
25f353d
Starting some logic to parse and operate on search radii per populati…
phargogh Nov 5, 2022
d0bb1ef
Merge branch 'main' of https://github.com/natcap/invest into feature/…
phargogh Nov 8, 2022
2d6482a
Intermediate commit for UNA split population and radii.
phargogh Nov 19, 2022
729bff2
Merge branch 'main' of https://github.com/natcap/invest into feature/…
phargogh Jan 5, 2023
d09abb2
Merge branch 'main' of https://github.com/natcap/invest into feature/…
phargogh Jan 5, 2023
8dfa9da
Merge branch 'feature/722-urban-nature-access-model' of github.com:ph…
phargogh Jan 5, 2023
8d117cf
Merge branch 'feature/722-urban-nature-access-model' of github.com:ph…
phargogh Jan 5, 2023
8f015c9
Correcting a minor indentation issue.
phargogh Jan 5, 2023
824377b
Slight refactor of 2 tasks into a loop.
phargogh Jan 9, 2023
c563611
Updating MODEL_SPEC for new radius mode parameter.
phargogh Jan 9, 2023
7d2a6f9
Work in progress - rewriting execute.
phargogh Jan 10, 2023
64fc7e7
Continuing execute rewrite. RE:#722
phargogh Jan 10, 2023
273b7cb
Implementing search radius option 2 all in execute.
phargogh Jan 10, 2023
54a2d3e
Improving some logging based on the optional module selected.
phargogh Jan 11, 2023
56324f3
Completing split pop,radii greenspace supply.
phargogh Jan 11, 2023
32f12ca
Adding greenspace supply/demand budget steps.
phargogh Jan 12, 2023
c327c01
Adding over/undersupply by groups.
phargogh Jan 12, 2023
171b4b6
Various minor bugfixes revealed through testing.
phargogh Jan 12, 2023
b54d5b1
Refactoring construction of an iterable.
phargogh Jan 12, 2023
68a5abd
Refactoring vector authoring away from radius mode.
phargogh Jan 12, 2023
0449350
Adding greenspace over/undersupply to core model.
phargogh Jan 12, 2023
677d13e
Adding a docstring for uniform supply/demand vector creation.
phargogh Jan 12, 2023
0d25f37
Unifying some rasters that are shared between modes.
phargogh Jan 12, 2023
e967fa1
Renaming a function, attempt at clarity. RE:#722
phargogh Jan 12, 2023
2efd2a2
Defining a separate option for agg. by pop groups.
phargogh Jan 12, 2023
bcefb98
Refactoring a few tasks related to split populations.
phargogh Jan 13, 2023
d720960
Various bugfixes to the split pop radii module.
phargogh Jan 13, 2023
e763ab2
Writing a test for split population radii.
phargogh Jan 13, 2023
5ef4533
Further work on split population radii module.
phargogh Jan 14, 2023
dd1677c
Cleaning up split pop/radii test.
phargogh Jan 14, 2023
8cbb202
Removing deprecated code.
phargogh Jan 14, 2023
1a45ddd
Further removal of deprecated code. RE:#722
phargogh Jan 14, 2023
3f5dec0
Light linting, adding 2 docstrings.
phargogh Jan 14, 2023
6c5f052
Renaming a function for clarity and brevity.
phargogh Jan 18, 2023
82069c2
Fixing an f-string filepath.
phargogh Jan 18, 2023
a81abb1
Fiddling with overlap log messages. RE:#722
phargogh Jan 18, 2023
8bc0ad7
Testing greenspace supply across modes.
phargogh Jan 20, 2023
0c853db
Fixing a weighted sum in pop group radius mode.
phargogh Jan 20, 2023
52433d3
Adding a test for an invalid search radius.
phargogh Jan 21, 2023
520bb4a
Adding a test for squaring off pixels.
phargogh Jan 21, 2023
bc72152
Adding a test for normalized dichotomous kernel.
phargogh Jan 21, 2023
ead918d
Adding a test for normalized dichotomous kernel.
phargogh Jan 21, 2023
90014eb
Tidying up docstrings and MODEL_SPEC. RE:#722
phargogh Jan 21, 2023
eeaa06d
Removing some TODOs. RE:#722
phargogh Jan 21, 2023
66ae602
Merge branch 'main' of https://github.com/natcap/invest into feature/…
phargogh Jan 21, 2023
f3ae86a
Adding new UNA args to the workbench. RE:#722
phargogh Jan 21, 2023
31a825c
Starting power function kernel.
phargogh Jan 23, 2023
7bcec45
Removing the pip-only restriction on docs packages.
phargogh Jan 23, 2023
8ec214a
Noting change in HISTORY. RE:#1151
phargogh Jan 23, 2023
3a0b301
Merge branch 'feature/urban-nature-access' of https://github.com/natc…
phargogh Jan 23, 2023
0110f0e
Merge pull request #1152 from phargogh/bugfix/1151-windows-build-fail…
davemfish Jan 23, 2023
e5acbb8
Updating kernels to match the design doc.
phargogh Jan 23, 2023
90925c5
Defining the beta parameter.
phargogh Jan 24, 2023
2262ae5
Mild improvements to validation.
phargogh Jan 24, 2023
e19aa61
Adding a MODEL_SPEC parameter I had forgotten.
phargogh Jan 24, 2023
2863df6
Adding UNA tag to the known model name tags.
phargogh Jan 24, 2023
bd42f6b
Merge branch 'main' of https://github.com/natcap/invest into feature/…
phargogh Jan 24, 2023
38861b1
Various fixes when running through the UI.
phargogh Jan 24, 2023
8527c9d
Fixing a syntax issue encountered in python 3.8.
phargogh Jan 24, 2023
9e8fc1b
Minor fixes to the MODEL_SPEC. RE:#722
phargogh Jan 25, 2023
629c29c
Align LULC and population rasters to the intersection of their bboxes.
phargogh Jan 25, 2023
83dee9d
Adding mutual masking of nodata between LULC and population rasters.
phargogh Jan 25, 2023
2ff07e4
Fixing a units issue in the args spec for pop raster.
phargogh Jan 26, 2023
e38587a
Update src/natcap/invest/urban_nature_access.py
phargogh Jan 27, 2023
48e67f5
Update src/natcap/invest/urban_nature_access.py
phargogh Jan 27, 2023
c75ec65
Noting details of conditional requirement. RE:#722
phargogh Jan 30, 2023
3ed0882
Sanitizing an about string in RST, adding pop_group description. RE:#722
phargogh Jan 30, 2023
f71dd92
Clarifying AOIs as admin boundaries. RE:#722
phargogh Jan 30, 2023
c2ae69f
Using Admin Boundaries instead of AOIs. RE:#722
phargogh Jan 30, 2023
89b4e89
Fixing a filepath and bumping the UG to the in-progress PR. RE:#722
phargogh Jan 30, 2023
ae88428
Minor tweaks. RE:#722
phargogh Jan 31, 2023
e514fba
Fixing string comparison where it should be. RE:#722
phargogh Jan 31, 2023
77fa949
Fixing another validation string comparison issue.
phargogh Jan 31, 2023
b9d7882
Adding a missing docstring entry. RE:#722
phargogh Jan 31, 2023
1d8888e
Renaming mutual mask to valid pixels mask. RE:#722
phargogh Jan 31, 2023
de4e315
Correcting a dependent task list. RE:#722
phargogh Jan 31, 2023
75a94c4
Being a little more careful about what needs a task join(). RE:#722
phargogh Jan 31, 2023
9a27ea3
Using utils.array_equals_nodata() instead of isclose() for consistenc…
phargogh Jan 31, 2023
cc68dd1
Fixing block reading in a simple iterblocks call. RE:#722
phargogh Jan 31, 2023
f7abc41
Fixing some critical issues in weighted sum. RE:#722
phargogh Jan 31, 2023
f0d78a5
Finishing a comment. RE:#722
phargogh Jan 31, 2023
868213d
Forcing cleanup of a few gdal objects. RE:#722
phargogh Jan 31, 2023
f7dc9ac
Merge branch 'feature/722-urban-nature-access-model-split-pop-and-rad…
phargogh Jan 31, 2023
c91eaa6
Adding a test for the power kernel and removing unused import.
phargogh Feb 3, 2023
238b070
Adding a test for exponential decay.
phargogh Feb 3, 2023
84f9d47
Adding a test for the gaussian kernel.
phargogh Feb 3, 2023
98eae1c
Bumping the UG repo rev for the draft UNA chapter.
phargogh Feb 3, 2023
a9f34bf
Renaming greenspace_budget to greenspace_balance.
phargogh Feb 7, 2023
4ca9940
Correcting names, bumping UG, moving a file to outputs.
phargogh Feb 7, 2023
518445a
Commenting out power function stuff.
phargogh Feb 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@

Unreleased Changes
------------------
* General
* During builds of the InVEST documentation, the packages
``sphinx-rtd-theme`` and ``sphinx-reredirects`` will be pulled from
conda-forge instead of PyPI.
(`#1151 <https://github.com/natcap/invest/issues/1151>`_)
* Workbench
* Added tooltips to the model tabs so that they can be identified even when
several tabs are open (`#1071 <https://github.com/natcap/invest/issues/1088>`_)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GIT_TEST_DATA_REPO_REV := f5e651c9ba0a012dc033b9c1d12d51e42f6f87b0

GIT_UG_REPO := https://github.com/natcap/invest.users-guide
GIT_UG_REPO_PATH := doc/users-guide
GIT_UG_REPO_REV := 90b0e96e717894a0fe9e9ef701e1585e5cb8649f
GIT_UG_REPO_REV := 3945cfb44b272358b45acd3a1f625f45bc609d64

ENV = "./env"
ifeq ($(OS),Windows_NT)
Expand Down
4 changes: 2 additions & 2 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Sphinx>=1.3.1,!=1.7.1
sphinx-rtd-theme # pip-only
sphinx-rtd-theme
sphinx-intl
sphinx-reredirects # pip-only
sphinx-reredirects
3 changes: 2 additions & 1 deletion src/natcap/invest/spec_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,8 @@ def describe_arg_from_spec(name, spec):

# Nested args may not have an about section
if 'about' in spec:
about_string = f': {spec["about"]}'
sanitized_about_string = spec["about"].replace("_", "\\_")
about_string = f': {sanitized_about_string}'
else:
about_string = ''

Expand Down
1,661 changes: 1,188 additions & 473 deletions src/natcap/invest/urban_nature_access.py

Large diffs are not rendered by default.

Loading