Merge branch '288_preparing_submission_files' into 'master'

this closes #288

Closes #288

See merge request !266

flatland/evaluators/client.py

@@ -11,6 +11,7 @@ import numpy as np
 import redis
 
 import flatland
+from envs.malfunction_generators import malfunction_from_file
 from flatland.envs.rail_env import RailEnv
 from flatland.envs.rail_generators import rail_from_file
 from flatland.envs.schedule_generators import schedule_from_file
@@ -217,6 +218,7 @@ class FlatlandRemoteClient(object):
         self.current_env_path = test_env_file_path
         self.env = RailEnv(width=1, height=1, rail_generator=rail_from_file(test_env_file_path),
                            schedule_generator=schedule_from_file(test_env_file_path),
+                           malfunction_generator_and_process_data=malfunction_from_file(test_env_file_path),
                            obs_builder_object=obs_builder_object)
 
         time_start = time.time()

flatland/evaluators/service.py

@@ -16,6 +16,7 @@ import redis
 import timeout_decorator
 
 import flatland
+from envs.malfunction_generators import malfunction_from_file
 from flatland.core.env_observation_builder import DummyObservationBuilder
 from flatland.envs.agent_utils import RailAgentStatus
 from flatland.envs.rail_env import RailEnv
@@ -337,6 +338,7 @@ class FlatlandRemoteEvaluationService:
             del self.env
             self.env = RailEnv(width=1, height=1, rail_generator=rail_from_file(test_env_file_path),
                                schedule_generator=schedule_from_file(test_env_file_path),
+                               malfunction_generator_and_process_data=malfunction_from_file(test_env_file_path),
                                obs_builder_object=DummyObservationBuilder())
 
             if self.begin_simulation: