From 1639a59be565b8ac15449d424de66fa5f3d693e7 Mon Sep 17 00:00:00 2001
From: Loic <loic.busson@student-cs.fr>
Date: Wed, 29 Jan 2020 09:54:50 +0100
Subject: [PATCH] pull

---
 __pycache__/individu.cpython-37.pyc | Bin 1915 -> 2234 bytes
 algogenetique.py                    |  12 +++---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/__pycache__/individu.cpython-37.pyc b/__pycache__/individu.cpython-37.pyc
index 421ada9911f9aceeb1a109b57518c98bb35bfd74..c60ccb9afe4a81c48325ebc6d9b1ad0498dafcc3 100644
GIT binary patch
delta 1583
zcmey(w@Z-EiI<m)fq{WR!_hFVjDI4Z1Y_7lbz6yCjwlXBh7`6aPIrbB_7sj5h7^uw
zrYNq76$T<qx7dmj^HTD2Z*hX?qQt!P)QKAt>X{iB7+4t?7@Qdx7>cbJ7#M08YZ&4g
zQW#U1S{O<gQ<$3>T^O1fYnf757BJN?rLd+jv@%IDECi`yu3=cfvXG&MA)YmbA(%mv
z%`ce|<SYgT1}3Pn!60MB7#JAR8EP0}`Dz(!7#A?4Ff3%8$W+J@%%Ca9c#DxslkpZ?
zQE^F8W`QQtEhasKTP!)5d8sQIig+jQV>GY-#buL|SzMBwpIczZ3o;L6I2%Kis%KtG
zW?5!Rsa|}1W?p7Ve7v4bPJVJ?PO+UHLPwQAK~7?EZe~inMYdjAVsT00ErypMXKJ$D
zVl7Eb%1OP&l3$RTcZ($}KQr$ZOHxs0-Yt&Qvc#Oy#FEroti|=o`9-Ok%(qyIQ*+Xa
zgcukYqBubA^T{kODFV3%Lhvy#Fx=vRxr7_!P7Y9DFtRZUF^Vu%31YYw9#|l)@Hk*&
zWMC*^XlAHoOku2Ls$s~gXG~$LVFCquEprV+7Gn()Hv=RRYFTO+7ckYZfJDU^YM8|t
zY8bMZ7cwz2l&~ydtzlfiwvb^VV=ZesLoHjyj1u-5CQxL?_SCZ1u+}iuu!}RKFr_fI
zGNmy|GSqTF#3UHFkwrOcSnE@mYnVhBYS_`FxN2By*pUq2E@8>y$l|QwsNs}gNMTN4
z>1C?rfr@d}aKpuTYuIXdYIxI`%o%Fg3S+_<Qdmp4YS@|?r9ml)8^HsosF%zJ3=9lK
zpa^>jig!)MTg>@IDMf+|3=En)MWEzcBnk?8c2N2#ElDjBnw-gO#3K%p=PQx`NljkM
zd`TTOriwsm5)_xkN{~omVqxNA6kw8=yo|-T9u#|^$OC5zIYtIhxH4pcG67>P^905U
zt`epcrW)pECKra-Kea3+%*_n7tTn7PjM)rDQY9=YOexIGOtow&OttJ4ay1}TVznGK
z>@{rJOhtYH3^nX2EanWg?1c{D3>CXdm{M55@v^R#vxGH^Ig72nh9Qe#0sBIR8V*T@
z8cs>D^$30nt2l!sg9Mr=c2(jGDQvw=HB1nbY#@3#ASTyx)o`XTWiu5&tKm#x$!040
z165ZKvXZHW3uL(sLtzS3m{XF0o1q3tJe;9WDx3kF_1XPif>JOfo<Kndj-VnbP%JRr
zV$R7gzr~V~nVzA^3C=;cIE(U2;=#GENC6bTY#@RiM948POy*@1ujdBGT@-6UQGQZl
z6hByPd{KT$Vo7FxUU8IgUTJPpYEgWCT6}IPRIo@DlsTD8GK->kQ}Roba#BnDz^ZPs
zC+C;um82F$u|vh9Sd;Vfi&COEpnM}pCI%-GP<Fhf%>gqOl>VTpgoBZVQHYU^k%N(o
zk%f_qk%N(mk%y6Qavz&Zy(Gx-pj35>DZsEuAH)Njh9E%Z7J<Ts6I3{We9Xbb!OkHE
z7SrS|0wr&7g1*I?SDIT;StJKayezqiB^gC5AoIW>4ANHw4k=@h7|1-3+j$v4B$VKr
N9LX-nBEZDL1OS=KVW0p2

delta 1209
zcmdlb_?wT<iI<m)fq{WR)6y{RFz-Y@3C5s_>b4?`3@L0;9PSJ$>?s^A3@IGVOi`Q@
zYYaFUZ?P36=B4E4PCSrM&&0sMz|6qF;LO0lP%Os4z)-_j!w}C<!?1ucg>fN>&6L6r
z%%I8S7Zv8{=;-e57~&iPLhg<rrgI1cIET19yF0swID(|zK|E(i5YN%s-4P6&o!y<C
zL)_in-5uTCo!#9-LP8wfL!9;89UV29Z?TpnCgr5w;z%t^%qdMQNxj8doSa{js>yVV
zr8qSwt%!qxfng;>5zpkkjOO*XIO5|o^D;}~<GDeOW&wGfk&UrR&@(S3vn(^ER1YSf
z4DuaFnxBDzffeRU21W*k5{71mTBa1nTIL$Y6s8*HRwhY?T9z8d8fI>W6b3MlwT5W{
zV-0H!qc}qii#S6KLl)CQCPs#mdgcWzHB1Xw7cwkltYu4QsAaF1QNmWk+|2005ZhDB
zQNvclT*D#GkiwM0*vga!GME!0Cc(gsEXq~Gmcm@aEW%L3fhNOU!&bwAq@SmRIg34u
zqlUAFOM<~6g*k<#m#LN)D#%^KBf$U_<Evq>;jQ6IXEJA~WiJd1XGmc!;jCeAW|U^A
zVTk8~@FqWHmKT4?2ud*AMWDEkVo%P`EhsHXE#jE0z+xl>N=%ykMWE2V#gbH%nHM!V
zj^&a%4+8^35t!fwu{aqR7(n4#tON>SMm8oECLTsUCb7xktj6{13=9mQNCPLUC!l1-
zkj0S2Sj$v#t%k{kA@*D?bH#}grW8hSsO_m`DPeAAsAUBOcQ!+jObJUCa~5k2Ll(mV
zwuKBe%#sW>ERvuoK;ow`iZe(uNT7*ARMjK2L6m`_qnD|M31XBDL=!v2=vuZKmK5e}
zrs6d<EGaD6Oht!a>LeLzm}=NSmfJ8C${<9!QN+U;3i-krz`2CguLu+*ngL9=m~-;W
zZ?R-#re_p^g1Sfu6y6-*lzfY`D8D2goaBo{K|#p|B7_+j7;dqb=4Gbk7v<h!$uBBN
zyv357UsR;YUc^0FkzK}{Jte<1DJQigiZwYuzbGY&xg@hFiUTTW1c@4W{M_QmEiFkb
z$;{8w1?3VEa3pasaxwBTvN3W@KEdu1!UwVz6pgo-0t|~3K|HW_1Obj{P+Wpk6@#3~
z!NkGBAy)(v)8r}w<u7m&y2YATnp;p=Bs@8RLsCi=WE4mVlAFMW@=l(?A;-eQ#KHss
D3jzk!

diff --git a/algogenetique.py b/algogenetique.py
index 41acf3b..6fb421b 100644
--- a/algogenetique.py
+++ b/algogenetique.py
@@ -23,21 +23,15 @@ def main(N,tmax,pmutation, proportion,brin="plasmid_8k.fasta"):
             if individu.score>max:
                 best=individu
                 max=individu.score
-        L.append(max)
-        print(i,":",max)
+        L.append(1/max)
+        print(i,":",1/max)
 
     plt.plot([i for i in range(tmax)], L)
     plt.show()
     return(best, People)
 
 
-best, People = main(60,100,0.01,20)
-traj = Traj3D()
-traj.compute(best.brin,best.table)
-traj.draw("plot")
-
-
-best,People = main(100,100,0.01,50)
+best,People = main(60,100,0.01,25)
 traj = Traj3D()
 traj.compute(best.brin,best.table)
 traj.draw("plot")
-- 
GitLab