diff --git a/ant_example/antsLaunchExample.py b/ant_example/antsLaunchExample.py index 9b1869cd7b5785321e583fe37d112a0f8b8bed33..0e894c9d605ec2637f7f80678babfda57c8f7b97 100644 --- a/ant_example/antsLaunchExample.py +++ b/ant_example/antsLaunchExample.py @@ -32,6 +32,7 @@ ToOverrideWarning.enable_warning(False) fenetre = Fenetre("Prototype Ants") +""" env = WorldExample(0, fenetre.get_canvas_width(), 0, fenetre.get_canvas_height(), 5, 7) # amas = AntHillExample(env, ExecutionPolicy.ONE_PHASE) amas = AntHillExample(env, ExecutionPolicy.TWO_PHASES) @@ -39,7 +40,6 @@ amas = AntHillExample(env, ExecutionPolicy.TWO_PHASES) scheduler = SimpleScheduler(amas) """ scheduler = SimpleScheduler.load() -""" controleur = ControleurAntsExample(fenetre, scheduler) def main(): diff --git a/ant_example/controleurAntsExample.py b/ant_example/controleurAntsExample.py index 9bfd05795ff353a9803786e9efee84ddc0de7be3..71c68453a6db279bb71188b3422323c4fdb31e07 100644 --- a/ant_example/controleurAntsExample.py +++ b/ant_example/controleurAntsExample.py @@ -21,6 +21,9 @@ class ControleurAntsExample(Controleur): def __init__(self, fenetre, amas): super().__init__(fenetre, amas) self.__ants = [] + self.__chart = [] + self.__chart.append(self.addPlotChart('Ants Position')) + def add_ant(self, ant): ant_ihm = AntIHM(ant.get_id(), ant.get_color()) @@ -28,6 +31,11 @@ class ControleurAntsExample(Controleur): self.__ants.append(ant_ihm) def initialisation(self): + self.setTitle(self.__chart[0], 'Ants Position') + self.setXLabel(self.__chart[0], 'x') + self.setYLabel(self.__chart[0], 'y') + self.setPolicy(self.__chart[0], 0, 'go') + for ant in self.get_amas().get_agents(): self.add_ant(ant) @@ -37,6 +45,7 @@ class ControleurAntsExample(Controleur): # update ant for ant in self.get_amas().get_agents(): seen = False + self.addPoint(self.__chart[0], 0, ant.get_dx(), ant.get_dy()) for ant_ihm in self.__ants: if ant.get_id() == ant_ihm.agent_id: seen = True diff --git a/ant_example/filename.pickle b/ant_example/filename.pickle index 0af30b6c605ab493b5c0b056275cebc4c700f4a5..3f06963099b15f9c5aac384e0223f087da631929 100644 Binary files a/ant_example/filename.pickle and b/ant_example/filename.pickle differ