From f37355e062975063acf10fb64f74c3043c78b97d Mon Sep 17 00:00:00 2001
From: shinedday <shinedday@gmail.com>
Date: Wed, 19 May 2021 12:01:42 +0200
Subject: [PATCH] Fix conflict

---
 ant_example/antsLaunchExample.py     |   2 +-
 ant_example/controleurAntsExample.py |   9 +++++++++
 ant_example/filename.pickle          | Bin 5279 -> 4282 bytes
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ant_example/antsLaunchExample.py b/ant_example/antsLaunchExample.py
index 9b1869c..0e894c9 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 9bfd057..71c6845 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
GIT binary patch
literal 4282
zcmZo*ow{Ct0StQh67xztGIMfVD-v@Ha#E-C@HwIiOrE0IIHh)qMvr)WaB@a!N@-4F
zQch}od|pyfd~#)SPU;lzlpeu&pZxT6h(t<$d`^D)l+GRzB*C=IoYeS&#FC6Dem&Ai
z;+g4r`9-Pmi6tdPnMtK3sZ(O7X!P*JJEo`RmBhy<<|Y<T=@Eu;Q}fC)i}LewQ}aru
z^vJ|J=jY~@=4B=)mSpCoLv`dPX67X2S4>Im5sG)rO)QR&N72Mno?n!c0{1IVI5HRR
zQ<jR{%)BYy3_UCrxrr51d>=6NuvEf?D#1c47<+irGE;L>;`7tu%Q92Tr+BmW2qfpH
zrp2eE7UU!*r-EJS&7Q&Pol=_A!wYpyBFJOKU|(`2=9M5^;t1!28BT$_gbU{N%oLD&
zgkapf)XemZr2Nt%kWm?28O#~n8G;~7K*q<%7i1(Br%vfnDyVeKP0V)AFG|%*%`44K
zElMoO%+J#UI|8PNH2|!5@)U2@)+s?qp`BcmS(2HYn3GvjImP||2XJy>=wXgeshHyK
zP;mgv2XQN>xI1JgK)7u2$@w|?MN@iMVYD-tKY5BbGuU*#+{CQ>qRf&?sKN}x(xePo
zND9kP@Mg?VjGY4WPlj@aMusNb>I^M+hf)WyJsH~W4jB*^WawlVW*DIv!$iQCf(LM8
ziZ4Kz*o<K&U`#o}n9K#ZjbR~ROsxV$ueQ5GAs%B`2^dp00d7nln8koKY}g1GQ@R1H
z85G1xcwECyz?gEdDGVTE@P!QrA!7=_=75YTYJf1Y#S|w2W02BK4m1g2Glq+RF*Q)V
z+U^diP$o8GxCt0jhKTTVu%EEU6b}JoDgwZoL1BZ>7+wO#R2m?RfhK5dp5h~5Of@tk
zX~RnctjUj`fH6qvCJ&Em1PB;|l*7xQNeG*#1PK@eE#^Q$j4w|K5ikZRYo_DzlrSM<
z5a|YA))XON3?w|jS+f9|gs_E;C;?-TO1~I9SyPOFF-T#P3-up1*N77^rV3I)fno|$
z7h%s+5(JDXfoLXVj3fbLDxoE(w!1?Xp0JT3U<^{8!WUE01dJ(0gblv3ScZTxNSPrG
zPfW=YFa{~Y@r8{X0b`1x;i~QKfG=yx6K_mDo)(1y0b`IN9A5>aNWhpPM7qJ38I%YZ
zQwa5mw!1?Sq@j<sELJ993{nu|izyWX#vrvQ@HN_02^fPE#Q2&?Y6Ofys$lTBMxB5$
zNR@9Pv;xIeY-tcM1}QTnLL&{EF`5L7DS(vepkfPOX3!#F3{o=*U;9RzfH5VArU1TF
ztV6&UqzVRKgzFMA2Hd;>S9j2E3f9b^N5B}Q(hr}f^a&VKj)<u!JP~d{z!;?Dhp#DM
zNWd6~W58j9QKYAWI^N(eG^D>+k{_R#k}@TBN{<+FXEwehKfWk6H@^(jckdC0N~Kn$
rCYORboACwtIho0oQ+m{JbVlJS1E31|U155mB9o_hGlDvgrAc}KmD#k2

literal 5279
zcmZo*ojOH?0StQh67xztGIMfVD-v@Ha#E-C@HwIiOrE0IIHh)qMvr)WaB@a!N@-4F
zQch}od|pyfd~#)SPU;lzlpeu&pZxT6h(t<$d`^D)l+GRzB*C=IoYeS&#FC6Dem&Ai
z;+g4r`9-Pmi6tdPnMtK3sZ(O7X!P*JJEo`RmBhy<<|Y<T=@Eu;Q}fC)i}LewQ}aru
z^vJ|J=jY~@=4B=)mSpCoLv`dPX67X2S4>Im5sG)rO)QR&N72Mno?n!c0{1IVI5HRR
zQ<jR{%)BYy3_UCrxrr51d>=6NuvEf?D#1c47<+irGE;L>;`7tu%Q92Tr+BmW2qfpH
zrp2eE7UU!*r-EJS&7Q&Pol=_A!wYpyBFJOKU|(`4=9NHQVl<_P#}Up8GnxW-3Kz`p
znJFL#3BkB|shQ~+N%^HkAhR;$5;M3mm@~LD1VI*otcZ^<$Ve<sozkOJQ0bVPnC+Zj
zl&Y7SSDKqzlvt9PpQi_Q2uu-c09f(lDc-EDQ-Y8}Jh>>dBr`cNC$pq-iu?Z$;3UJ)
z!yKPdF~!}X7{Ui}E2p?S<SKxrd)VTW^K<fxru4AFXlF2g@)U1Iu<3lciCOtYnI)A_
zg&BrD{K@&HIjN;Z#qnkNnZ=oTpaAk_@MiR80KwGKqzqX|D$G#uX3S8GoswY+_i~1E
zhDL@a+;tgR?heHQV5ekgyE~*mfG~A33^R-}3^R;lr)c0ZnF(yNB|ej@5GF(Yo1v4T
z@681AScXxCEzEqV+fiN43^v~$pZVor*D`=yUIYo=3}Rf)0yfzhpUD*mz(#{ijs&w9
zh%%WKY_dB(lPe9t=7CI3gjzz3o7uo7d*d^?xB+f*K>&nFjLGa^ll}3TT!e6Q9@t<|
zXxI{rK@PCV!T3x@iopzcXb?7;6KrxgK9egKfL#g-=QK!O1E)Q3md!BAh(@G6aOy)%
zdt6}iWAT|^k^ncq2paIjgf=(W<V1WX7eXUX+ub1(>Iq^@<^h|WiqB-Ev{wj?QesTz
z1)H2n1C#l{Cg<Wa87Z7o9UwtYjGOtvCKuu}xe6L>+U^dB(t~i?69AiBiqGU4s6(~g
z9TG?=Q3b&!SK>3d3R=u*yF0`{oli_?2!Tzm#b<KO21wv)yF28O;AUZv$r>4rNL7vk
zOsFLlR?%Xqb&$d+AD;73Y8@s}ZRX98TAGB{9E7_GnuFv>5s)J@I`M@FQtg!m4{O5d
zLlkUsFJ6-ov6v1Hbx?V#@67_O7bhZ@O$^?QsAZEF*!;=(%rChBHWgI%6<`lrtZfBx
zu*uW$nOp!(8Yt<HaF|GdO`eU<<T`}O#n7TvCnK6*Ni7LBc|Jaqk=z_bLTE^VO<s)8
z<njV|IF~?^Au+j88f@}%d?q86dPUGi6fq{tfK6VF&*ZWRa5p3Ba+G|BHEqa(O<s@B
z<a}r~3u;G#?Es}}!Y0dsP2P;p<WgwhYP&li(zCudGc><!hvXNiyTK&}Qcjl#o4*sE
z`ADrjL^~Ci%Uh7lRs@^97oXYH(8R3m?odcVZLS11`5-=%k!tfG62e;<Z1PcjCYK`W
zuVi@1hbue~eGL_`$tUrdTm%gQZFh$hXuuGYu2sP%pT%b~nQm4Cn|u+U$w=*LL_I(_
zG}OT+U&UuKQo2Lr#fce48Te}e4Y0{K@tKU&t|q0-(*&D*7q7{PGLMx0ix$}AhxklJ
zO3$RYSsQHfQ+y^Pl^=-umT(N}fK7gh&*WM}nU@Vu&xB)87i{udd?q86)1}ZNTPK5X
zO{)hs`6E7)s}Ze(9B4)-CJ*X^P5z3{<O)R31(CZ6yV(G2@=tswBem6&phbvI2H|iv
z1e^R9pUDM?^o%H<akx1ZG`a>JCxZ+KmE^}Krld@Xozf$QJYp4Jk{@4`nwwt+8ldYD
shf1YZq$ZbwMw8+T@^dniE2s3R;TUa#s|<iD<adSXg^IvNhf0(5056TgiU0rr

-- 
GitLab