Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python: fix railjson_generator bug (simulation_builder) #6230

Merged
merged 1 commit into from
Dec 28, 2023
Merged

python: fix railjson_generator bug (simulation_builder) #6230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions python/railjson_generator/railjson_generator/simulation_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,20 @@ def add_train_schedule(self, *locations: Location, **kwargs) -> TrainSchedule:
return train_schedule

def add_train_schedule_group(
self, locations: Union[Sequence[Location], Sequence[DirectedLocation]], *train_schedules: TrainSchedule
self, locations: Sequence[Union[Location, DirectedLocation]], *train_schedules: TrainSchedule
) -> TrainScheduleGroup:
"""Creates a train schedule group containing the given train schedules.

Simple locations are expanded to directed locations in all directions."""
if len(locations) < 2:
raise ValueError(f"Expected at least 2 locations, got {len(locations)}")
if isinstance(locations[0], Location):
locations = [
[DirectedLocation.from_location(loc, direction) for direction in Direction] for loc in locations
]
else:
locations = [[loc] for loc in locations]
train_schedule_group = TrainScheduleGroup(list(train_schedules), locations)
directed_locations = [
[loc]
if isinstance(loc, DirectedLocation)
else [DirectedLocation.from_location(loc, direction) for direction in Direction]
for loc in locations
]
train_schedule_group = TrainScheduleGroup(list(train_schedules), directed_locations)
self.simulation.train_schedule_groups.append(train_schedule_group)
return train_schedule_group

Expand Down