diff --git a/.gitignore b/.gitignore index 7d813c87c..f0e82cd92 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ results*.txt *.svg *.dot .venv +test.ipynb diff --git a/scenario_runner.py b/scenario_runner.py index 345f52756..e711a7d09 100755 --- a/scenario_runner.py +++ b/scenario_runner.py @@ -325,13 +325,21 @@ def _record_criteria(self, criteria, name): with open(file_name, 'w', encoding='utf-8') as fp: json.dump(criteria_dict, fp, sort_keys=False, indent=4) + def _get_town_name(self): + town_name = self.world.get_map().name + town_id = os.path.basename(town_name)[0:6] + return town_id + def _load_and_wait_for_world(self, town, ego_vehicles=None): """ Load a new CARLA world and provide data to CarlaDataProvider """ if self._args.reloadWorld: - self.world = self.client.load_world(town) + if self._get_town_name() == town[0:6] : + print(f"{town} is already loaded into the simulator.") + else: + self.world = self.client.load_world(town) else: # if the world should not be reloaded, wait at least until all ego vehicles are ready ego_vehicle_found = False