Refactor trip planning: DAG router + trip options UI + simplified itinerary
- Replace O(2^n) GeographicRouteExplorer with O(n) GameDAGRouter using DAG + beam search - Add geographic diversity to route selection (returns routes from distinct regions) - Add trip options selector UI (TripOptionsView, TripOptionCard) to choose between routes - Simplify itinerary display: separate games and travel segments by date - Remove complex ItineraryDay bundling, query games/travel directly per day - Update ScenarioA/B/C planners to use GameDAGRouter - Add new test suites for planners and travel estimator 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -68,6 +68,9 @@ final class ScenarioAPlanner: ScenarioPlanner {
|
||||
.filter { dateRange.contains($0.startTime) }
|
||||
.sorted { $0.startTime < $1.startTime }
|
||||
|
||||
print("[ScenarioA] Found \(gamesInRange.count) games in date range")
|
||||
print("[ScenarioA] Stadiums available: \(request.stadiums.count)")
|
||||
|
||||
// No games? Nothing to plan.
|
||||
if gamesInRange.isEmpty {
|
||||
return .failure(
|
||||
@@ -89,14 +92,19 @@ final class ScenarioAPlanner: ScenarioPlanner {
|
||||
// - etc.
|
||||
//
|
||||
// We explore ALL valid combinations and return multiple options.
|
||||
// Uses shared GeographicRouteExplorer for tree exploration.
|
||||
// Uses GameDAGRouter for polynomial-time beam search.
|
||||
//
|
||||
let validRoutes = GeographicRouteExplorer.findAllSensibleRoutes(
|
||||
let validRoutes = GameDAGRouter.findAllSensibleRoutes(
|
||||
from: gamesInRange,
|
||||
stadiums: request.stadiums,
|
||||
stopBuilder: buildStops
|
||||
)
|
||||
|
||||
print("[ScenarioA] GameDAGRouter returned \(validRoutes.count) routes")
|
||||
if !validRoutes.isEmpty {
|
||||
print("[ScenarioA] Route sizes: \(validRoutes.map { $0.count })")
|
||||
}
|
||||
|
||||
if validRoutes.isEmpty {
|
||||
return .failure(
|
||||
PlanningFailure(
|
||||
@@ -120,10 +128,22 @@ final class ScenarioAPlanner: ScenarioPlanner {
|
||||
//
|
||||
var itineraryOptions: [ItineraryOption] = []
|
||||
|
||||
var routesAttempted = 0
|
||||
var routesFailed = 0
|
||||
|
||||
for (index, routeGames) in validRoutes.enumerated() {
|
||||
routesAttempted += 1
|
||||
// Build stops for this route
|
||||
let stops = buildStops(from: routeGames, stadiums: request.stadiums)
|
||||
guard !stops.isEmpty else { continue }
|
||||
guard !stops.isEmpty else {
|
||||
print("[ScenarioA] Route \(index + 1) produced no stops, skipping")
|
||||
routesFailed += 1
|
||||
continue
|
||||
}
|
||||
|
||||
// Log stop details
|
||||
let stopCities = stops.map { "\($0.city) (coord: \($0.coordinate != nil))" }
|
||||
print("[ScenarioA] Route \(index + 1): \(stops.count) stops - \(stopCities.joined(separator: " → "))")
|
||||
|
||||
// Calculate travel segments using shared ItineraryBuilder
|
||||
guard let itinerary = ItineraryBuilder.build(
|
||||
@@ -133,6 +153,7 @@ final class ScenarioAPlanner: ScenarioPlanner {
|
||||
) else {
|
||||
// This route fails driving constraints, skip it
|
||||
print("[ScenarioA] Route \(index + 1) failed driving constraints, skipping")
|
||||
routesFailed += 1
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -155,6 +176,8 @@ final class ScenarioAPlanner: ScenarioPlanner {
|
||||
// If no routes passed all constraints, fail.
|
||||
// Otherwise, return all valid options for the user to choose from.
|
||||
//
|
||||
print("[ScenarioA] Routes attempted: \(routesAttempted), failed: \(routesFailed), succeeded: \(itineraryOptions.count)")
|
||||
|
||||
if itineraryOptions.isEmpty {
|
||||
return .failure(
|
||||
PlanningFailure(
|
||||
|
||||
Reference in New Issue
Block a user