New metrics to return Inventory table with quantity (kg/GWe) in terms of cumulative power from time 0 to time of the simulation #163
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
…antity_per_gwe function
louishartono
changed the title
bam241
reviewed
Mar 6, 2020
cymetric/metrics.py
Outdated
| total_power = 0 | ||
| for t in range(len(df1)): | ||
| realpower = total_power + df1.Value[t] | ||
| total_power += realpower |
There was a problem hiding this comment.
Suggested change
| total_power += realpower | |
| total_power += df1.Value[t] |
louishartono
changed the title
louishartono
changed the title
bam241
requested changes
May 11, 2020
There was a problem hiding this comment.
mainly formatting issues, otherwise this mostly look good.
in the test_metrics.py I would also add a single blank line to split each part of the test methods:
- declaration of the expected value
- declaration of the input
- getting the observed value and testing it against the expected one
| @@ -504,4 +504,58 @@ def inventory_quantity_per_gwe(expinv,power): | |||
| inv.Quantity = inv.Quantity/inv.Value | |||
| inv=inv.drop(['Value'],axis=1) | |||
| return inv | |||
|
|
|||
|
|
|||
| # Cumulative power from time 0 to time t in TimeSeriesPower metric | |||
|
|
||
| @metric(name='CumulativeTimeSeriesPower', depends=_cumpdeps, schema=_cumpschema) | ||
| def cumulative_timeseriespower(power): | ||
| """Cumulative Timeseriespower metric returns the TimeSeriesPower metric with a cumulative sum |
Comment on lines
+523
to
+528
| power = pd.DataFrame(data={'SimId': power.SimId, | ||
| 'AgentId': power.AgentId, | ||
| 'Time': power.Time, | ||
| 'Value': power.Value}, | ||
| columns=['SimId','AgentID','Time', 'Value']) | ||
| power_index = ['SimId','Time'] |
| df1['Value'] = df1['Value'].cumsum() | ||
| return df1 | ||
|
|
||
| # Quantity per GigaWattElectric Per Cumulative Power in Inventory [kg/GWe] |
| return df1 | ||
|
|
||
| # Quantity per GigaWattElectric Per Cumulative Power in Inventory [kg/GWe] | ||
| _invdeps = ['ExplicitInventory','CumulativeTimeSeriesPower'] |
| ('SimId', 'O'), ('AgentId', '<i8'), ('Time', '<i8'), | ||
| ('InventoryName', 'O'), ('NucId', '<i8'), ('Quantity', '<f8')])) | ||
| ) | ||
| #ctsp is the CumulativeTimeSeriesPower metrics |
There was a problem hiding this comment.
Suggested change
| #ctsp is the CumulativeTimeSeriesPower metrics | |
| # ctsp is the CumulativeTimeSeriesPower metrics |
| ], dtype=ensure_dt_bytes([ | ||
| ('SimId', 'O'), ('Time', '<i8'), ('Value', '<f8')])) | ||
| ) | ||
| #inv is the ExplicitInventory metrics |
There was a problem hiding this comment.
Suggested change
| #inv is the ExplicitInventory metrics | |
| # inv is the ExplicitInventory metrics |
| ('InventoryName', 'O'), ('NucId', '<i8'), ('Quantity', '<f8')])) | ||
| ) | ||
| obs = metrics.inventory_quantity_per_cumulative_power.func(inv, ctsp) | ||
| assert_frame_equal(exp, obs) | ||
|
|
||
| if __name__ == "__main__": |
There was a problem hiding this comment.
PEP8 2 blank lines between methods
Comment on lines
+442
to
+445
| (UUID('f22f2281-2464-420a-8325-37320fd418f8'), 1, 2, 'core', 922350000, 300), | ||
| (UUID('f22f2281-2464-420a-8325-37320fd418f8'), 1, 2, 'usedfuel', 922350000, 600), | ||
| (UUID('f22f2281-2464-420a-8325-37320fd418f8'), 2, 3, 'core', 922350000, 1050), | ||
| (UUID('f22f2281-2464-420a-8325-37320fd418f8'), 2, 3, 'usedfuel', 922350000, 350) |
| (UUID('f22f2281-2464-420a-8325-37320fd418f8'), 2, 3, 'usedfuel', 922350000, 350) | ||
| ], dtype=ensure_dt_bytes([ | ||
| ('SimId', 'O'), ('AgentId', '<i8'), ('Time', '<i8'), | ||
| ('InventoryName', 'O'), ('NucId', '<i8'), ('Quantity', '<f8')])) |
There was a problem hiding this comment.
same here, maybe put all the pair on a line ?
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.
Merging prerequisite: PR #164
Made some changes to metrics.py. Added a new metrics called "InventoryQuantityPerCumulativePower" to return the explicit inventory table with quantity in units of kg/GWe, calculated by dividing the original quantity by the cumulative sum of the electricity generated in TimeSeriesPower metric from time 0 and created the test to check the expected output as well. Feel free to give feedback or suggestions :).