4 allow for conditional events#17
Open
Hackatro wants to merge 5 commits into
Open
Conversation
…PDL effects propagate only when their trigger condition is met fix(tick_writer): correct enabled flag refactor(agents): remove dead capacity_factor parameter
Sponn
reviewed
Jun 3, 2026
| """ | ||
| arg_scale = self.model.environment.get_shock_scale("farm_capacity_arg") | ||
| farm_capacity = 1.0 + arg_scale * (self.scenario.farm_capacity_arg - 1.0) | ||
| farm_capacity = self.model.environment.get_effective_value("farm_capacity_arg") |
Contributor
There was a problem hiding this comment.
why is this call different to the other ones?
Above env.get_effective_value is called, here it's self.model.environment.get_effective_value. What am I missing?
|
|
||
|
|
||
| def _move_split(self, upstream_list, share: float, capacity_factor: float = 1.0, shock_param: str = "", exclude_arg=False, exclude_usa=False): | ||
| def _move_split(self, upstream_list, share: float, param_name: str = "", exclude_arg=False, exclude_usa=False): |
Contributor
There was a problem hiding this comment.
explicit excludes need to be removed in the future
| # ------------------------------------------------------------------ | ||
|
|
||
| def _move(self, upstream, capacity_factor: float = 1.0, shock_param: str = ""): | ||
| def _move(self, upstream, param_name: str = ""): |
Contributor
There was a problem hiding this comment.
param_name is too vague imo.
Should be a more descriptive name
|
|
||
| # drought severity: use racker value if available | ||
| bra_scale = self.shock_scales.get("farm_capacity_bra", 0.0) | ||
| bra_value = self.get_effective_value("farm_capacity_bra") |
Contributor
There was a problem hiding this comment.
explicit bra values should be made dynamic in the future
|
|
||
|
|
||
| # --- Aggregation constants --- | ||
| _CAPACITY_PARAMS = { |
| edef = self._events.get(eid) | ||
| if edef is None: | ||
| continue | ||
| if self._evaluate_condition(edef.condition, day): |
Contributor
There was a problem hiding this comment.
isn't it possible that a conditional event activates on the same simulation step as it's condition activated with this implementation?
| if mapped is not None: | ||
| pct = _parse_percent(str(raw)) | ||
| param = mapped | ||
| value = round(1.0 + pct / 100.0, 6) |
Contributor
There was a problem hiding this comment.
why the 1.0 + pct? doesn't this just add 1 % to all values?
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
2 participants
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.
feat(events): finalize conditional event resolution + tests