From cc5df76ef7c510c34c134776976e3480d0551cd7 Mon Sep 17 00:00:00 2001 From: steffen-illium Date: Tue, 18 May 2021 17:38:31 +0200 Subject: [PATCH] cleaned up if else mess simple_factory_getting_dirty.py:47 --- environments/factory/simple_factory_getting_dirty.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/environments/factory/simple_factory_getting_dirty.py b/environments/factory/simple_factory_getting_dirty.py index 2caf0ba..b2cc1a3 100644 --- a/environments/factory/simple_factory_getting_dirty.py +++ b/environments/factory/simple_factory_getting_dirty.py @@ -45,9 +45,14 @@ class GettingDirty(BaseFactory): def asset_str(agent): cols = ' '.join([self.slice_strings[j] for j in agent.collisions]) - if 'agent' in cols: return 'agent_collision' - return f'agent{agent.i + 1}violation' if (not agent.action_valid or 'level' in cols or 'agent' in cols) \ - else (f'agent{agent.i + 1}valid' if self._is_clean_up_action(agent.action) else f'agent{agent.i + 1}') + if 'agent' in cols: + return 'agent_collision' + elif not agent.action_valid or 'level' in cols or 'agent' in cols: + return f'agent{agent.i + 1}violation' + elif self._is_clean_up_action(agent.action): + return f'agent{agent.i + 1}valid' + else: + return f'agent{agent.i + 1}' agents = {f'agent{i+1}': [Entity(asset_str(agent), agent.pos)] for i, agent in enumerate(self.agent_states)}