Changes to food scaling function#98
Merged
jucordero merged 7 commits intoFixOurFood:ffc_modelfrom May 5, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR extends balanced_scaling to support (a) keeping totals constant with optional “padding” items and (b) scaling based on pre-converted quantities via a conversion_arr. It also introduces a new pipeline-compatible helper (scale_above_threshold) intended to support “food_waste”-style threshold scaling.
Changes:
- Add
conversion_arrsupport tobalanced_scaling(convert → scale → convert back). - Add
padding_items/ non-finite handling tobalanced_scalingconstant-balancing logic. - Add
scale_above_thresholdpipeline node and expand tests for a no-Yearcase.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 10 comments.
| File | Description |
|---|---|
agrifoodpy/food/model.py |
Extends balanced_scaling (conversion + constant balancing changes) and adds new scale_above_threshold pipeline node. |
agrifoodpy/food/tests/test_model.py |
Adds a balanced_scaling test case for datasets without a Year dimension and adjusts expected outputs. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+387
to
+388
| @pipeline_node(["fbs", "scale", "element", "threshold", "conversion_arr"]) | ||
| def scale_above_threshold( |
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This pull requests partially addresses #93 by extending the functionality of
balanced_scaling.To-do list
food_wastefunctionalityChecklist