Adjust #11051 - Fix EPVector out of range issue: good candidate for a lambda! #11080
Conversation
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
jmarrec
commented
May 22, 2025
Comment on lines
+2739
to
+2770
| auto writeDSOAToPredefined = [&state, &vent_mech, &thisMechVentZone](const OARequirementsData &dsoa, | ||
| const std::string &zoneOrSpaceName) { | ||
| OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchDCVventMechName, zoneOrSpaceName, vent_mech.Name); | ||
| OutputReportPredefined::PreDefTableEntry(state, | ||
| state.dataOutRptPredefined->pdchDCVType, | ||
| zoneOrSpaceName, | ||
| SysOAMethodNames[static_cast<int>(vent_mech.SystemOAMethod)]); | ||
| OutputReportPredefined::PreDefTableEntry( | ||
| state, state.dataOutRptPredefined->pdchDCVperPerson, zoneOrSpaceName, dsoa.OAFlowPerPerson, 6); | ||
| OutputReportPredefined::PreDefTableEntry( | ||
| state, state.dataOutRptPredefined->pdchDCVType, zsName, SysOAMethodNames[static_cast<int>(vent_mech.SystemOAMethod)]); | ||
| OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchDCVperPerson, zsName, dsoa2.OAFlowPerPerson, 6); | ||
| OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchDCVperArea, zsName, dsoa2.OAFlowPerArea, 6); | ||
| OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchDCVperZone, zsName, dsoa2.OAFlowPerZone, 6); | ||
| OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchDCVperACH, zsName, dsoa2.OAFlowACH, 6); | ||
| state, state.dataOutRptPredefined->pdchDCVperArea, zoneOrSpaceName, dsoa.OAFlowPerArea, 6); | ||
| OutputReportPredefined::PreDefTableEntry( | ||
| state, state.dataOutRptPredefined->pdchDCVMethod, zsName, OAFlowCalcMethodNames[static_cast<int>(dsoa2.OAFlowMethod)]); | ||
| if (dsoa2.oaFlowFracSched != nullptr) { | ||
| state, state.dataOutRptPredefined->pdchDCVperZone, zoneOrSpaceName, dsoa.OAFlowPerZone, 6); | ||
| OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchDCVperACH, zoneOrSpaceName, dsoa.OAFlowACH, 6); | ||
| OutputReportPredefined::PreDefTableEntry(state, | ||
| state.dataOutRptPredefined->pdchDCVMethod, | ||
| zoneOrSpaceName, | ||
| OAFlowCalcMethodNames[static_cast<int>(dsoa.OAFlowMethod)]); | ||
| if (dsoa.oaFlowFracSched != nullptr) { | ||
| OutputReportPredefined::PreDefTableEntry( | ||
| state, state.dataOutRptPredefined->pdchDCVOASchName, zsName, dsoa2.oaFlowFracSched->Name); | ||
| state, state.dataOutRptPredefined->pdchDCVOASchName, zoneOrSpaceName, dsoa.oaFlowFracSched->Name); | ||
| } | ||
| if (thisMechVentZone.zoneADEffSched != nullptr) { | ||
| OutputReportPredefined::PreDefTableEntry( | ||
| state, state.dataOutRptPredefined->pdchDCVZoneADEffSchName, zsName, thisMechVentZone.zoneADEffSched->Name); | ||
| state, state.dataOutRptPredefined->pdchDCVZoneADEffSchName, zoneOrSpaceName, thisMechVentZone.zoneADEffSched->Name); | ||
| } else { | ||
| OutputReportPredefined::PreDefTableEntry( | ||
| state, state.dataOutRptPredefined->pdchDCVZoneADEffCooling, zsName, thisMechVentZone.ZoneADEffCooling, 2); | ||
| state, state.dataOutRptPredefined->pdchDCVZoneADEffCooling, zoneOrSpaceName, thisMechVentZone.ZoneADEffCooling, 2); | ||
| OutputReportPredefined::PreDefTableEntry( | ||
| state, state.dataOutRptPredefined->pdchDCVZoneADEffHeating, zsName, thisMechVentZone.ZoneADEffHeating, 2); | ||
| state, state.dataOutRptPredefined->pdchDCVZoneADEffHeating, zoneOrSpaceName, thisMechVentZone.ZoneADEffHeating, 2); | ||
| } | ||
| }; |
Contributor
Author
There was a problem hiding this comment.
Lambdas for the win.
Collaborator
There was a problem hiding this comment.
Why not just make a normal function? Lambdas are for passing functions as arguments to other functions, not for this.
Contributor
Author
There was a problem hiding this comment.
That's your personal interpretation of what lambdas are, but it's not mine.
Lambdas are inline, anonymous functions, and they can take a closure, and they are (in my opinion) a great way to do what I've just did, which is to 1) fix the issue and 2) dry up the code.
Sure, you can write a function. But I don't see it being used anywhere else, and you're going to have to pass a bunch of parameters, and probably re-access thisMechVentZone. And now the logic to do stuff is further away.
Contributor
Author
There was a problem hiding this comment.
I'm just explaining why I like it, you can still ask @mjwitte to do it with a function on the original PR of course :)
Collaborator
There was a problem hiding this comment.
Fair enough. I'm not going to ask @mjwitte to do anything.
Comment on lines
+2771
to
+2775
| if (dsoa.numDSOA == 0) { | ||
| writeDSOAToPredefined(dsoa, zoneName); | ||
| } else { | ||
| for (int n = 0; n < dsoa.numDSOA; ++n) { | ||
| writeDSOAToPredefined(state.dataSize->OARequirements(dsoa.dsoaIndexes[n]), format("{}:{}", zoneName, dsoa.dsoaSpaceNames[n])); |
Contributor
Author
There was a problem hiding this comment.
And now it's short, sweet, and clear.
Contributor
Author
|
Alright confirmed that my MCVEs now run to completion. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Pull request overview
Description of the purpose of this PR
Pull Request Author
Reviewer