Skip to content

added food scaling from land function#104

Merged
OttaviaTr merged 10 commits into
FixOurFood:ffc_modelfrom
OttaviaTr:ffc_model
Jun 5, 2026
Merged

added food scaling from land function#104
OttaviaTr merged 10 commits into
FixOurFood:ffc_modelfrom
OttaviaTr:ffc_model

Conversation

@OttaviaTr

Copy link
Copy Markdown

Added food scaling from land function #101

@jucordero

Copy link
Copy Markdown
Collaborator

Hi @OttaviaTr! This looks good.
I'll add a few comments and suggestions below, but the core of the function seems exactly like what we had in mind

Comment thread agrifoodpy/food/model.py Outdated
Comment thread agrifoodpy/food/model.py Outdated
Comment thread agrifoodpy/food/model.py Outdated
Comment thread agrifoodpy/food/model.py Outdated
@jucordero

Copy link
Copy Markdown
Collaborator

While we don't enforce it too strictly, we try to limit line length to 79 characters or less (See PEP8)

Other projects are even more strict and block merging if a PEP8 style test is not passed.

In this case only docstrings seem to be above the limit, so it is just a matter of adding line breaks to the longer parameter descriptions

@jucordero jucordero linked an issue May 21, 2026 that may be closed by this pull request
OttaviaTr and others added 5 commits May 22, 2026 10:25
multiple sum

Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>
Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>
removed land_dimension option

Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>
Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>
Comment thread agrifoodpy/food/model.py Outdated
Comment thread agrifoodpy/food/model.py Outdated
Comment thread agrifoodpy/food/model.py Outdated
OttaviaTr and others added 4 commits June 3, 2026 09:25
Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>
Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>
Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>
@jucordero

Copy link
Copy Markdown
Collaborator

Hi @OttaviaTr, It all looks good to me.
Please merge this by clicking in "Squash and merge"
This will convert all your commits into a single commit that will merge into the ffc_model branch.

If at any point we need to make amendments or add more functionality to these functions, we will need a new branch in your fork and a new PR.

@OttaviaTr OttaviaTr merged commit d390be2 into FixOurFood:ffc_model Jun 5, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[FFC] Production scaling from land change

2 participants