Commit 6d0f42a7 authored by nimishsantosh107's avatar nimishsantosh107
Browse files

Bump version 3.0.0 → 3.0.1, evaluator/client.py - Malfunction fix

parent 83cb86a2
Pipeline #8696 canceled with stages
in 1 minute and 2 seconds
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
__author__ = """S.P. Mohanty""" __author__ = """S.P. Mohanty"""
__email__ = 'mohanty@aicrowd.com' __email__ = 'mohanty@aicrowd.com'
__version__ = '3.0.0' __version__ = '3.0.1'
...@@ -67,7 +67,7 @@ class FileMalfunctionGen(ParamMalfunctionGen): ...@@ -67,7 +67,7 @@ class FileMalfunctionGen(ParamMalfunctionGen):
if env_dict is None: if env_dict is None:
env_dict = persistence.RailEnvPersister.load_env_dict(filename, load_from_package=load_from_package) env_dict = persistence.RailEnvPersister.load_env_dict(filename, load_from_package=load_from_package)
if "malfunction" in env_dict: if env_dict.get('malfunction') is not None:
oMFP = MalfunctionParameters(*env_dict["malfunction"]) oMFP = MalfunctionParameters(*env_dict["malfunction"])
else: else:
oMFP = MalfunctionParameters(0,0,0) # no malfunctions oMFP = MalfunctionParameters(0,0,0) # no malfunctions
...@@ -184,7 +184,7 @@ def malfunction_from_file(filename: str, load_from_package=None) -> Tuple[Malfun ...@@ -184,7 +184,7 @@ def malfunction_from_file(filename: str, load_from_package=None) -> Tuple[Malfun
env_dict = persistence.RailEnvPersister.load_env_dict(filename, load_from_package=load_from_package) env_dict = persistence.RailEnvPersister.load_env_dict(filename, load_from_package=load_from_package)
# TODO: make this better by using namedtuple in the pickle file. See issue 282 # TODO: make this better by using namedtuple in the pickle file. See issue 282
if "malfunction" in env_dict: if env_dict.get('malfunction') is not None:
env_dict['malfunction'] = oMPD = MalfunctionProcessData._make(env_dict['malfunction']) env_dict['malfunction'] = oMPD = MalfunctionProcessData._make(env_dict['malfunction'])
else: else:
oMPD = None oMPD = None
......
...@@ -267,7 +267,7 @@ class FlatlandRemoteClient(object): ...@@ -267,7 +267,7 @@ class FlatlandRemoteClient(object):
self.current_env_path = test_env_file_path self.current_env_path = test_env_file_path
self.env = RailEnv(width=1, height=1, rail_generator=rail_from_file(test_env_file_path), self.env = RailEnv(width=1, height=1, rail_generator=rail_from_file(test_env_file_path),
line_generator=line_from_file(test_env_file_path), line_generator=line_from_file(test_env_file_path),
malfunction_generator=FileMalfunctionGen(test_env_file_path), malfunction_generator=FileMalfunctionGen(filename=test_env_file_path),
obs_builder_object=obs_builder_object) obs_builder_object=obs_builder_object)
time_start = time.time() time_start = time.time()
......
[bumpversion] [bumpversion]
current_version = 3.0.0 current_version = 3.0.1
commit = True commit = True
tag = True tag = True
......
...@@ -80,6 +80,6 @@ setup( ...@@ -80,6 +80,6 @@ setup(
test_suite='tests', test_suite='tests',
tests_require=test_requirements, tests_require=test_requirements,
url='https://gitlab.aicrowd.com/flatland/flatland', url='https://gitlab.aicrowd.com/flatland/flatland',
version='3.0.0', version='3.0.1',
zip_safe=False, zip_safe=False,
) )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment