|
@@ -1,6 +1,6 @@
|
1
|
1
|
from intelligine.simulation.object.brain.part.MoveBrainPart import MoveBrainPart
|
2
|
2
|
from xyzworld.cst import POSITION
|
3
|
|
-from intelligine.core.exceptions import NoPheromone, BestPheromoneHere
|
|
3
|
+from intelligine.core.exceptions import NoPheromone
|
4
|
4
|
from intelligine.cst import PHEROMONE_SEARCHING, MOVE_MODE_EXPLO, COL_TRANSPORTER_NOT_CARRYING, COL_TRANSPORTER_CARRYING
|
5
|
5
|
from intelligine.simulation.pheromone.DirectionPheromone import DirectionPheromone
|
6
|
6
|
|
|
@@ -45,7 +45,7 @@ class AntMoveBrainPart(MoveBrainPart):
|
45
|
45
|
|
46
|
46
|
def done(self, obj, context):
|
47
|
47
|
super().done(obj, context)
|
48
|
|
- self._appose_pheromone(obj, context)
|
|
48
|
+ self._appose_pheromone(obj)
|
49
|
49
|
|
50
|
50
|
# TEST: le temps de tout tester
|
51
|
51
|
if obj.get_position() == obj.get_colony().get_start_position() and obj.is_carrying():
|
|
@@ -58,12 +58,6 @@ class AntMoveBrainPart(MoveBrainPart):
|
58
|
58
|
COL_TRANSPORTER_CARRYING)
|
59
|
59
|
|
60
|
60
|
@staticmethod
|
61
|
|
- def _appose_pheromone(obj, context):
|
62
|
|
- # TODO: Cette action de pheromone doit etre une surcharge de Move afin d'avoir une Action Move generique.
|
63
|
|
- try:
|
64
|
|
- DirectionPheromone.appose(context,
|
65
|
|
- obj.get_position(),
|
66
|
|
- obj.get_movement_pheromone_gland().get_movement_molecules())
|
67
|
|
- except BestPheromoneHere as best_pheromone_here:
|
68
|
|
- obj.get_brain().set_distance_from_objective(best_pheromone_here.get_best_distance())
|
|
61
|
+ def _appose_pheromone(obj):
|
|
62
|
+ obj.get_movement_pheromone_gland().appose()
|
69
|
63
|
|