Use meta information for pheromone searching

intelligine/cst.py

@@ -14,6 +14,7 @@ CARRYING = IncrementedNamedInt.get('intelligine.carrying')
 CANT_CARRY_STILL = IncrementedNamedInt.get('intelligine.cantcarry.still')
 CANT_PUT_STILL = IncrementedNamedInt.get('intelligine.cantput.still')
 ACTION_DIE = IncrementedNamedInt.get('intelligine.basebug.action.die')
+PHEROMONE_SEARCHING = IncrementedNamedInt.get('intelligine.pheromone_searching')
 
 MOVE_MODE = IncrementedNamedInt.get('intelligine.basebug.move.mode')
 MOVE_MODE_EXPLO = IncrementedNamedInt.get('intelligine.basebug.move.mode.explo')

intelligine/simulation/object/brain/AntBrain.py

@@ -1,5 +1,6 @@
 from intelligine.simulation.object.brain.Brain import Brain
 from intelligine.cst import MOVE_MODE, MOVE_MODE_EXPLO, MOVE_MODE_GOHOME, PHEROMON_DIR_HOME, PHEROMON_DIR_EXPLO
+from intelligine.cst import PHEROMONE_SEARCHING
 
 
 class AntBrain(Brain):
@@ -8,12 +9,14 @@ class AntBrain(Brain):
         super().__init__(context, host)
         self._movement_mode = MOVE_MODE_EXPLO
         self._distance_from_objective = 0  # TODO rename: distance_since_objective
+        self._pheromone_searching = PHEROMON_DIR_EXPLO
 
     def switch_to_mode(self, mode):
         self._movement_mode = mode
         self._update_pheromone_gland(mode)
         self._context.metas.value.set(MOVE_MODE, self._host.get_id(), mode)
         self._distance_from_objective = 0
+        self._update_pheromone_searching(mode)
 
     def _update_pheromone_gland(self, mode):
         if mode == MOVE_MODE_EXPLO:
@@ -24,6 +27,16 @@ class AntBrain(Brain):
             raise NotImplementedError()
         self._host.get_movement_pheromone_gland().set_pheromone_type(pheromone_direction_type)
 
+    def _update_pheromone_searching(self, mode):
+        if mode == MOVE_MODE_EXPLO:
+            pheromone_searching = PHEROMON_DIR_EXPLO
+        elif mode == MOVE_MODE_GOHOME:
+            pheromone_searching = PHEROMON_DIR_HOME
+        else:
+            raise NotImplementedError()
+        self._pheromone_searching = pheromone_searching
+        self._context.metas.value.set(PHEROMONE_SEARCHING, self._host.get_id(), pheromone_searching)
+
     def get_movement_mode(self):
         return self._movement_mode
 

intelligine/simulation/pheromone/DirectionPheromone.py

@@ -10,14 +10,6 @@ from intelligine.synergy.event.move.direction import get_direction_for_degrees
 class DirectionPheromone():
 
     @staticmethod
-    def get_pheromone_type_for_move_mode(move_mode):
-        if move_mode == MOVE_MODE_EXPLO:
-            return PHEROMON_DIR_EXPLO
-        if move_mode == MOVE_MODE_GOHOME:
-            return PHEROMON_DIR_HOME
-        raise NotImplementedError()
-
-    @staticmethod
     def appose(context, point, movement_molecules):
         pheromone_type, distance_from = movement_molecules
         # TODO: Ajouter l'age de la pheromone !

intelligine/synergy/event/move/MoveAction.py

@@ -2,7 +2,7 @@ from synergine.synergy.event.Action import Action
 from intelligine.synergy.event.move.MoveEvent import MoveEvent
 from random import randint, choice, randrange
 from xyzworld.cst import POSITION
-from intelligine.cst import PREVIOUS_DIRECTION, BLOCKED_SINCE, MOVE_MODE, MOVE_MODE_EXPLO
+from intelligine.cst import PREVIOUS_DIRECTION, BLOCKED_SINCE, MOVE_MODE, MOVE_MODE_EXPLO, PHEROMONE_SEARCHING
 from intelligine.cst import COL_TRANSPORTER_NOT_CARRYING, COL_TRANSPORTER_CARRYING
 from intelligine.synergy.event.move.direction import directions_same_level, directions_modifiers, directions_slighty
 from intelligine.synergy.event.move.direction import get_position_with_direction_decal
@@ -36,8 +36,7 @@ class MoveAction(Action):
             pass
 
     def _get_direction_with_pheromones(self, context, object_point):
-        object_movement_mode = context.metas.value.get(MOVE_MODE, self._object_id)
-        pheromone_type = DirectionPheromone.get_pheromone_type_for_move_mode(object_movement_mode)
+        pheromone_type = context.metas.value.get(PHEROMONE_SEARCHING, self._object_id)
         try:
             direction = self._get_pheromone_direction_for_point(context, object_point, pheromone_type)
         except NoPheromone:
@@ -119,7 +118,7 @@ class MoveAction(Action):
     @staticmethod
     def _appose_pheromone(obj, context):
         # TODO: Cette action de pheromone doit etre une surcharge de Move afin d'avoir une Action Move generique.
-        obj.get_brain().host_moved()
+        obj.get_brain().host_moved()  # TODO: Auto quand set_position ? (test iit)
         try:
             DirectionPheromone.appose(context,
                                       obj.get_position(),