Move pheromone appose in pheromone gland

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

@@ -1,6 +1,6 @@
 from intelligine.simulation.object.brain.part.MoveBrainPart import MoveBrainPart
 from xyzworld.cst import POSITION
-from intelligine.core.exceptions import NoPheromone, BestPheromoneHere
+from intelligine.core.exceptions import NoPheromone
 from intelligine.cst import PHEROMONE_SEARCHING, MOVE_MODE_EXPLO, COL_TRANSPORTER_NOT_CARRYING, COL_TRANSPORTER_CARRYING
 from intelligine.simulation.pheromone.DirectionPheromone import DirectionPheromone
 
@@ -45,7 +45,7 @@ class AntMoveBrainPart(MoveBrainPart):
 
     def done(self, obj, context):
         super().done(obj, context)
-        self._appose_pheromone(obj, context)
+        self._appose_pheromone(obj)
 
         # TEST: le temps de tout tester
         if obj.get_position() == obj.get_colony().get_start_position() and obj.is_carrying():
@@ -58,12 +58,6 @@ class AntMoveBrainPart(MoveBrainPart):
                                                  COL_TRANSPORTER_CARRYING)
 
     @staticmethod
-    def _appose_pheromone(obj, context):
-        # TODO: Cette action de pheromone doit etre une surcharge de Move afin d'avoir une Action Move generique.
-        try:
-            DirectionPheromone.appose(context,
-                                      obj.get_position(),
-                                      obj.get_movement_pheromone_gland().get_movement_molecules())
-        except BestPheromoneHere as best_pheromone_here:
-            obj.get_brain().set_distance_from_objective(best_pheromone_here.get_best_distance())
+    def _appose_pheromone(obj):
+        obj.get_movement_pheromone_gland().appose()
 

intelligine/simulation/object/pheromone/PheromoneGland.py

@@ -1,8 +1,12 @@
+from intelligine.core.exceptions import BestPheromoneHere
+from intelligine.simulation.pheromone.DirectionPheromone import DirectionPheromone
+
 class PheromoneGland():
 
-    def __init__(self, host):
+    def __init__(self, host, context):
         self._pheromone_type = None
         self._host = host
+        self._context = context
 
     def set_pheromone_type(self, pheromone_type):
         self._pheromone_type = pheromone_type
@@ -10,4 +14,12 @@ class PheromoneGland():
     def get_pheromone_type(self):
         if self._pheromone_type is None:
             raise Exception("pheromone_type not specified")
-        return self._pheromone_type
+        return self._pheromone_type
+
+    def appose(self):
+        try:
+            DirectionPheromone.appose(self._context,
+                                      self._host.get_position(),
+                                      self._host.get_movement_pheromone_gland().get_movement_molecules())
+        except BestPheromoneHere as best_pheromone_here:
+            self._host.get_brain().set_distance_from_objective(best_pheromone_here.get_best_distance())

intelligine/synergy/object/ant/Ant.py

@@ -20,7 +20,7 @@ class Ant(Bug):
                                                            COL_FIGHTER])
         self._carried = []
         self._last_pheromones_points = {}
-        self._movement_pheromone_gland = MovementPheromoneGland(self)
+        self._movement_pheromone_gland = MovementPheromoneGland(self, self._context)
         self._brain.switch_to_mode(MOVE_MODE_EXPLO)
 
     def _get_brain_instance(self):