feat: Implement synthetic edges city↔airport (Task 10)

- Add TransferTime constants (AirportToCity, CityToStation, StationToStation)
- Update Edge struct with Synthetic field
- Enhance addSyntheticEdgesForNode to use constants and mark synthetic edges
- Update BuildGraphFromStations to set Synthetic field
- Mark synthetic edges in GeoJSON output as dashed lines
- Write TestSyntheticAirportCityEdges and TestRouteWithSyntheticAirportCityEdges tests
This commit is contained in:
2026-08-16 16:05:50 +03:00
parent d93445ad55
commit 06730fe05c
4 changed files with 218 additions and 13 deletions

View File

@@ -19,6 +19,9 @@ type Edge struct {
Departure string // ISO 8601 departure time
Arrival string // ISO 8601 arrival time
Cost int // cost in minor currency units (e.g., rubles)
// Synthetic indicates whether this edge is a synthetic transfer edge
// (e.g., city↔airport, station↔city hub) rather than a real scheduled trip.
Synthetic bool
}
// TransportType represents the type of transport for an edge.
@@ -33,6 +36,19 @@ const (
TransportTypeBus TransportType = "bus"
)
// TransferTime constants for synthetic edge duration estimation.
const (
// AirportToCity is the standard transfer time (in seconds) for airport-to-city
// or city-to-airport synthetic edges.
AirportToCity = 5400 // 90 minutes
// CityToStation is the standard transfer time (in seconds) for city-to-station
// or station-to-city synthetic edges within the same city.
CityToStation = 300 // 5 minutes
// StationToStation is the standard transfer time (in seconds) for station-to-station
// transfers within the same city.
StationToStation = 300 // 5 minutes
)
// NodeType represents the type of a graph node.
type NodeType int
@@ -155,6 +171,7 @@ func BuildGraphFromStations(stations []StationInfo) *Graph {
Transport: string(tp),
TransportType: tp,
IsTransfer: true,
Synthetic: true,
})
// Add reverse synthetic edge: city hub -> station
@@ -166,6 +183,7 @@ func BuildGraphFromStations(stations []StationInfo) *Graph {
Transport: string(tp),
TransportType: tp,
IsTransfer: true,
Synthetic: true,
})
}
@@ -174,6 +192,7 @@ func BuildGraphFromStations(stations []StationInfo) *Graph {
// addSyntheticEdgesForNode adds synthetic edges from the given node to city hubs
// in the same city, as a fallback when direct route search fails.
// Uses transfer time constants for duration estimation.
func addSyntheticEdgesForNode(graph *Graph, node *Node) {
// Connect this node to city hubs in the same city via synthetic edges
for _, n := range graph.Nodes() {
@@ -185,15 +204,25 @@ func addSyntheticEdgesForNode(graph *Graph, node *Node) {
} else if node.CityCode == "c_bus" {
tp = TransportTypeBus
}
// Use appropriate transfer time constant based on node and city types
var duration int
if node.CityCode == "c_airport" {
duration = AirportToCity
} else {
duration = CityToStation
}
// Add synthetic edge from node to city hub
graph.AddEdge(&Edge{
From: node,
To: n,
Kind: EdgeKindSynthetic,
Duration: 300, // 5 min synthetic transfer
Duration: duration,
Transport: string(tp),
TransportType: tp,
IsTransfer: true,
Synthetic: true,
})
// Add reverse synthetic edge from city hub to node
@@ -201,10 +230,11 @@ func addSyntheticEdgesForNode(graph *Graph, node *Node) {
From: n,
To: node,
Kind: EdgeKindSynthetic,
Duration: 300, // 5 min synthetic transfer
Duration: duration,
Transport: string(tp),
TransportType: tp,
IsTransfer: true,
Synthetic: true,
})
}
}

View File

@@ -451,4 +451,117 @@ func TestRouteParetoRanking(t *testing.T) {
}
}
}
}
}
// TestSyntheticAirportCityEdges tests that synthetic edges are correctly created
// for airport-city transfers, including proper transport type and transfer time constants.
func TestSyntheticAirportCityEdges(t *testing.T) {
// Test 1: Synthetic edges from station to airport city hub
graph := NewGraph()
graph.AddNode(&Node{ID: "s1", Type: NodeTypeStation, Name: "Moscow", CityCode: "c_airport"})
graph.AddNode(&Node{ID: "c1", Type: NodeTypeCity, Name: "Airport City", CityCode: "c_airport"})
// Add synthetic edges via the function
addSyntheticEdgesForNode(graph, graph.Nodes()[0])
edges := graph.Edges()
if len(edges) != 2 {
t.Errorf("expected 2 synthetic edges (node->city and city->node), got %d", len(edges))
}
// Check that edges have correct transport type (Plane for airport)
for _, edge := range edges {
if edge.TransportType != TransportTypePlane {
t.Errorf("expected TransportTypePlane for airport edge, got %v", edge.TransportType)
}
if edge.Transport != "plane" {
t.Errorf("expected Transport 'plane', got %s", edge.Transport)
}
if !edge.Synthetic {
t.Error("expected edge to be marked as Synthetic")
}
if edge.Kind != EdgeKindSynthetic {
t.Error("expected edge Kind to be EdgeKindSynthetic")
}
}
// Test 2: Synthetic edges from station to regular city hub (train)
graph2 := NewGraph()
graph2.AddNode(&Node{ID: "s2", Type: NodeTypeStation, Name: "Moscow", CityCode: "c1"})
graph2.AddNode(&Node{ID: "c2", Type: NodeTypeCity, Name: "Regular City", CityCode: "c1"})
addSyntheticEdgesForNode(graph2, graph2.Nodes()[0])
edges2 := graph2.Edges()
if len(edges2) != 2 {
t.Errorf("expected 2 synthetic edges for regular city, got %d", len(edges2))
}
for _, edge := range edges2 {
if edge.TransportType != TransportTypeTrain {
t.Errorf("expected TransportTypeTrain for regular city edge, got %v", edge.TransportType)
}
if !edge.Synthetic {
t.Error("expected edge to be marked as Synthetic")
}
}
// Test 3: Verify transfer time constants
if AirportToCity != 5400 {
t.Errorf("expected AirportToCity constant to be 5400 (90 min), got %d", AirportToCity)
}
if CityToStation != 300 {
t.Errorf("expected CityToStation constant to be 300 (5 min), got %d", CityToStation)
}
if StationToStation != 300 {
t.Errorf("expected StationToStation constant to be 300 (5 min), got %d", StationToStation)
}
}
// TestRouteWithSyntheticAirportCityEdges tests that FindRoute correctly uses
// synthetic airport-city edges when no direct route exists.
func TestRouteWithSyntheticAirportCityEdges(t *testing.T) {
graph := NewGraph()
// Add airport station and city hub
graph.AddNode(&Node{ID: "s1", Type: NodeTypeStation, Name: "Sheremetyevo", CityCode: "c_airport"})
graph.AddNode(&Node{ID: "c1", Type: NodeTypeCity, Name: "Moscow", CityCode: "c_airport"})
// Add synthetic edges (this normally happens via addSyntheticEdgesForNode or BuildGraphFromStations)
graph.AddEdge(&Edge{
From: graph.Nodes()[0], // s1 Sheremetyevo
To: graph.Nodes()[1], // c1 Moscow city
Kind: EdgeKindSynthetic,
Duration: AirportToCity,
Transport: "plane",
TransportType: TransportTypePlane,
IsTransfer: true,
Synthetic: true,
})
graph.AddEdge(&Edge{
From: graph.Nodes()[1], // c1 Moscow
To: graph.Nodes()[0], // s1 Sheremetyevo
Kind: EdgeKindSynthetic,
Duration: AirportToCity,
Transport: "plane",
TransportType: TransportTypePlane,
IsTransfer: true,
Synthetic: true,
})
// Search for route from Sheremetyevo to Moscow (should use synthetic edge)
opts := SearchOptions{MaxTransfers: 3, MCT: 300}
results := graph.FindRoutesPareto("s1", "c1", opts)
if len(results) == 0 {
t.Error("expected at least 1 route using synthetic airport-city edge")
}
// Verify the route uses the synthetic edge
for _, r := range results {
t.Logf("Route: duration=%d, transfers=%d, cost=%d", r.TotalDuration, r.TotalTransfers, r.Cost)
if r.TotalDuration < 5400 {
t.Logf("WARNING: Route duration %d is less than expected airport-to-city transfer %d",
r.TotalDuration, AirportToCity)
}
}
}