Update perf-log regressions for new token #103
Merged
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
20 tasks
Myoldmopar
commented
Aug 30, 2023
| @@ -87,7 +87,7 @@ def ismatrice(mat): | |||
| return False | |||
| # test for rows | |||
| for row in mat: | |||
| if type(row) != list: | |||
| if not isinstance(row, list): | |||
There was a problem hiding this comment.
Updated flake8 wanted the type checks modernized in 2 places, so I obliged.
| @@ -497,7 +497,7 @@ def both_files_exist(base_path_a, base_path_b, common_relative_path): | |||
| @staticmethod | |||
| def diff_perf_log(file_a, file_b, diff_file): | |||
| # will do a pretty simple CSV text token comparison, no numeric comparison, and omit some certain patterns | |||
| tokens_to_skip = [1, 2, 29, 30] | |||
| tokens_to_skip = [1, 2, 30, 31] | |||
There was a problem hiding this comment.
The new steam token in the perflog meant we needed to bump these last two indices.
| @@ -1,2 +1,2 @@ | |||
| Program, Version, TimeStamp,Use Coil Direct Solution,Zone Radiant Exchange Algorithm,Override Mode,Number of Timesteps per Hour,Minimum Number of Warmup Days,SuppressAllBeginEnvironmentResets,Minimum System Timestep,MaxZoneTempDiff,MaxAllowedDelTemp,Electricity ABUPS Total [J],Natural Gas ABUPS Total [J],Gasoline ABUPS Total [J],Diesel ABUPS Total [J],Coal ABUPS Total [J],Fuel Oil No 1 ABUPS Total [J],Fuel Oil No 2 ABUPS Total [J],Propane ABUPS Total [J],Other Fuel 1 ABUPS Total [J],Other Fuel 2 ABUPS Total [J],District Cooling ABUPS Total [J],District Heating ABUPS Total [J],Water ABUPS Total [m3],Values Gathered Over [hours],Facility Any Zone Oscillating Temperatures Time [hours],Facility Any Zone Oscillating Temperatures During Occupancy Time [hours],Facility Any Zone Oscillating Temperatures in Deadband Time [hours],Run Time [seconds],Run Time [string],Number of Warnings,Number of Severe, | |||
| EnergyPlus, Version 9.4.0-734af19f9a, YMD=2020.12.02 13:45,False,CarrollMRT,Normal,6,1,False,2.0,0.30,2.0000E-003,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.00,16.32,7.58,0.00,17.66,00hr 00min 17.66sec,6,0, | |||
| Program, Version, TimeStamp,Use Coil Direct Solution,Zone Radiant Exchange Algorithm,Override Mode,Number of Timesteps per Hour,Minimum Number of Warmup Days,SuppressAllBeginEnvironmentResets,Minimum System Timestep,MaxZoneTempDiff,MaxAllowedDelTemp,Electricity ABUPS Total [J],Natural Gas ABUPS Total [J],Gasoline ABUPS Total [J],Diesel ABUPS Total [J],Coal ABUPS Total [J],Fuel Oil No 1 ABUPS Total [J],Fuel Oil No 2 ABUPS Total [J],Propane ABUPS Total [J],Other Fuel 1 ABUPS Total [J],Other Fuel 2 ABUPS Total [J],District Cooling ABUPS Total [J],District Heating Water ABUPS Total [J],District Heating Steam ABUPS Total [J],Water ABUPS Total [m3],Values Gathered Over [hours],Facility Any Zone Oscillating Temperatures Time [hours],Facility Any Zone Oscillating Temperatures During Occupancy Time [hours],Facility Any Zone Oscillating Temperatures in Deadband Time [hours],Run Time [seconds],Run Time [string],Number of Warnings,Number of Severe, | |||
There was a problem hiding this comment.
Updated all 3 fake perflog test files to account for the new token. Tests pass now, confirming we are ignoring the correct timestamp tokens.
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.
The perf log got a new token with, I believe, the steam PR. I modified the regression scripts to handle the new token so that the time stamp values are ignored properly. I updated unit tests accordingly, and it's all good again. If CI is happy, I'll merge this, and subsequent CI passes will pick this up. I'll also do a new release of this soon so that local regression testing is fixed.