recorder fixed

environments/factory/additional/btry/btry_collections.py

@@ -2,24 +2,19 @@ from environments.factory.additional.btry.btry_objects import Battery, ChargePod
 from environments.factory.base.registers import EnvObjectCollection, EntityCollection
 
 
-class BatteriesRegister(EnvObjectCollection):
+class Batteries(EnvObjectCollection):
 
     _accepted_objects = Battery
 
     def __init__(self, *args, **kwargs):
-        super(BatteriesRegister, self).__init__(*args, individual_slices=True,
-                                                is_blocking_light=False, can_be_shadowed=False, **kwargs)
+        super(Batteries, self).__init__(*args, individual_slices=True,
+                                        is_blocking_light=False, can_be_shadowed=False, **kwargs)
         self.is_observable = True
 
     def spawn_batteries(self, agents, initial_charge_level):
         batteries = [self._accepted_objects(initial_charge_level, agent, self) for _, agent in enumerate(agents)]
         self.add_additional_items(batteries)
 
-    def summarize_states(self, n_steps=None):
-        # as dict with additional nesting
-        # return dict(items=super(Inventories, cls).summarize_states())
-        return super(BatteriesRegister, self).summarize_states(n_steps=n_steps)
-
     # Todo Move this to Mixin!
     def by_entity(self, entity):
         try:
@@ -40,11 +35,7 @@ class BatteriesRegister(EnvObjectCollection):
 class ChargePods(EntityCollection):
 
     _accepted_objects = ChargePod
+    _stateless_entities = True
 
     def __repr__(self):
         super(ChargePods, self).__repr__()
-
-    def summarize_states(self, n_steps=None):
-        # as dict with additional nesting
-        # return dict(items=super(Inventories, cls).summarize_states())
-        return super(ChargePods, self).summarize_states(n_steps=n_steps)

environments/factory/additional/btry/btry_objects.py

@@ -35,7 +35,7 @@ class Battery(BoundingMixin, EnvObject):
 
     def summarize_state(self, **_):
         attr_dict = {key: str(val) for key, val in self.__dict__.items() if not key.startswith('_') and key != 'data'}
-        attr_dict.update(dict(name=self.name))
+        attr_dict.update(dict(name=self.name, belongs_to=self._bound_entity.name))
         return attr_dict
 
 
@@ -58,10 +58,3 @@ class ChargePod(Entity):
             return c.NOT_VALID
         valid = battery.do_charge_action(self.charge_rate)
         return valid
-
-    def summarize_state(self, n_steps=None) -> dict:
-        if n_steps == h.STEPS_START:
-            summary = super().summarize_state(n_steps=n_steps)
-            return summary
-        else:
-            {}

environments/factory/additional/btry/factory_battery.py

@@ -2,7 +2,7 @@ from typing import Dict, List
 
 import numpy as np
 
-from environments.factory.additional.btry.btry_collections import BatteriesRegister, ChargePods
+from environments.factory.additional.btry.btry_collections import Batteries, ChargePods
 from environments.factory.additional.btry.btry_util import Constants, Actions, RewardsBtry, BatteryProperties
 from environments.factory.base.base_factory import BaseFactory
 from environments.factory.base.objects import Agent, Action
@@ -45,8 +45,8 @@ class BatteryFactory(BaseFactory):
                                multi_charge=self.btry_prop.multi_charge)
         )
 
-        batteries = BatteriesRegister(self._level_shape if not self._pomdp_r else ((self.pomdp_diameter,) * 2),
-                                      )
+        batteries = Batteries(self._level_shape if not self._pomdp_r else ((self.pomdp_diameter,) * 2),
+                              )
         batteries.spawn_batteries(self[c.AGENT], self.btry_prop.initial_charge)
         super_entities.update({c.BATTERIES: batteries, c.CHARGE_PODS: charge_pods})
         return super_entities