diff --git a/flatland/envs/rail_env.py b/flatland/envs/rail_env.py index 1dc24affd461ce585bceb6083df4feffe74c9b46..e4b0abd4884136fcabbabf220e492f962ef0fb71 100644 --- a/flatland/envs/rail_env.py +++ b/flatland/envs/rail_env.py @@ -116,7 +116,7 @@ class RailEnv(Environment): number_of_agents=1, obs_builder_object: ObservationBuilder = GlobalObsForRailEnv(), stochastic_data=None, - remove_agents_at_target=True, + remove_agents_at_target=False, random_seed=1 ): """ diff --git a/flatland/evaluators/client.py b/flatland/evaluators/client.py index bfb8477bb2f8a4d3d82d3391dc15a74336892f53..9322b6a8530cd3c77c246a2e74e99a8e2bc91ab9 100644 --- a/flatland/evaluators/client.py +++ b/flatland/evaluators/client.py @@ -202,7 +202,6 @@ class FlatlandRemoteClient(object): self.env = RailEnv( width=1, height=1, - remove_agents_at_target=True, rail_generator=rail_from_file(test_env_file_path), schedule_generator=schedule_from_file(test_env_file_path), obs_builder_object=obs_builder_object diff --git a/flatland/evaluators/service.py b/flatland/evaluators/service.py index 2265cd76a32f553fcb5b77fb1a210e25518ace2e..5c978d2939a1760e6644fd8f59689f6c8d3c19fc 100644 --- a/flatland/evaluators/service.py +++ b/flatland/evaluators/service.py @@ -204,7 +204,7 @@ class FlatlandRemoteEvaluationService: Obtains a new redis connection from a previously instantiated redis connection pool """ - redis_conn = redis.Redis(connection_pool=self.redis_pool).pipeline() + redis_conn = redis.Redis(connection_pool=self.redis_pool) try: redis_conn.ping() except Exception: diff --git a/tests/test_flaltland_rail_agent_status.py b/tests/test_flaltland_rail_agent_status.py index 3c1d5e70c0cd8591cbf62cae5d319cd1a6640731..987be3967746c7859414e24a452baab7758ee46b 100644 --- a/tests/test_flaltland_rail_agent_status.py +++ b/tests/test_flaltland_rail_agent_status.py @@ -20,7 +20,6 @@ def test_initial_status(): height=rail_map.shape[0], rail_generator=rail_from_grid_transition_map(rail), schedule_generator=random_schedule_generator(), - remove_agents_at_target=False, number_of_agents=1, obs_builder_object=TreeObsForRailEnv(max_depth=2, predictor=ShortestPathPredictorForRailEnv()), ) diff --git a/tests/test_flatland_envs_observations.py b/tests/test_flatland_envs_observations.py index 0457c037e86cf38d3622cef6085665efbcff4ca9..8f91088a205c92ec1d79fc9b3909a4c80ca72db5 100644 --- a/tests/test_flatland_envs_observations.py +++ b/tests/test_flatland_envs_observations.py @@ -178,7 +178,6 @@ def test_reward_function_waiting(rendering=False): rail, rail_map = make_simple_rail() env = RailEnv(width=rail_map.shape[1], height=rail_map.shape[0], - remove_agents_at_target=False, rail_generator=rail_from_grid_transition_map(rail), schedule_generator=random_schedule_generator(), number_of_agents=2, diff --git a/tests/test_flatland_envs_sparse_rail_generator.py b/tests/test_flatland_envs_sparse_rail_generator.py index 8f93786acefd82e76edd3441211f6e59dcdfa74e..a07c1a59816ee1bb40ef747b4748f16ee472b684 100644 --- a/tests/test_flatland_envs_sparse_rail_generator.py +++ b/tests/test_flatland_envs_sparse_rail_generator.py @@ -1335,7 +1335,6 @@ def test_rail_env_action_required_info(): 1. / 4.: 0.25} # Slow freight train env_always_action = RailEnv(width=50, height=50, - remove_agents_at_target=False, rail_generator=sparse_rail_generator( max_num_cities=10, max_rails_between_cities=3, @@ -1350,7 +1349,6 @@ def test_rail_env_action_required_info(): random.seed(0) env_only_if_action_required = RailEnv(width=50, height=50, - remove_agents_at_target=False, rail_generator=sparse_rail_generator( max_num_cities=10, max_rails_between_cities=3,