Refactor target calculation in GroupStateHelper into helper methods #6710
+1,112
−424
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
This commit extends the test_group_higher_constraints test suite with:
1. Extended hierarchy: Added MANI-2 group (with WELL-B) under PLAT to
create realistic group competition scenarios where fractions < 1.0.
The new hierarchy is:
FIELD -> PLAT -> MANI -> WELL-A, WELL-A2
-> MANI-2 -> WELL-B
-> PLAT-2 -> WELL-C
2. New tests for getWellGroupTargetProducer():
- TestWellGroupTargetProducerIndividualControl: WELL-A under ORAT
- TestWellGroupTargetProducerGrupControl: WELL-A under GRUP
- TestWellGroupTargetProducerWithSiblingIndividualControl: WELL-A
under GRUP with sibling WELL-A2 under ORAT (demonstrates case
where reduction != addback)
3. Updated existing tests:
- TestGroupHigherConstraintsWithGuideRate: scale now 0.922 (was 1.39)
- TestGroupHigherConstraintsProdWithoutGuideRate: scale now 0.901
hakonhagland
added
the
manual:irrelevant
Contributor
Author
|
jenkins build this please |
hakonhagland
force-pushed
the
gs_target_refact
branch
from
c334727 to
b490a1d
Compare
Contributor
Author
|
jenkins build this please |
Extract duplicated target calculation algorithm from four methods into two reusable helper methods: - getLocalReductionLevel_(): Finds the deepest level in the group chain where a group has both a guide rate and group-controlled wells (GCW > 0) - applyReductionsAndFractions_(): Applies local reductions, add-back (when applicable), and guide rate fractions to calculate the portion of a top-level group target assigned to a bottom group The refactored methods are: - checkGroupConstraintsInj() - checkGroupConstraintsProd() - getWellGroupTargetInjector() - getWellGroupTargetProducer() This is a pure refactoring with no functional change. The helper methods use templates for the reduction and fraction lambdas to avoid std::function overhead in case of performance-critical code.
hakonhagland
force-pushed
the
gs_target_refact
branch
from
b490a1d to
9702cc2
Compare
Contributor
Author
|
jenkins build this please |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Depends on #6703 which should be merged first.
Extract duplicated target calculation algorithm from four methods into two reusable helper methods:
getLocalReductionLevel_(): Finds the deepest level in the group chain where a group has both a guide rate and group-controlled wells (GCW > 0)applyReductionsAndFractions_(): Applies local reductions, add-back (when applicable), and guide rate fractions to calculate the portion of a top-level group target assigned to a bottom group.The refactored methods are:
checkGroupConstraintsInj()checkGroupConstraintsProd()getWellGroupTargetInjector()getWellGroupTargetProducer()This is a pure refactoring with no functional change. The helper methods use templates for the reduction and fraction lambdas to avoid
std::functionoverhead in case of performance-critical code.