clean code

intelligine/simulation/object/brain/AntBrain.py

@@ -2,27 +2,30 @@ from intelligine.simulation.object.brain.Brain import Brain
 from intelligine.simulation.object.brain.part.attack.AttackBrainPart import AttackBrainPart
 from intelligine.simulation.object.brain.part.move.AntMoveBrainPart import AntMoveBrainPart
 from intelligine.cst import MOVE_MODE, MOVE_MODE_EXPLO, MOVE_MODE_GOHOME, PHEROMON_DIR_EXPLO, \
-    BRAIN_PART_TAKE, BRAIN_PART_PUT, MOVE_MODE_NURSE, PHEROMON_DIR_NONE, BRAIN_PART_ATTACK, MOVE_MODE_HOME, SMELL_FOOD
+    BRAIN_PART_TAKE, BRAIN_PART_PUT, MOVE_MODE_NURSE, PHEROMON_DIR_NONE, BRAIN_PART_ATTACK, MOVE_MODE_HOME, \
+    SMELL_FOOD, SMELL_EGG
 from intelligine.cst import MOLECULE_SEARCHING
 from intelligine.cst import BRAIN_PART_MOVE
 from intelligine.simulation.object.brain.part.transport.AntPutBrainPart import AntPutBrainPart
 from intelligine.simulation.object.brain.part.transport.AntTakeBrainPart import AntTakeBrainPart
 from intelligine.synergy.object.Food import Food
+from intelligine.synergy.object.ant.Egg import Egg
 from synergine.core.exceptions import NotFound
 
 
 class AntBrain(Brain):
 
-    # TODO: methode __init_ pour la classe ? Pour surcharger ici.
-    _brain_parts = {
+    _brain_parts = Brain._brain_parts.copy()
+    _brain_parts.update({
         BRAIN_PART_MOVE: AntMoveBrainPart,
         BRAIN_PART_TAKE: AntTakeBrainPart,
         BRAIN_PART_PUT: AntPutBrainPart,
         BRAIN_PART_ATTACK: AttackBrainPart
-    }
+    })
 
     _taken_smell_matches = {
-        Food: SMELL_FOOD
+        Food: SMELL_FOOD,
+        Egg: SMELL_EGG
     }
     """ Correspondance entre ce qui est ramassé et où ce doit être stocké """
 
@@ -65,6 +68,7 @@ class AntBrain(Brain):
         elif mode == MOVE_MODE_NURSE:
             molecule_searching = PHEROMON_DIR_NONE
         elif mode == MOVE_MODE_HOME:
+            # TODO: Ca depend de ce que fait la fourmis, si s'occupe des oeufs, etc
             molecule_searching = self.get_part(BRAIN_PART_TAKE).get_smell_target()
         else:
             raise NotImplementedError()
@@ -76,7 +80,7 @@ class AntBrain(Brain):
         return self._movement_mode
 
     def host_moved(self, distance=1):
-        self._distance_from_objective += 1
+        self._distance_from_objective += distance
 
     def set_distance_from_objective(self, distance):
         self._distance_from_objective = distance

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

@@ -6,7 +6,7 @@ from intelligine.synergy.event.move.direction import directions_modifiers, get_p
 from synergine_xyz.cst import POSITION
 from intelligine.core.exceptions import NoMolecule
 from intelligine.cst import MOLECULE_SEARCHING, MOVE_MODE_EXPLO, MOVE_MODE_HOME, MOVE_MODE, MOVE_MODE_GOHOME, \
-    EXPLORATION_VECTOR, MOLECULES_DIRECTION, SMELL_FOOD, SMELL_EGG, BRAIN_SCHEMA, BRAIN
+    EXPLORATION_VECTOR, MOLECULES_DIRECTION
 from intelligine.simulation.molecule.DirectionMolecule import DirectionMolecule
 
 
@@ -103,22 +103,16 @@ class AntMoveBrainPart(MoveBrainPart):
         movement_mode = self._host_brain.get_movement_mode()
 
         if movement_mode == MOVE_MODE_GOHOME and self._on_home_smell(self._context, self._host.get_id()):
-            self._host_brain.switch_to_mode(MOVE_MODE_HOME)
-            ant_star = self._get_by_pass_brain(self._context, self._host.get_id())
-            ant_star.erase()
-            # TODO: on change les molecule recherché (Food => SmellFood, definis dans Take, en fct de ce qui est take)
+            self._arrived_at_home()
 
         elif movement_mode == MOVE_MODE_HOME and not self._on_home_smell(self._context, self._host.get_id()):
-            self._host_brain.switch_to_mode(MOVE_MODE_EXPLO)
             self._start_new_exploration()
 
         elif movement_mode == MOVE_MODE_EXPLO and self._on_home_smell(self._context, self._host.get_id()):
-            self._start_new_exploration()  # TODO: rename en reinit_explo
+            self._init_exploration_vector()
 
         # TODO: sitch explo si rien a faire (rien a poser par exemple) et HOME
 
-        # TODO: Poser sur StockedFood
-
     @classmethod
     def _on_home_smell(cls, context, object_id):
         current_position = context.metas.value.get(POSITION, object_id)
@@ -146,7 +140,17 @@ class AntMoveBrainPart(MoveBrainPart):
             self._update_exploration_vector()
 
     def _start_new_exploration(self):
+        self._reinit_exploration_vector()
+        self._host_brain.switch_to_mode(MOVE_MODE_EXPLO)
+
+    def _init_exploration_vector(self):
         # On vient de rentrer dans le monde exterieur, le vecteur de départ pointe vers la case précedente
         # qui est une case dans la forteresse.
         init_exploration_vector = get_position_with_direction_decal(self.get_host().get_previous_direction())
         self._set_exploration_vector(init_exploration_vector)
+
+
+    def _arrived_at_home(self):
+        self._host_brain.switch_to_mode(MOVE_MODE_HOME)
+        ant_star = self._get_by_pass_brain(self._context, self._host.get_id())
+        ant_star.erase()