diff --git a/flatland/envs/rail_generators.py b/flatland/envs/rail_generators.py index 0f215709ebdd96298e2fe576d0b2244dc699f5c7..7bd22cbfa8b43f4b42efb35c0da4ce5f7dc2e7aa 100644 --- a/flatland/envs/rail_generators.py +++ b/flatland/envs/rail_generators.py @@ -1,7 +1,6 @@ """Rail generators (infrastructure manager, "Infrastrukturbetreiber").""" -import time import warnings -from typing import Callable, Tuple, Optional, Dict, List, Any +from typing import Callable, Tuple, Optional, Dict, List import msgpack import numpy as np @@ -593,7 +592,7 @@ def sparse_rail_generator(max_num_cities: int = 5, grid_mode: bool = False, max_ return grid_map, {'agents_hints': { 'num_agents': num_agents, - 'agent_start_targets_nodes': agent_start_targets_cities, + 'agent_start_targets_cities': agent_start_targets_cities, 'train_stations': train_stations, 'city_orientations': city_orientations }} diff --git a/flatland/envs/schedule_generators.py b/flatland/envs/schedule_generators.py index c7be5f575d2c9de7c56cbeceb46208a93ba6af04..bdd4b48b356d69fc7afb5cb76bf12ee08880516d 100644 --- a/flatland/envs/schedule_generators.py +++ b/flatland/envs/schedule_generators.py @@ -61,7 +61,7 @@ def sparse_schedule_generator(speed_ratio_map: Mapping[float, float] = None) -> def generator(rail: GridTransitionMap, num_agents: int, hints: Any = None): train_stations = hints['train_stations'] - agent_start_targets_nodes = hints['agent_start_targets_nodes'] + agent_start_targets_cities = hints['agent_start_targets_cities'] max_num_agents = hints['num_agents'] city_orientations = hints['city_orientations'] if num_agents > max_num_agents: @@ -73,8 +73,8 @@ def sparse_schedule_generator(speed_ratio_map: Mapping[float, float] = None) -> agents_direction = [] for agent_idx in range(num_agents): # Set target for agent - start_city = agent_start_targets_nodes[agent_idx][0] - target_city = agent_start_targets_nodes[agent_idx][1] + start_city = agent_start_targets_cities[agent_idx][0] + target_city = agent_start_targets_cities[agent_idx][1] start = random.choice(train_stations[start_city]) target = random.choice(train_stations[target_city]) while start[1] % 2 != 0: @@ -82,7 +82,7 @@ def sparse_schedule_generator(speed_ratio_map: Mapping[float, float] = None) -> while target[1] % 2 != 1: target = random.choice(train_stations[target_city]) - agent_orientation = (agent_start_targets_nodes[agent_idx][2] + 2 * start[1]) % 4 + agent_orientation = (agent_start_targets_cities[agent_idx][2] + 2 * start[1]) % 4 if not rail.check_path_exists(start[0], agent_orientation, target[0]): agent_orientation = (agent_orientation + 2) % 4 if not (rail.check_path_exists(start[0], agent_orientation, target[0])):