diff --git a/ant_example/antHillExample.py b/ant_example/antHillExample.py
index fa662619506112e9035287a6e30dfd8f33fe849a..99bab6634491edaf322aacf4c0839ee69e7dd29b 100644
--- a/ant_example/antHillExample.py
+++ b/ant_example/antHillExample.py
@@ -13,9 +13,6 @@ class AntHillExample(Amas):
super().__init__(env)
self.__observer = None
- def on_initialization(self):
- self._Amas__execution_policy = ExecutionPolicy.TWO_PHASES
-
def get_Agents_Sorted(self):
agents = self.get_agents()
agents.sort(key=lambda x: x.get_id())
diff --git a/ant_example_2_phases/antExample.py b/ant_example_2_phases/antExample.py
new file mode 100644
index 0000000000000000000000000000000000000000..112a5c203b1a1ec4a960940c2d8c04d9ee7bfde5
--- /dev/null
+++ b/ant_example_2_phases/antExample.py
@@ -0,0 +1,80 @@
+"""
+class antExample
+"""
+from math import *
+from random import randint
+
+from pyAmakCore.classes.agent import Agent
+
+from color import Color
+
+
+class AntExample(Agent):
+
+ def __init__(self,
+ amas: 'antHillExample',
+ startX: float,
+ startY: float
+ ) -> None:
+ super().__init__(amas)
+ self._dx = startX
+ self._dy = startY
+ self._color = Color.BLACK
+ self._old_color = Color.BLACK
+
+ def get_color(self):
+ return self._color
+
+ def get_dx(self):
+ return self._dx
+
+ def get_dy(self):
+ return self._dy
+
+ def get_old_color(self):
+ return self._old_color
+
+ def on_perceive(self) -> None:
+ self.reset_neighbour()
+ for agent in self.get_amas().get_agents():
+ length = sqrt(pow(self._dx - agent.get_dx(), 2) + pow(self._dy - agent.get_dy(), 2))
+ if length < self.get_environment().field_of_view:
+ self.add_neighbour(agent)
+
+ def on_act(self) -> None:
+ # couleur
+ color_changed = False
+ for agent in self.get_neighbour():
+ if agent.get_color() != Color.BLACK:
+ self._color = agent.get_color()
+ color_changed = True
+
+ if not color_changed:
+ color = {
+ 1: Color.BLUE,
+ 2: Color.BLACK,
+ 3: Color.RED,
+ 4: Color.YELLOW,
+ 5: Color.GREEN
+ }
+ if randint(1, 1000) <= 4:
+ self._color = color.get(randint(1, 5))
+
+ # déplacement
+ self._dx += (randint(-1, 1) * self.get_environment().coef_deplacement)
+ self._dy += (randint(-1, 1) * self.get_environment().coef_deplacement)
+
+ if self._dx < self.get_environment().xmin:
+ self._dx = self.get_environment().xmin
+
+ if self._dx > self.get_environment().xmax:
+ self._dx = self.get_environment().xmax
+
+ if self._dy < self.get_environment().ymin:
+ self._dy = self.get_environment().ymin
+
+ if self._dy > self.get_environment().ymax:
+ self._dy = self.get_environment().ymax
+
+ def on_cycle_begin(self):
+ self._old_color = self._color
diff --git a/ant_example_2_phases/antHillExample.py b/ant_example_2_phases/antHillExample.py
new file mode 100644
index 0000000000000000000000000000000000000000..d6e66dd7fa2522ea3c02cf138d71c519dd3d4a32
--- /dev/null
+++ b/ant_example_2_phases/antHillExample.py
@@ -0,0 +1,32 @@
+"""
+class antHillExample
+"""
+from pyAmakCore.enumeration.executionPolicy import ExecutionPolicy
+
+from antExample import AntExample
+from pyAmakCore.classes.amas import Amas
+
+
+class AntHillExample(Amas):
+
+ def __init__(self, env):
+ super().__init__(env)
+ self.__observer = None
+
+ def on_initialization(self):
+ self.set_execution_policy(ExecutionPolicy.TWO_PHASES)
+
+ def get_Agents_Sorted(self):
+ agents = self.get_agents()
+ agents.sort(key=lambda x: x.get_id())
+ return agents
+
+ def on_initial_agents_creation(self) -> None:
+ for i in range(50):
+ self.add_agent(AntExample(self, self.get_environment().xmax/2, self.get_environment().ymax/2))
+
+ def on_cycle_end(self) -> None:
+ self.__observer.updateCycle(self.get_environment(), self)
+
+ def attach(self, observer: 'Controleur') -> None:
+ self.__observer = observer
diff --git a/ant_example_2_phases/antsLaunchExample.py b/ant_example_2_phases/antsLaunchExample.py
new file mode 100644
index 0000000000000000000000000000000000000000..34ac9b56e59a5285f1d46750de5a40602e073e3a
--- /dev/null
+++ b/ant_example_2_phases/antsLaunchExample.py
@@ -0,0 +1,32 @@
+"""
+Class antsLaunchExample
+"""
+from random import seed
+
+from pyAmakIHM.classes.fenetre import Fenetre
+from controleurAntsExample import ControleurAntsExample
+from worldExample import WorldExample
+from antHillExample import *
+from threading import Thread
+
+fenetre = Fenetre("Prototype Ants")
+
+seed()
+
+env = WorldExample(0, fenetre.get_canvas_width(), 0, fenetre.get_canvas_height(), 5, 7)
+amas = AntHillExample(env)
+
+controleur = ControleurAntsExample(fenetre, amas)
+
+
+def run():
+ controleur.get_amas().start()
+
+
+def main():
+ controleur.initialisation()
+ Thread(target=run).start()
+ controleur.get_fenetre().display()
+
+
+main()
diff --git a/ant_example_2_phases/color.py b/ant_example_2_phases/color.py
new file mode 100644
index 0000000000000000000000000000000000000000..939b45f82083c98055016bc8d1ce8344dae46f42
--- /dev/null
+++ b/ant_example_2_phases/color.py
@@ -0,0 +1,7 @@
+from enum import *
+class Color(Enum):
+ BLACK= auto()
+ RED=auto()
+ BLUE=auto()
+ GREEN=auto()
+ YELLOW=auto()
\ No newline at end of file
diff --git a/ant_example_2_phases/controleurAntsExample.py b/ant_example_2_phases/controleurAntsExample.py
new file mode 100644
index 0000000000000000000000000000000000000000..8f3252b9fe26b72102237c35c0b7e48302746c02
--- /dev/null
+++ b/ant_example_2_phases/controleurAntsExample.py
@@ -0,0 +1,42 @@
+from color import Color
+from pyAmakIHM.classes.controleur import Controleur
+
+
+class ControleurAntsExample(Controleur):
+
+ def __init__(self, fenetre, amas):
+ super().__init__(fenetre, amas)
+ self.__ants = []
+ self.__numberAnts = 50
+
+ def initialisation(self):
+
+ widthCanvas = self.get_fenetre().get_canvas_width()
+ heightCanvas = self.get_fenetre().get_canvas_height()
+
+ for i in range(self.__numberAnts):
+ self.__ants.append(self.draw_image(widthCanvas / 2, heightCanvas / 2, 'images/blackAnt.png'))
+
+ def updateCycle(self, env, amas):
+ ants = amas.get_Agents_Sorted()
+
+ for i in range(len(ants)):
+ x = ants[i].get_dx()
+ y = ants[i].get_dy()
+ color = ants[i].get_color()
+
+ if color != ants[i].get_old_color():
+ self.remove_element(self.__ants[i])
+ if color == Color.BLUE:
+ self.__ants[i] = self.draw_image(x, y, 'images/blueAnt.png')
+
+ elif color == Color.GREEN:
+ self.__ants[i] = self.draw_image(x, y, 'images/greenAnt.png')
+
+ elif color == Color.RED:
+ self.__ants[i] = self.draw_image(x, y, 'images/redAnt.png')
+
+ elif color == Color.YELLOW:
+ self.__ants[i] = self.draw_image(x, y, 'images/yellowAnt.png')
+
+ self.move_image(self.__ants[i], x, y)
diff --git a/ant_example_2_phases/images/blackAnt.png b/ant_example_2_phases/images/blackAnt.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab4c4d0b27b9e43ed2f26f10d7566526363a59ed
Binary files /dev/null and b/ant_example_2_phases/images/blackAnt.png differ
diff --git a/ant_example_2_phases/images/blueAnt.png b/ant_example_2_phases/images/blueAnt.png
new file mode 100644
index 0000000000000000000000000000000000000000..4605bb5fd406aa8ff24943d60949e67e421871bb
Binary files /dev/null and b/ant_example_2_phases/images/blueAnt.png differ
diff --git a/ant_example_2_phases/images/greenAnt.png b/ant_example_2_phases/images/greenAnt.png
new file mode 100644
index 0000000000000000000000000000000000000000..331944103fbebe237d5f9351bf0b8111aa16b20b
Binary files /dev/null and b/ant_example_2_phases/images/greenAnt.png differ
diff --git a/ant_example_2_phases/images/redAnt.png b/ant_example_2_phases/images/redAnt.png
new file mode 100644
index 0000000000000000000000000000000000000000..23e635766fc329daa4e828a3e56c8d1159b165f1
Binary files /dev/null and b/ant_example_2_phases/images/redAnt.png differ
diff --git a/ant_example_2_phases/images/yellowAnt.png b/ant_example_2_phases/images/yellowAnt.png
new file mode 100644
index 0000000000000000000000000000000000000000..24676979b2ced1242739507a5bd5215d6abf94e1
Binary files /dev/null and b/ant_example_2_phases/images/yellowAnt.png differ
diff --git a/ant_example_2_phases/worldExample.py b/ant_example_2_phases/worldExample.py
new file mode 100644
index 0000000000000000000000000000000000000000..838564c44a5f3e208003ee07771d843a5e910856
--- /dev/null
+++ b/ant_example_2_phases/worldExample.py
@@ -0,0 +1,17 @@
+"""
+Class worldExample
+"""
+from pyAmakCore.classes.environment import Environment
+
+
+class WorldExample(Environment):
+
+ def __init__(self, xmin, xmax, ymin, ymax, field_of_view, coef_deplacement):
+ super().__init__()
+ self.xmin = xmin
+ self.xmax = xmax
+ self.ymin = ymin
+ self.ymax = ymax
+
+ self.field_of_view = field_of_view
+ self.coef_deplacement = coef_deplacement