Implem

Author: gaorkl

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='simple_playgrounds',
-    version='0.9.8',
+    version='0.9.9',
     description='Simulator for AGI and RL',
     author='Michael Garcia Ortiz',
     author_email='[email protected]',

simple_playgrounds/entities/agents/agent.py

@@ -122,7 +122,7 @@ def velocity(self):
 
     @velocity.setter
     def velocity(self, velocity):
-        for part in self.base_platform:
+        for part in self.parts:
             part.velocity = velocity
 
     @property

simple_playgrounds/entities/agents/basic_agents.py

@@ -18,19 +18,31 @@
 
 class BaseAgent(Agent):
     """
-    Base Agent with a single HolonomicPlatform as a Base
+    Base Agent with a single HolonomicPlatform as a Base.
+    No interactive actions.
     """
     def __init__(self, initial_position=None, **kwargs):
 
         base_agent = HolonomicPlatform(name='base', radius=10,
-                                       can_eat=True, can_grasp=True, can_activate=True, can_absorb=True)
+                                       can_eat=False, can_grasp=False, can_activate=False, can_absorb=False)
 
         super().__init__(initial_position=initial_position, base_platform=base_agent, **kwargs)
 
 
+class BaseInteractiveAgent(Agent):
+    """
+        Base Agent with a single HolonomicPlatform as a Base.
+        With Interactive actions.
+        """
+
+    def __init__(self, initial_position=None, **kwargs):
+        base_agent = HolonomicPlatform(name='base', radius=10,
+                                       can_eat=True, can_grasp=True, can_activate=True, can_absorb=True)
+
+        super().__init__(initial_position=initial_position, base_platform=base_agent, **kwargs)
+
     @property
     def key_mapping(self):
-
         keys = []
 
         keys.append(Keymap(self.base_platform.name, ActionTypes.GRASP, K_g, KeyTypes.PRESS_HOLD, 1))

simple_playgrounds/entities/field.py

@@ -2,7 +2,7 @@
 Module for Field
 """
 import random
-from simple_playgrounds.utils.definitions import SceneElementTypes
+from simple_playgrounds.utils import SceneElementTypes
 
 #pylint: disable=too-many-instance-attributes
 #pylint: disable=too-many-arguments

simple_playgrounds/entities/scene_elements/__init__.py

@@ -1,8 +1,10 @@
-from simple_playgrounds.entities.scene_elements.collection.basic import *
-from simple_playgrounds.entities.scene_elements.collection.contact import *
-from simple_playgrounds.entities.scene_elements.collection.passive import *
-from simple_playgrounds.entities.scene_elements.collection.interactive import *
-from simple_playgrounds.entities.scene_elements.collection.proximity import *
-from simple_playgrounds.entities.scene_elements.collection.edible import *
-from simple_playgrounds.entities.scene_elements.collection.gem import *
-from simple_playgrounds.entities.scene_elements.collection import *
+from simple_playgrounds.entities.scene_elements.collection.basic import Basic, Door
+from simple_playgrounds.entities.scene_elements.collection.conditioning import ConditionedColorChanging, ColorChanging
+from simple_playgrounds.entities.scene_elements.collection.contact \
+    import Candy, Poison, VisibleDeathTrap, VisibleEndGoal, PushButton
+from simple_playgrounds.entities.scene_elements.collection.passive import ToxicZone, HealingZone, DeathZone, GoalZone
+from simple_playgrounds.entities.scene_elements.collection.interactive \
+    import Lever, Lock, OpenCloseSwitch, VendingMachine,TimerSwitch, Dispenser, Chest
+from simple_playgrounds.entities.scene_elements.collection.proximity import Fireball, Fairy
+from simple_playgrounds.entities.scene_elements.collection.edible import Apple, RottenApple
+from simple_playgrounds.entities.scene_elements.collection.gem import Key, Coin

simple_playgrounds/entities/scene_elements/collection/basic.py

@@ -48,6 +48,7 @@ def __init__(self, initial_position, **kwargs):
 
         self.opened = False
 
+
     @property
     def opened(self):
         """ State of the door. True if door is opened."""

simple_playgrounds/entities/scene_elements/collection/conditioning.py

@@ -1,7 +1,7 @@
 """
 Scene Elements used for conditioning experiments
 """
-from simple_playgrounds.entities.scene_elements import Lever
+from simple_playgrounds.entities.scene_elements.collection.interactive import Lever
 from simple_playgrounds.entities.scene_elements.element import SceneElement
 from simple_playgrounds.playgrounds.playground import Playground
 

simple_playgrounds/entities/scene_elements/collection/contact.py

@@ -192,6 +192,6 @@ def activate(self):
         list_remove = [self, self.door]
         list_add = []
 
-        self.door.open_door()
+        self.door.opened = True
 
         return list_remove, list_add

simple_playgrounds/entities/scene_elements/collection/interactive.py

@@ -5,12 +5,13 @@
 
 from simple_playgrounds.entities.scene_elements.element import SceneElement
 from simple_playgrounds.utils.definitions import CollisionTypes
-from simple_playgrounds.utils.position_utils import  PositionAreaSampler
+from simple_playgrounds.utils.position_utils import PositionAreaSampler
 from simple_playgrounds.entities.agents.parts import Part
 from simple_playgrounds.playgrounds.playground import Playground
 
 #pylint: disable=line-too-long
 
+
 class InteractiveSceneElement(SceneElement, ABC):
     """Base Class dor InteractiveSceneElements"""
     interactive = True
@@ -19,6 +20,8 @@ def __init__(self, **kwargs):
         SceneElement.__init__(self, **kwargs)
         self.pm_interaction_shape.collision_type = CollisionTypes.INTERACTIVE
 
+        self.activated = False
+
     @abstractmethod
     def activate(self, activating_entity):
         """
@@ -47,6 +50,10 @@ def reward(self):
     def reward(self, rew):
         ...
 
+    def pre_step(self):
+        self.activated = False
+
+
 
 class Lever(InteractiveSceneElement):
     """Lever Entities provide a reward when activated."""
@@ -67,7 +74,7 @@ def __init__(self, initial_position, **kwargs):
         self.reward_provided = False
 
     def pre_step(self):
-
+        super().pre_step()
         self.reward_provided = False
 
     @property
@@ -148,7 +155,7 @@ def activate(self, _):
         list_remove = []
         list_add = []
 
-        if len(self.produced_entities) < self.production_limit:
+        if len(self.produced_entities) < self.production_limit and self.activated is False:
 
             if self.local_dispenser:
                 initial_position = self.location_sampler.sample([self.position[0], self.position[1]])
@@ -161,6 +168,8 @@ def activate(self, _):
             self.produced_entities.append(obj)
             list_add = [obj]
 
+            self.activated = True
+
         return list_remove, list_add
 
     def reset(self):
@@ -256,9 +265,10 @@ def activate(self, activating_entity):
         list_add = []
         list_remove = []
 
-        if activating_entity in self.accepted_coins.copy():
+        if activating_entity in self.accepted_coins.copy() and self.activated is False:
             list_remove = [activating_entity]
             self.accepted_coins.remove(activating_entity)
+            self.activated = True
 
         return list_remove, list_add
 
@@ -282,6 +292,10 @@ def __init__(self, initial_position, door, **kwargs):
                 Can be list [x,y,theta], AreaPositionSampler or Trajectory.
             door: Door opened by the switch.
             **kwargs: other params to configure entity. Refer to Entity class.
+
+        Notes:
+            It is possible to have multiple switches for a single door.
+            However the behavior is unstable in multiagent setting.
         """
 
         default_config = self._parse_configuration('interactive', 'switch')
@@ -300,13 +314,16 @@ def activate(self, _):
         list_add = []
         list_remove = []
 
-        if self.door.opened:
-            self.door.opened = False
-            list_add = [self.door]
+        if self.activated is False:
+            if self.door.opened:
+                self.door.opened = False
+                list_add = [self.door]
 
-        else:
-            self.door.opened = True
-            list_remove = [self.door]
+            else:
+                self.door.opened = True
+                list_remove = [self.door]
+
+            self.activated = True
 
         return list_remove, list_add
 
@@ -353,12 +370,13 @@ def activate(self, activating_entity):
         list_remove = []
         list_add = []
 
-        if isinstance(activating_entity, Part):
+        if isinstance(activating_entity, Part) and self.activated is False:
             if not self.door.opened:
                 self.door.opened = True
                 list_remove = [self.door]
 
             self._reset_timer()
+            self.activated = True
 
         if isinstance(activating_entity, Playground):
             self.door.opened = False
@@ -373,13 +391,14 @@ def _reset_timer(self):
 
     def pre_step(self):
 
+        self.activated = False
         if self.door.opened:
             self.timer -= 1
 
     def reset(self):
 
         self.timer = self.time_open
-        self.door.close_door()
+        self.door.opened = False
 
 
 class Lock(InteractiveSceneElement):

simple_playgrounds/game_engine.py

@@ -318,7 +318,7 @@ def generate_sensor_image(self, agent, width_sensor=200, height_sensor=30):
 
         return full_img
 
-    def run(self):
+    def run(self, with_screen = False):
         """ Run the engine for the full duration of the game"""
 
         while self.game_on:
@@ -329,3 +329,11 @@ def run(self):
 
             self.step(actions)
             self.update_observations()
+
+            if with_screen:
+                self.display_full_scene()
+
+            # for agent in self.agents:
+            #     print(agent.position, agent.base_platform.pm_body.velocity, agent.base_platform.pm_body.kinetic_energy)
+            #     assert 0 < agent.position[0] < self.playground.size[0]
+            #     assert 0 < agent.position[1] < self.playground.size[1]

simple_playgrounds/playgrounds/collection/test/__init__.py

@@ -0,0 +1 @@
+from .test_scene_elements import *