diff --git a/UnrealHyperTwist/Source/UnrealHyperTwist/Private/HyperTwistTraining/HyperTwistTrainingCoachLibrary.cpp b/UnrealHyperTwist/Source/UnrealHyperTwist/Private/HyperTwistTraining/HyperTwistTrainingCoachLibrary.cpp index fcf2ee1..b26271e 100644 --- a/UnrealHyperTwist/Source/UnrealHyperTwist/Private/HyperTwistTraining/HyperTwistTrainingCoachLibrary.cpp +++ b/UnrealHyperTwist/Source/UnrealHyperTwist/Private/HyperTwistTraining/HyperTwistTrainingCoachLibrary.cpp @@ -1356,14 +1356,20 @@ FHyperTwistCoachBrief UHyperTwistTrainingCoachLibrary::DeriveCoachFollowUpBrief( ActionPlan.PreferredCoachHandoffSourceLabel ) : TEXT("none"); + const bool bPrioritizeDeferredLaunchCasesInFollowUpPacket = + bDeferredOverflowContinuationSource && bHasDeferredLaunchCases; Brief.DeferredLaunchCaseCount = OutcomeSummary.DeferredLaunchCaseIds.Num(); Brief.bNeedsDeferredLaunchRecovery = bHasDeferredLaunchCases; Brief.bHasTightenedLaunchOverflow = OutcomeSummary.bTightenedLaunchBudget && bHasDeferredLaunchCases; Brief.FocusCaseIds = bHasLaunchedFollowUpCases ? HyperTwistTrainingCoachLibraryInternal::MergeFocusCaseIds( - OutcomeSummary.FollowUpCaseIds, - OutcomeSummary.DeferredLaunchCaseIds) + bPrioritizeDeferredLaunchCasesInFollowUpPacket + ? OutcomeSummary.DeferredLaunchCaseIds + : OutcomeSummary.FollowUpCaseIds, + bPrioritizeDeferredLaunchCasesInFollowUpPacket + ? OutcomeSummary.FollowUpCaseIds + : OutcomeSummary.DeferredLaunchCaseIds) : (bHasDeferredLaunchCases ? OutcomeSummary.DeferredLaunchCaseIds : ActionPlan.FocusCaseIds); @@ -1508,7 +1514,7 @@ FHyperTwistCoachBrief UHyperTwistTrainingCoachLibrary::DeriveCoachFollowUpBrief( Brief.PriorityScore, Brief.Headline, FString::Printf( - TEXT("followUpCases=%d, deferredLaunchCases=%d, success=%d, failure=%d, timeout=%d, dnf=%d, launchBudget=%s, plannedLaunchCases=%d, requestedLaunchCases=%d, launchBudgetReason=%s, preferredHandoff=%s, preferredHandoffSource=%s, deferredOverflowContinuation=%d"), + TEXT("followUpCases=%d, deferredLaunchCases=%d, success=%d, failure=%d, timeout=%d, dnf=%d, launchBudget=%s, plannedLaunchCases=%d, requestedLaunchCases=%d, launchBudgetReason=%s, preferredHandoff=%s, preferredHandoffSource=%s, deferredOverflowContinuation=%d, deferredPacketOrdering=%s"), Brief.FocusCaseIds.Num(), OutcomeSummary.DeferredLaunchCaseIds.Num(), OutcomeSummary.SuccessCount, @@ -1527,7 +1533,10 @@ FHyperTwistCoachBrief UHyperTwistTrainingCoachLibrary::DeriveCoachFollowUpBrief( ActionPlan.PreferredCoachHandoffKind ), *DeferredOverflowSourceLabel, - bDeferredOverflowContinuationSource ? 1 : 0), + bDeferredOverflowContinuationSource ? 1 : 0, + bPrioritizeDeferredLaunchCasesInFollowUpPacket + ? TEXT("deferred-first") + : TEXT("default")), Brief.SuggestedMode, Brief.SuggestedSelectionPolicy );