only calculate Aggregated TZ attributes if existing and use to_aggregation method #780
Conversation
This file contains 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
…ation for all attributes
veronikarichter
requested changes
Jan 9, 2025
| if all([getattr(tz, name) is not None for tz in self.elements]): | ||
| prop_sum = sum( | ||
| getattr(tz, name) * tz.net_volume for tz in self.elements if | ||
| getattr(tz, name) is not None and tz.net_volume is not None) |
There was a problem hiding this comment.
Suggested change
| getattr(tz, name) is not None and tz.net_volume is not None) | |
| tz.net_volume is not None) |
remove redundant check that the attribute is not None. Also remove check for tz.net_volume if included in all(...) check as suggested above.
| getattr(tz, name) is not None and tz.net_volume is not None) | ||
| return prop_sum / self.net_volume | ||
| # only calculate intensive calc if all zones have this attribute | ||
| if all([getattr(tz, name) is not None for tz in self.elements]): |
There was a problem hiding this comment.
Shouldn't you check for the net_volume (= not None) here, too?
| if getattr(tz, name) is not None and tz.net_volume is not None) | ||
| / self.net_volume) | ||
| return aux | ||
| if all([getattr(tz, name) is not None for tz in self.elements]): |
| getattr(tz, name)[x] * tz.net_volume for tz in | ||
| self.elements | ||
| if getattr(tz, | ||
| name) is not None and tz.net_volume is not None) |
Comment on lines
+177
to
+178
| return sum(getattr(tz, name) for tz in self.elements if | ||
| getattr(tz, name) is not None) |
There was a problem hiding this comment.
Suggested change
| return sum(getattr(tz, name) for tz in self.elements if | |
| getattr(tz, name) is not None) | |
| return sum(getattr(tz, name) for tz in self.elements)) |
Comment on lines
+187
to
+194
| prop_bool = False | ||
| for tz in self.elements: | ||
| prop = getattr(tz, name) | ||
| if prop is not None: | ||
| if prop: | ||
| prop_bool = True | ||
| break | ||
| return prop_bool |
There was a problem hiding this comment.
Suggested change
| prop_bool = False | |
| for tz in self.elements: | |
| prop = getattr(tz, name) | |
| if prop is not None: | |
| if prop: | |
| prop_bool = True | |
| break | |
| return prop_bool | |
| for tz in self.elements: | |
| prop = getattr(tz, name) | |
| if prop is not None: | |
| return True |
Please simplify this function. You may even be able to shorten even further by directly checking "if getattr(tz, name): return True"
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.
closes #779