Move move logic to brain parts

intelligine/core/exceptions.py

@@ -25,4 +25,10 @@ class BestPheromoneHere(PheromoneException):
         self._best_distance = best_distance
 
     def get_best_distance(self):
-        return self._best_distance
+        return self._best_distance
+
+class BrainException(Exception):
+    pass
+
+class BrainPartAlreadyExist(BrainException):
+    pass

intelligine/cst.py

@@ -34,3 +34,6 @@ COL_FIGHTER = IncrementedNamedInt.get('intelligine.col.walker')
 COL_TRANSPORTER = IncrementedNamedInt.get('intelligine.col.transporter')
 COL_TRANSPORTER_CARRYING = IncrementedNamedInt.get('intelligine.col.transporter_carrying')
 COL_TRANSPORTER_NOT_CARRYING = IncrementedNamedInt.get('intelligine.col.transporter_not_carrying')
+
+BRAIN_SCHEMA = IncrementedNamedInt.get('intelligine.brain_schema')
+BRAIN_PART_MOVE = IncrementedNamedInt.get('intelligine.brain.part.move')

intelligine/simulation/object/brain/AntBrain.py

@@ -1,16 +1,24 @@
 from intelligine.simulation.object.brain.Brain import Brain
+from intelligine.simulation.object.brain.part.AntMoveBrainPart import AntMoveBrainPart
 from intelligine.cst import MOVE_MODE, MOVE_MODE_EXPLO, MOVE_MODE_GOHOME, PHEROMON_DIR_HOME, PHEROMON_DIR_EXPLO
 from intelligine.cst import PHEROMONE_SEARCHING
+from intelligine.cst import BRAIN_PART_MOVE
 
 
 class AntBrain(Brain):
 
+    _brain_part_move_class = AntMoveBrainPart
+
     def __init__(self, context, host):
         super().__init__(context, host)
+        self._set_brain_part(BRAIN_PART_MOVE, self._get_move_brain_part_instance())
         self._movement_mode = MOVE_MODE_EXPLO
         self._distance_from_objective = 0  # TODO rename: distance_since_objective
         self._pheromone_searching = PHEROMON_DIR_EXPLO
 
+    def _get_move_brain_part_instance(self):
+        return self._brain_part_move_class()
+
     def switch_to_mode(self, mode):
         self._movement_mode = mode
         self._update_pheromone_gland(mode)

intelligine/simulation/object/brain/Brain.py

@@ -1,5 +1,28 @@
+from intelligine.core.exceptions import BrainPartAlreadyExist
+from intelligine.cst import BRAIN_SCHEMA
+
+
 class Brain():
 
+    _brain_part_class = {}
+
     def __init__(self, context, host):
         self._context = context
-        self._host = host
+        self._host = host
+        self._schema = {}
+        self._parts = {}
+
+    def _set_brain_part(self, name, brain_part, replace=False):
+        if name in self._parts and not replace:
+            raise BrainPartAlreadyExist()
+        self._parts[name] = brain_part
+        self._update_schema()
+
+    def get_part(self, name):
+        return self._parts[name]
+
+    def _update_schema(self):
+        self._schema = {}
+        for part_name in self._parts:
+            self._schema[part_name] = self._parts[part_name].__class__
+        self._context.metas.value.set(BRAIN_SCHEMA, self._host.get_id(), self._schema)

intelligine/synergy/event/move/PheromoneMoveAction.py → intelligine/simulation/object/brain/part/AntMoveBrainPart.py

@@ -1,25 +1,28 @@
-from intelligine.synergy.event.move.MoveAction import MoveAction
-from intelligine.cst import PHEROMONE_SEARCHING, MOVE_MODE_EXPLO
-from intelligine.cst import COL_TRANSPORTER_NOT_CARRYING, COL_TRANSPORTER_CARRYING
+from intelligine.simulation.object.brain.part.MoveBrainPart import MoveBrainPart
+from xyzworld.cst import POSITION
 from intelligine.core.exceptions import NoPheromone, BestPheromoneHere
+from intelligine.cst import PHEROMONE_SEARCHING, MOVE_MODE_EXPLO, COL_TRANSPORTER_NOT_CARRYING, COL_TRANSPORTER_CARRYING
 from intelligine.simulation.pheromone.DirectionPheromone import DirectionPheromone
 
 
-class PheromoneMoveAction(MoveAction):
+class AntMoveBrainPart(MoveBrainPart):
 
-    def _get_prepared_direction(self, context, object_point):
+    @classmethod
+    def get_direction(cls, context, object_id):
         try:
-            return self._get_direction_with_pheromones(context, object_point)
+            return cls._get_direction_with_pheromones(context, object_id)
         except NoPheromone:
-            return super()._get_prepared_direction(context, object_point)
+            return super().get_direction(context, object_id)
 
-    def _get_direction_with_pheromones(self, context, object_point):
-        pheromone_type = context.metas.value.get(PHEROMONE_SEARCHING, self._object_id)
+    @classmethod
+    def _get_direction_with_pheromones(cls, context, object_id):
+        object_point = context.metas.value.get(POSITION, object_id)
+        pheromone_type = context.metas.value.get(PHEROMONE_SEARCHING, object_id)
         try:
-            direction = self._get_pheromone_direction_for_point(context, object_point, pheromone_type)
+            direction = cls._get_pheromone_direction_for_point(context, object_point, pheromone_type)
         except NoPheromone:
             try:
-                direction = self._get_direction_of_pheromone(context, object_point, pheromone_type)
+                direction = cls._get_direction_of_pheromone(context, object_point, pheromone_type)
             except NoPheromone:
                 raise
         return direction
@@ -40,12 +43,12 @@ class PheromoneMoveAction(MoveAction):
         except NoPheromone as err:
             raise err
 
-    def _apply_move(self, obj, context):
-        super()._apply_move(obj, context)
+    def done(self, obj, context):
+        super().done(obj, context)
         self._appose_pheromone(obj, context)
 
         # TEST: le temps de tout tester
-        if self._move_to_point == obj.get_colony().get_start_position() and obj.is_carrying():
+        if obj.get_position() == obj.get_colony().get_start_position() and obj.is_carrying():
             obj_transported = obj.get_carried()
             obj_transported.set_carried_by(None)
             obj.put_carry(obj_transported, (-1, 0, 0))
@@ -64,4 +67,3 @@ class PheromoneMoveAction(MoveAction):
         except BestPheromoneHere as best_pheromone_here:
             obj.get_brain().set_distance_from_objective(best_pheromone_here.get_best_distance())
 
-

intelligine/simulation/object/brain/part/BrainPart.py

@@ -0,0 +1,4 @@
+class BrainPart():
+
+    def done(self, obj, context):
+        pass

intelligine/simulation/object/brain/part/MoveBrainPart.py

@@ -0,0 +1,38 @@
+from intelligine.simulation.object.brain.part.BrainPart import BrainPart
+from intelligine.synergy.event.move.direction import directions_same_level, directions_slighty
+from random import randint, choice, randrange
+from intelligine.cst import BLOCKED_SINCE, PREVIOUS_DIRECTION
+
+
+class MoveBrainPart(BrainPart):
+
+    @classmethod
+    def get_direction(cls, context, object_id):
+        return cls._get_random_direction(context, object_id)
+
+    @classmethod
+    def _get_random_direction(cls, context, object_id):
+        try:
+            blocked_since = context.metas.value.get(BLOCKED_SINCE, object_id)
+        except KeyError:
+            blocked_since = 0
+        direction_name = None
+        if blocked_since <= 3:  #TODO: config
+            try:
+                previous_direction = context.metas.value.get(PREVIOUS_DIRECTION, object_id)
+                # TODO: Faut mettre ca en plus propre (proba d'aller tou droit, config, etc)
+                if randrange(100) < 75:  # 75% de change d'aller tout droit
+                    # Dans le futur: les fourmis vont moins tout droit quand elle se croient et se touche
+                    return previous_direction
+
+                directions_list = directions_slighty[previous_direction]
+                # TODO: TMP tant que 1 niveau (z)
+                directions_list = [direction for direction in directions_list if direction > 9 and direction < 19]
+                direction_name = choice(directions_list)
+            except KeyError:
+                pass
+
+        if not direction_name:
+            direction_name = randint(directions_same_level[0], directions_same_level[1])
+
+        return direction_name

intelligine/synergy/Colony.py

@@ -1,5 +1,5 @@
 from synergine.synergy.collection.SynergyCollection import SynergyCollection
-from intelligine.synergy.event.move.PheromoneMoveAction import PheromoneMoveAction
+from intelligine.synergy.event.move.MoveAction import MoveAction
 from intelligine.synergy.event.attack.NearAttackableAction import NearAttackableAction
 from intelligine.synergy.event.transport.TakeableAction import TakeableAction
 from intelligine.synergy.event.transport.PutableAction import PutableAction
@@ -10,7 +10,7 @@ class Colony(SynergyCollection):
 
     def __init__(self, configuration):
         super().__init__(configuration)
-        self._actions = [PheromoneMoveAction, NearAttackableAction, TakeableAction, PutableAction,
+        self._actions = [MoveAction, NearAttackableAction, TakeableAction, PutableAction,
                          CycleAction]
         self._start_position = configuration.get_start_position()
 

intelligine/synergy/event/move/MoveAction.py

@@ -1,10 +1,8 @@
 from synergine.synergy.event.Action import Action
 from intelligine.synergy.event.move.MoveEvent import MoveEvent
-from random import randint, choice, randrange
 from synergine.synergy.event.exception.ActionAborted import ActionAborted
 from xyzworld.cst import POSITION
-from intelligine.cst import PREVIOUS_DIRECTION, BLOCKED_SINCE
-from intelligine.synergy.event.move.direction import directions_same_level, directions_slighty
+from intelligine.cst import PREVIOUS_DIRECTION, BLOCKED_SINCE, BRAIN_PART_MOVE, BRAIN_SCHEMA
 from intelligine.synergy.event.move.direction import get_position_with_direction_decal
 
 
@@ -19,11 +17,13 @@ class MoveAction(Action):
 
     def prepare(self, context):
         object_point = context.metas.value.get(POSITION, self._object_id)
-        direction = self._get_prepared_direction(context, object_point)
+        direction = self._get_prepared_direction(context)
         self._set_prepared_direction(context, object_point, direction)
 
-    def _get_prepared_direction(self, context, object_point):
-        return self._get_random_direction(context)
+    def _get_prepared_direction(self, context):
+        object_brain_schema = context.metas.value.get(BRAIN_SCHEMA, self._object_id)
+        object_move_brain_part = object_brain_schema[BRAIN_PART_MOVE]
+        return object_move_brain_part.get_direction(context, self._object_id)
 
     def _set_prepared_direction(self, context, object_point, direction):
         move_to_point = get_position_with_direction_decal(direction, object_point)
@@ -34,32 +34,6 @@ class MoveAction(Action):
             # TODO: mettre self._dont_move = True ?
             pass
 
-    def _get_random_direction(self, context):
-        try:
-            blocked_since = context.metas.value.get(BLOCKED_SINCE, self._object_id)
-        except KeyError:
-            blocked_since = 0
-        direction_name = None
-        if blocked_since <= 3:  #TODO: config
-            try:
-                previous_direction = context.metas.value.get(PREVIOUS_DIRECTION, self._object_id)
-                # TODO: Faut mettre ca en plus propre (proba d'aller tou droit, config, etc)
-                if randrange(100) < 75:  # 75% de change d'aller tout droit
-                    # Dans le futur: les fourmis vont moins tout droit quand elle se croient et se touche
-                    return previous_direction
-
-                directions_list = directions_slighty[previous_direction]
-                # TODO: TMP tant que 1 niveau (z)
-                directions_list = [direction for direction in directions_list if direction > 9 and direction < 19]
-                direction_name = choice(directions_list)
-            except KeyError:
-                pass
-
-        if not direction_name:
-            direction_name = randint(directions_same_level[0], directions_same_level[1])
-
-        return direction_name
-
     @staticmethod
     def _direction_point_is_possible(context, direction_point):
         return context.position_is_penetrable(direction_point)
@@ -77,5 +51,8 @@ class MoveAction(Action):
             raise ActionAborted()
 
         obj.set_position(self._move_to_point)
+        obj.get_brain().get_part(BRAIN_PART_MOVE).done(obj, context)
+
+        # TODO: Ces metas update dans ant ?
         context.metas.value.set(PREVIOUS_DIRECTION, self._object_id, self._move_to_direction)
-        context.metas.value.set(BLOCKED_SINCE, self._object_id, 0)
+        context.metas.value.set(BLOCKED_SINCE, self._object_id, 0)

intelligine/tests/simulation/mode/TestChangeMode.py

@@ -10,7 +10,7 @@ from intelligine.tests.simulation.mode.Base import Base
 from intelligine.synergy.Colony import Colony
 from intelligine.synergy.Simulation import Simulation
 from intelligine.synergy.ColonyConfiguration import ColonyConfiguration
-from intelligine.synergy.event.move.PheromoneMoveAction import PheromoneMoveAction
+from intelligine.synergy.event.move.MoveAction import MoveAction
 from intelligine.synergy.event.move.direction import NORTH, SOUTH
 from intelligine.tests.src.event.MoveAction import MoveAction as TestMoveAction
 from synergine.synergy.collection.SynergyCollection import SynergyCollection
@@ -43,7 +43,7 @@ class TestChangeMode(Base):
         class TestColony(Colony):
             def __init__(self, configuration):
                 super().__init__(configuration)
-                self._actions.remove(PheromoneMoveAction)
+                self._actions.remove(MoveAction)
                 TestMoveAction.force_direction = test_case._force_move
                 self._actions.append(TestMoveAction)
         return TestColony(self._get_colony_configuration())

intelligine/tests/src/event/MoveAction.py

@@ -1,13 +1,10 @@
-from intelligine.synergy.event.move.PheromoneMoveAction import PheromoneMoveAction as BaseMoveAction
+from intelligine.synergy.event.move.MoveAction import MoveAction as BaseMoveAction
 from intelligine.synergy.event.move.direction import NORTH
 
 
 class MoveAction(BaseMoveAction):
 
-    force_direction = lambda self, context, object_point: NORTH
+    force_direction = lambda self, context, object_id: NORTH
 
-    def _get_direction_with_pheromones(self, context, object_point):
-        return self.force_direction(context, object_point)
-
-    # def _get_random_direction(self, context):
-    #     return self.force_direction
+    def _get_prepared_direction(self, context):
+        return self.force_direction(context, self._object_id)