Remove old molecule (replaced by vector integration)

intelligine/cst.py

@@ -40,7 +40,6 @@ MOLECULES_INFOS = IncrementedNamedInt.get('intelligine.phero.infos')
 MOLECULES_DIRECTION = IncrementedNamedInt.get('intelligine.phero.direction')
 PHEROMON_DIR_NONE = IncrementedNamedInt.get('intelligine.phero.direction.none')
 PHEROMON_DIR_EXPLO = IncrementedNamedInt.get('intelligine.phero.direction.explo')
-PHEROMON_DIR_HOME = IncrementedNamedInt.get('intelligine.phero.direction.home')
 EXPLORATION_VECTOR = IncrementedNamedInt.get('intelligine.exploration_vector')
 
 #SMELL = IncrementedNamedInt.get('intelligine.smell')

intelligine/display/Pygame.py

@@ -2,8 +2,7 @@ from intelligine.core.exceptions import NoMolecule
 from intelligine.synergy.object.ant.Ant import Ant
 from synergine_xyz.display.Pygame import Pygame as XyzPygame
 import pygame
-from intelligine.cst import PHEROMON_DIR_HOME, PHEROMON_DIR_EXPLO, MOLECULES, \
-    SMELL_EGG, SMELL_FOOD, MOLECULES_DIRECTION
+from intelligine.cst import PHEROMON_DIR_EXPLO, MOLECULES, SMELL_EGG, SMELL_FOOD, MOLECULES_DIRECTION
 from intelligine.display.pygame.visualisation import SURFACE_PHEROMONE_EXPLORATION, SURFACE_PHEROMONE_HOME, \
     SURFACE_SMELL_EGG, SURFACE_SMELL_FOOD
 
@@ -34,12 +33,6 @@ class Pygame(XyzPygame):
         for point in molecules_positions:
             point_flavour = context.molecules().get_flavour(point)
             try:
-                point_flavour.get_molecule(category=MOLECULES_DIRECTION, type=PHEROMON_DIR_HOME)
-                self.draw_surface(point, molecule_home_surface)
-            except NoMolecule:
-                pass # No molecule here
-
-            try:
                 molecule = point_flavour.get_molecule(category=MOLECULES_DIRECTION, type=PHEROMON_DIR_EXPLO)
                 self.draw_surface(point, molecule_exploration_surface)
 

intelligine/simulation/object/brain/AntBrain.py

@@ -1,7 +1,7 @@
 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_HOME, PHEROMON_DIR_EXPLO, \
+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
 from intelligine.cst import MOLECULE_SEARCHING
 from intelligine.cst import BRAIN_PART_MOVE
@@ -41,7 +41,7 @@ class AntBrain(Brain):
 
     def _update_molecule_gland(self, mode):
         if mode == MOVE_MODE_EXPLO:
-            molecule_direction_type = PHEROMON_DIR_HOME
+            molecule_direction_type = None
         elif mode == MOVE_MODE_GOHOME:
             molecule_direction_type = PHEROMON_DIR_EXPLO
             self._distance_from_objective = 0
@@ -62,8 +62,7 @@ class AntBrain(Brain):
         if mode == MOVE_MODE_EXPLO:
             molecule_searching = PHEROMON_DIR_EXPLO
         elif mode == MOVE_MODE_GOHOME:
-            # TODO: Plus rien ici (path integration)
-            molecule_searching = PHEROMON_DIR_HOME
+            molecule_searching = PHEROMON_DIR_NONE
         elif mode == MOVE_MODE_NURSE:
             molecule_searching = PHEROMON_DIR_NONE
         elif mode == MOVE_MODE_HOME:

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

@@ -131,7 +131,7 @@ class AntMoveBrainPart(MoveBrainPart):
             try:
                 molecule = flavour.get_molecule(category=MOLECULES_DIRECTION, type=smell_type)
                 return True
-            except NoTypeInMolecule:
+            except NoMolecule:
                 pass  # C'est qu'elle y est pas ^^
         return False
 

intelligine/tests/simulation/mode/TestChangeMode.py

@@ -15,8 +15,8 @@ from intelligine.tests.src.event.MoveAction import MoveAction as TestMoveAction
 from synergine.synergy.collection.SynergyCollection import SynergyCollection
 from synergine.synergy.collection.Configuration import Configuration
 from intelligine.core.Context import Context
-from intelligine.cst import MOVE_MODE_EXPLO, MOVE_MODE_GOHOME, MOVE_MODE, MOVE_MODE_HOME
-from intelligine.cst import PHEROMON_DIR_HOME, PHEROMON_DIR_EXPLO
+from intelligine.cst import MOVE_MODE_EXPLO, MOVE_MODE_GOHOME, MOVE_MODE, MOVE_MODE_HOME, PHEROMON_DIR_NONE
+from intelligine.cst import PHEROMON_DIR_EXPLO
 
 
 class TestChangeMode(Base):
@@ -129,4 +129,4 @@ class TestChangeMode(Base):
         # Ant has put his food piece
         self.assertFalse(self.ant.is_carrying())
         self.assertEquals(MOVE_MODE_EXPLO, self.ant.get_brain().get_movement_mode())
-        self.assertEquals(PHEROMON_DIR_HOME, self.ant.get_movement_molecule_gland().get_molecule_type())
+        self.assertEquals(PHEROMON_DIR_NONE, self.ant.get_movement_molecule_gland().get_molecule_type())

intelligine/tests/simulation/molecule/TestDirection.py

@@ -9,7 +9,7 @@ ppath.insert(1,getcwd()+'/modules')
 from intelligine.tests.simulation.molecule.Base import Base
 from intelligine.simulation.molecule.DirectionMolecule import DirectionMolecule
 from intelligine.core.Context import Context
-from intelligine.cst import MOLECULES_DIRECTION, PHEROMON_DIR_EXPLO, PHEROMON_DIR_HOME
+from intelligine.cst import MOLECULES_DIRECTION, PHEROMON_DIR_EXPLO
 from intelligine.synergy.event.move.direction import NORTH, NORTH_EST, EST, SOUTH_EST, SOUTH, SOUTH_WEST, WEST, \
     NORTH_WEST, CENTER
 from intelligine.synergy.event.move.direction import get_position_with_direction_decal as _p