From 5f4773a109e0254cfb9168cfb3c05e4188f82556 Mon Sep 17 00:00:00 2001
From: u229589 <christian.baumberger@sbb.ch>
Date: Mon, 16 Sep 2019 14:48:27 +0200
Subject: [PATCH] Refactoring: distance_map is initialized in constructor, so
checks like hasattr(self, 'distance_map') are unnecessary
---
flatland/envs/rail_env.py | 35 ++++++++++++-----------------------
1 file changed, 12 insertions(+), 23 deletions(-)
diff --git a/flatland/envs/rail_env.py b/flatland/envs/rail_env.py
index f6c0c818..22886594 100644
--- a/flatland/envs/rail_env.py
+++ b/flatland/envs/rail_env.py
@@ -575,7 +575,7 @@ class RailEnv(Environment):
# agents are always reset as not moving
self.agents_static = [EnvAgentStatic(d[0], d[1], d[2], moving=False) for d in data["agents_static"]]
self.agents = [EnvAgent(d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], d[8]) for d in data["agents"]]
- if hasattr(self, 'distance_map') and "distance_maps" in data.keys():
+ if "distance_maps" in data.keys():
self.distance_map = data["distance_maps"]
# setup with loaded data
self.height, self.width = self.rail.grid.shape
@@ -590,24 +590,18 @@ class RailEnv(Environment):
msgpack.packb(grid_data, use_bin_type=True)
msgpack.packb(agent_data, use_bin_type=True)
msgpack.packb(agent_static_data, use_bin_type=True)
- if hasattr(self, 'distance_map'):
- distance_map_data = self.distance_map
- msgpack.packb(distance_map_data, use_bin_type=True)
- msg_data = {
- "grid": grid_data,
- "agents_static": agent_static_data,
- "agents": agent_data,
- "distance_maps": distance_map_data}
- else:
- msg_data = {
- "grid": grid_data,
- "agents_static": agent_static_data,
- "agents": agent_data}
+ distance_map_data = self.distance_map
+ msgpack.packb(distance_map_data, use_bin_type=True)
+ msg_data = {
+ "grid": grid_data,
+ "agents_static": agent_static_data,
+ "agents": agent_data,
+ "distance_maps": distance_map_data}
return msgpack.packb(msg_data, use_bin_type=True)
def save(self, filename):
- if hasattr(self, 'distance_map') and self.distance_map is not None:
+ if self.distance_map is not None:
if len(self.distance_map) > 0:
with open(filename, "wb") as file_out:
file_out.write(self.get_full_state_dist_msg())
@@ -619,14 +613,9 @@ class RailEnv(Environment):
file_out.write(self.get_full_state_msg())
def load(self, filename):
- if hasattr(self, 'distance_map'):
- with open(filename, "rb") as file_in:
- load_data = file_in.read()
- self.set_full_state_dist_msg(load_data)
- else:
- with open(filename, "rb") as file_in:
- load_data = file_in.read()
- self.set_full_state_msg(load_data)
+ with open(filename, "rb") as file_in:
+ load_data = file_in.read()
+ self.set_full_state_dist_msg(load_data)
def load_pkl(self, pkl_data):
self.set_full_state_msg(pkl_data)
--
GitLab