Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RS/YJ/Rule 5-1 #1257

Merged
merged 23 commits into from
Jan 23, 2024
Merged

RS/YJ/Rule 5-1 #1257

merged 23 commits into from
Jan 23, 2024

Conversation

yunjoonjung-PNNL
Copy link
Collaborator

This Rule hasn't been tested yet. I'll work with Jackson to make this rule pass. Thanks!

@JacksonJ-KC
Copy link
Collaborator

@yunjoonjung-PNNL This draft was helpful. I ran the tests with the built-in validation and found a couple issues with the previous test json that I did not catch with the local validation that I was running previously.

This test is not in the TCD spreadsheet because it requires multiple RMDs and the spreadsheet method would have added complications. This json was created by copying a snippet of another test json and altering manually.

@yunjoonjung-PNNL
Copy link
Collaborator Author

@yunjoonjung-PNNL This draft was helpful. I ran the tests with the built-in validation and found a couple issues with the previous test json that I did not catch with the local validation that I was running previously.

This test is not in the TCD spreadsheet because it requires multiple RMDs and the spreadsheet method would have added complications. This json was created by copying a snippet of another test json and altering manually.

Thank you for your quick response and No worries! Please refer to this PR for 5-1 TCD creation and let me know if this rule has any issues.

@JacksonJ-KC
Copy link
Collaborator

See #1171

Copy link
Collaborator

@weilixu weilixu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some comments need to address

"baseline_list": baseline_list,
"no_of_rmds": no_of_rmds,
"no_of_output_instance": no_of_output_instance,
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After review this rule, I feel that you do not need this create_data function. All info can be retrieved inside BuildingRule

Copy link
Collaborator Author

@yunjoonjung-PNNL yunjoonjung-PNNL Jan 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I made a mistake doing find_one("$.output.output_instance", building_p, False) in the BuildingRule level. I should've done this in the RMDRule level. For this reason, I'll keep the RMDRule.

@yunjoonjung-PNNL yunjoonjung-PNNL marked this pull request as ready for review January 12, 2024 21:16
Copy link
Collaborator

@JacksonJ-KC JacksonJ-KC left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! Not sure if you need my approval, but you have it!

@yunjoonjung-PNNL
Copy link
Collaborator Author

Looks good to me! Not sure if you need my approval, but you have it!

Thanks for your hard work throughout this rule!

@@ -82,7 +82,7 @@
]
}
],
"type": "USER"
"type": "BASELINE_0"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JasonGlazer @JacksonJ-KC Could you one of you reflect this change in the section 5 spreadsheet? I believe when section 5 was renumbered, this part was changed unexpectedly somehow.

Copy link
Collaborator

@JacksonJ-KC JacksonJ-KC Jan 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test json for rule 5-31 does not align with the section 5 spreadsheet - the test_description belong to a different rule as well. The spreadsheet appears to be correct so I just recreated the json file from the spreadsheet.

@yunjoonjung-PNNL
Copy link
Collaborator Author

yunjoonjung-PNNL commented Jan 19, 2024

@weilixu This rule is ready to be reviewed again. I added Jackson's TCD from PR #1171 to make the CI/CD pass. Thanks for your help throughout this rule!

@weilixu
Copy link
Collaborator

weilixu commented Jan 20, 2024

Approved but wait for the json test updates.

@JacksonJ-KC
Copy link
Collaborator

JacksonJ-KC commented Jan 20, 2024

Approved but wait for the json test updates.

@yunjoonjung-PNNL @weilixu I created a pull request to merge the recreated 5-31 test json into this branch

@yunjoonjung-PNNL
Copy link
Collaborator Author

@weilixu Jackson's work was merged into this branch. I believe this PR is ready to be merged into the develop branch. Thanks!

@weilixu weilixu merged commit b517da8 into develop Jan 23, 2024
2 checks passed
@yunjoonjung-PNNL yunjoonjung-PNNL deleted the RS/YJ/Rule_5-1 branch April 16, 2024 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants