contributions to objective working and tested #149
Merged
Conversation
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
tbittar
requested changes
Nov 7, 2025
src/gems/model/model.py
Outdated
| objective_operational_contribution: Optional[ExpressionNode] = None | ||
| objective_investment_contribution: Optional[ExpressionNode] = None | ||
| # Objective contribution approach | ||
| objective_contributions: Optional[Dict[str, ExpressionNode]] = None |
Collaborator
There was a problem hiding this comment.
Then you should be able to remove objective_operational_contribution and objective_investment_contribution. Besides objective_contributions should be an objet of type ObjectiveContributions which contains an id and an expression
| _is_objective_contribution_valid( | ||
| self, self.objective_investment_contribution | ||
| ) | ||
| # Validate each contribution if present |
Collaborator
There was a problem hiding this comment.
The comment is useless, code is sufficiently explicit
src/gems/model/parsing.py
Outdated
|
|
||
| # --- new field --- | ||
| objective_contributions: Optional[List[InputObjectiveContribution]] = Field( | ||
| default_factory=lambda: [], alias="objective-contributions" |
Collaborator
There was a problem hiding this comment.
Suggested change
| default_factory=lambda: [], alias="objective-contributions" | |
| default_factory=list, alias="objective-contributions" |
I think this does the same, but more consistent with previous code
src/gems/model/parsing.py
Outdated
| description: Optional[str] = None | ||
| extra_outputs: Optional[List[InputExtraOutput]] = None | ||
|
|
||
| @model_validator(mode="after") |
Collaborator
There was a problem hiding this comment.
I think we should explicitly enforce that the models have objective_contributions rather than objective . We do not ant to bother with backward compatibility that will complxify the code (this is not a production code)
…tive-contribution-). All corresponding libs adapted.
tbittar
approved these changes
Dec 19, 2025
| expression: generation >= nb_on * p_min | ||
| - id: Number of units variation | ||
| expression: nb_on = nb_on[t-1] + nb_start - nb_stop | ||
| expression: "nb_on = nb_on[t-1] + nb_start - nb_stop" |
| - id: Min down time | ||
| expression: sum(t-d_min_down + 1 .. t, nb_stop) <= nb_units_max[t-d_min_down] - nb_on | ||
| objective: expec(sum(cost * generation)) | ||
| expression: "sum(t-d_min_down + 1 .. t, nb_stop) <= nb_units_max[t-d_min_down] - nb_on" |
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.
No description provided.