Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions src/domain/AlternativeRecommendationService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -996,6 +996,21 @@ std::optional<ExitUsageMetric> leastUsedReachableExit(
return best;
}

std::size_t reachableExitCandidateCount(const AlternativeRecommendationInput& request) {
std::unordered_set<std::string> reachableExitZoneIds;
for (const auto& usage : exitUsageCandidates(request)) {
if (!usage.exitZoneId.empty()
&& exitReachableFromScenarioSources(request, usage.exitZoneId)) {
reachableExitZoneIds.insert(usage.exitZoneId);
}
}
return reachableExitZoneIds.size();
}

bool hasAlternativeReachableExit(const AlternativeRecommendationInput& request) {
return reachableExitCandidateCount(request) >= 2;
}

bool bottleneckLessSevere(const ScenarioBottleneckMetric& lhs, const ScenarioBottleneckMetric& rhs) {
if (lhs.stalledAgentCount == rhs.stalledAgentCount) {
return lhs.nearbyAgentCount < rhs.nearbyAgentCount;
Expand Down Expand Up @@ -1410,6 +1425,9 @@ std::optional<AlternativeRecommendationCandidate> makeBottleneckGuidanceCandidat
if (!bottleneck.has_value() || bottleneck->connectionId.empty()) {
return std::nullopt;
}
if (!hasAlternativeReachableExit(request)) {
return std::nullopt;
}
const auto adjacentExitZoneIds = adjacentExitZoneIdsForConnection(request, bottleneck->connectionId);
const auto targetExit = leastUsedReachableExit(
request,
Expand Down Expand Up @@ -1487,7 +1505,7 @@ std::optional<AlternativeRecommendationCandidate> makeBottleneckGuidanceCandidat
std::optional<AlternativeRecommendationCandidate> makeExitBalancingCandidate(
const AlternativeRecommendationInput& request,
const RecommendationContext& context) {
if (exitUsageCandidates(request).size() < 2) {
if (!hasAlternativeReachableExit(request)) {
return std::nullopt;
}
const auto low = context.leastUsedReachableExit;
Expand Down Expand Up @@ -1561,7 +1579,7 @@ std::optional<AlternativeRecommendationCandidate> makePressureHotspotCandidate(
if (!hasPressureSignal(request)) {
return std::nullopt;
}
if (exitUsageCandidates(request).size() < 2) {
if (!hasAlternativeReachableExit(request)) {
return std::nullopt;
}

Expand Down Expand Up @@ -1670,7 +1688,7 @@ std::optional<AlternativeRecommendationCandidate> makeCrossFlowCandidate(
}

const auto severity = signal->severity;
if (!context.exitUsageImbalanced && exitUsageCandidates(request).size() >= 2) {
if (!context.exitUsageImbalanced && hasAlternativeReachableExit(request)) {
const auto targetExit = context.leastUsedReachableExit;
if (targetExit.has_value()
&& context.mostUsedExit.has_value()
Expand Down
36 changes: 35 additions & 1 deletion tests/AlternativeRecommendationServiceTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,26 @@ SC_TEST(AlternativeRecommendationService_addsBottleneckGuidanceAtExit) {
SC_EXPECT_TRUE(containsDiffKey(it->recommendedScenario, "control.routeGuidances"));
}

SC_TEST(AlternativeRecommendationService_skipsBottleneckGuidanceForSingleExitLayout) {
ScenarioRiskSnapshot risk;
risk.bottlenecks.push_back({
.connectionId = "door-main",
.nearbyAgentCount = 8,
.stalledAgentCount = 5,
});

const AlternativeRecommendationService service;
const auto result = service.recommend({
.layout = makeSingleExitRecommendationLayout(),
.sourceScenario = makeScenario(),
.risk = risk,
.artifacts = makeSingleExitUsageArtifacts("exit-main", "Main Exit", 20, 1.0),
});

SC_EXPECT_TRUE(!hasCandidateKind(result, AlternativeRecommendationKind::BottleneckBypassGuidance));
SC_EXPECT_TRUE(!hasCandidateKind(result, AlternativeRecommendationKind::ExitUsageBalancing));
}

SC_TEST(AlternativeRecommendationService_installsCorridorBottleneckGuidanceAtExitOnly) {
ScenarioRiskSnapshot risk;
risk.bottlenecks.push_back({
Expand Down Expand Up @@ -1007,11 +1027,25 @@ SC_TEST(AlternativeRecommendationService_sortsBlockedReliefBeforeGuidance) {
.nearbyAgentCount = 8,
.stalledAgentCount = 5,
});
auto layout = makeRecommendationLayout();
layout.zones.push_back({
.id = "exit-west",
.floorId = "L1",
.kind = ZoneKind::Exit,
.label = "West Exit",
});
layout.connections.push_back({
.id = "door-west",
.floorId = "L1",
.kind = ConnectionKind::Exit,
.fromZoneId = "room-a",
.toZoneId = "exit-west",
});
const auto artifacts = makeExitUsageArtifacts();

const AlternativeRecommendationService service;
const auto result = service.recommend({
.layout = makeRecommendationLayout(),
.layout = layout,
.sourceScenario = scenario,
.risk = risk,
.artifacts = artifacts,
Expand Down
Loading