From a9bf52e7aeece54997e165effe1f8e31e24a6ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chlo=C3=A9=20Muller?= <chloe.muller@student-cs.fr>
Date: Tue, 28 Jan 2020 14:46:59 +0100
Subject: [PATCH] commit before pull

---
 .gitignore                            |   3 ++-
 RotTable.py                           |   2 +-
 __pycache__/RotTable.cpython-37.pyc   | Bin 2038 -> 2635 bytes
 __pycache__/croisement.cpython-37.pyc | Bin 1729 -> 1756 bytes
 __pycache__/individu.cpython-37.pyc   | Bin 1514 -> 1554 bytes
 __pycache__/population.cpython-37.pyc | Bin 4866 -> 4920 bytes
 algogenetique.py                      |  10 +++++++---
 population.py                         |   1 +
 8 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e99e36..09bf5d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-*.pyc
\ No newline at end of file
+*.pyc
+__pycache__/
\ No newline at end of file
diff --git a/RotTable.py b/RotTable.py
index 0930820..8de0587 100644
--- a/RotTable.py
+++ b/RotTable.py
@@ -101,4 +101,4 @@ class RotTable:
 
 table1 = RotTable()
 
-print(table1.rot_table)
+# print(table1.rot_table)
diff --git a/__pycache__/RotTable.cpython-37.pyc b/__pycache__/RotTable.cpython-37.pyc
index c83b8f44bf8d032a00f01146a96d3e6db0a5d8f2..0f0c7511895c47a8cfeb05cd095f0bbee2f31924 100644
GIT binary patch
delta 1419
zcmeyye_DjkiI<m)fq{YHq=iA;2kwb{5{w2D)%Dp@7=sx!Ste%5Fy>8ce^#%X!kWUC
z!k*5SqBln%iX}xq#URBn#VEx%#U#Zv#Vo}<#UjNr#VW-*#U{lz#SW~B6-^aLjdhCs
z9Ihy~6o(YY7KSMH6sHvD7KSK}6qgj&7KSL!6t@)j7KSLU6ps|o7KSM96t5KT7KSJu
zz7(Gn-xh`_-W0!J22KCXs~8g)>tD`dU|`S`xW(k?c#Fx=`4*F-`z<ENkXua7j<=Yc
zoo_KYyWe7R4!OnT?s$vI-T4-iyZbFB_mEpmA&$40LY!|gg}C2h3JEDvU|?V<k^vDC
zAVLI0$b$%J5FrjCgh7NHh>!viVj#jt2t>+)2uTnj3L*qSPU0#8QAJ>Ruuia%V0o}k
zu#sRrVADWGO!i@3Q?JIr!0<Jmfq_9kv^ce>SU))<CqFf}G$$vuNZ%ztximL5ucTPt
zH90>gRUt(^GcP^$Ok-YVYH5+ase-OTaEOt<tEYZyrfybhX@zcTS$<AwNoIatUSeiZ
zYO#J$eo07TQckK~LFFxu`1s7c%#!$cYX$~}Vh&LBGqN#Gc4twjXJKGqU}s=pa0bb=
zF)%PxG?Xx8F}g6smen#=6qGQfFgAmDDYZ-`%vmg1tR)OtY&DFM3^hzCOyUfZ4BQOp
zA}P$hOts843|Z_Db*v1M3^mN=49pBR3?NaE`5+mP8Eg>A$!Az}bvcTd7#J9C$;HE*
z9v>g<9~vC*>>m{58XVy7=i=z+?0So}C^0WRb+Q1fM17GGC=L`sallff0%EIzOkm8s
z#hQ|uQ<7K&3SkJL4w6-dc@&%j7<m}^81)#%7^`?;HtHqjq$Vaaf&z$vfdNE=FgR@3
z7#KjVX9#A{Wc1Ty1X*3rpvefa7S*0xEcrzxiQb?P1^I{p*#eLZQ5M{iL<$GgAb{Db
zhi+|heo>JhR%<~rlQUT@v_K)I$pmpVD6k-*12za0M7KE7Q%ge1GmA^2C!b~wB}#dC
zYD#))++;7dP(4DX^Q5PixMUWkCW8`c;^ebz%8Y!IKeFisfHW2vgW^aVL}-8rP;3<$
zfmkLW!W2Z9g9r-{0d_Ki0689<epo^NPnjIeu2#>&#E1`aV3Frw<^Ta^4qgss4rZ`{
znyj}ta}!H4N=q_xif^%im_@oE7l7h6ime2c$qbQ#5$q<AbEI!^*yQG?l;)(`fl?7T
O-*GT<Fmf>QB?17uUnrvh

delta 788
zcmX>t@{OO*iI<m)fq{X+_`QDISN4f~5{z~e)%8VESyNfE*iu*|8JZax8B!R788lfZ
z#>g<rO{{!o%aX#H!j{6G&X%G(M<9wNMK49ag&~SH#URD7g&~S9#VEzNg&~SP#U#bF
zg&~R~#Vp0Vg&~SF#UhwN({l40#so$uO@UiXj*d}Gj?Pg`j_y%Rjv-M@&W=$`&dyOx
z&hAl6&LL4u?v7DR?#@w6?(R`c?jcc3A&yZ@A<j`uA?{I3At95+S=Q)^F)%RvGIFts
zami0E%}vcKDF(6Por7asJ>!EzjAD#k{2X<26N^hyi()1#u!=HDPc~!KNo8hWU;ugB
znSp_!IE{gUp(3G#A&b$4AvUa*u_B;^DTT2a#B-@-s$s}tu3?m9s9|DdkYp%f$zsi7
z1F40Gr7(#zNHTCUpo^q1_cBd>&Z;ZUUc|(}z)&Q_z`$^ewJ0$!J+(-Xfq`MNBb$Vy
zCUcPpNKzCe$(UIL@(qL#2MG%^Ffb^A9LNTWAVwZWKE^8Ep!|}M#H5^5y~Lc<#L2Df
z7Fr;qHJK15K}-Of1v2IqM|x^WNO@*)iP7Ze?4d*{4^K@=Pc@yK#u2JV$aJ3c)DoA>
zqSWM)%=|oy$uBvS8M!9&a_ZTDG!{v~{86L;Vu5^9qzqz#orfSm4h07kE6Be(le;<9
zN|`y>IRrSEIher`MFI>A44UjwoVkf58KoteImNeFK+GZ;ka3_ej$$hT1&rY>)`FtU
pyb^FQBZURnGLSvDIBatBQ%ZAE?HECpfsz3SBL^b~6Q2beBLJl4p?d%T

diff --git a/__pycache__/croisement.cpython-37.pyc b/__pycache__/croisement.cpython-37.pyc
index c042b249f5e73f2201cd389e3d47dd0627706e14..24659b511a06317791374055d8756a71bf947669 100644
GIT binary patch
delta 309
zcmX@edxw|TiI<m)fq{WR)xaRmW+Sf%qpDsCdkRMiLpocE{v3fQmK1{&!xn}p))b=@
z;}(V}wiL!-22GRAZj1qpOfP3`p3F3t(ba%~f#GW+0|SG8XmM&$v3_z!PJU``X--aR
zk-kfQa%paAUP-aOYjS>0szQo-W?p*gnZ~@#)Y2k-Qw3dx;1DByS5N)P@hswu`jg99
zTo{ce?_oLTt;E2<P^8Sjz@W)d!~|lifCyC(p#~z<85kIDG3RFH-D1v7tSHiisMG>U
zX@dwI5TOeq^d?_rRS?hzF+ol(0uzRlS=sD4OhLNXi&Q52ut~^+Oe``2DFX>Zl!4WP
K3B$?FY<2*+6-Ckj

delta 321
zcmcb^dytpciI<m)fq{WRj?*Bncq6X}qbgepdkRMiLpocE-W-7_mK6OIgBFG;))d1O
zqZWoJwiL!-22JD5Zj1qpn`bl4VszJMU|{&==WG=dTAW%`98;W_mr@ktlAm0fo0?Zr
z9OE1u6Kon29AXp`91`Q|8Izi+o0VExp_^KkpHo_rnV*-Jm|2us95Z<miwmRS<m)Ww
zycHQ37>bk_7#K7;ikLubWe}kPB2+<y8Uq8vE#}<Jyj#q<i4{c}5S5xBDJ>A84I*?v
zgzn@ItO^2pASTF}MPR~UvI3jEy$MJcdlA@ZkR`V`GV@Y0%Q90+i<m*`L6#I5f><Dx
P5S?J{V8USXJT^N3cB4xa

diff --git a/__pycache__/individu.cpython-37.pyc b/__pycache__/individu.cpython-37.pyc
index b92864141ef1be69e4e4b528e4b1f8dedab9d277..1d266105529cfa0c43eefd0edc5dcaf184adefec 100644
GIT binary patch
delta 720
zcmaFGJ&A|ciI<m)fq{Wxxw%2y&WXH|(tZpK3@HpLj5!Rs3{eb>AU0DDV=iM9BjZF{
zUv{>TqQop?mx(>Q>%Yb`Ffizc7N-^!>nCUA<frDA=H#Rn>AU17m*%GCl@#l{Cg<m*
zDx|1q=B1~eY0S$^EiKYFRnS!k4l&Yq_0&(z)XhpQt<X&^%g-q-$;{8oOUx`vE!NM>
zOUW$DOexhXsJz7yAD@|*SrQ-5%fP@;%mQ*MBO7Ctpl9CX4U7_eoD2*MAVFu4Y{}$n
zjG0_1tTk-X3^fe#9Ft3#6zw^Sm>C!tqS%x3a|=pKQj6Fb7#MCb<rUmwO)M%(tc+q$
zPb~rYsR(4uE#~6V+#(JJ1_n*eB9Pg)Ccj_`u)oEblUQ65pO=`MS_BF$2*C|9i6gZv
zF{d=KBvlaP0wJjT_!#+^1Q-PvMVL4kIXEUSWR}qf*$Xll?9wL;3=B04Sqxc>wM-S)
zYM5LYV$anwSDYweN?~kfbYY0yGx-g3K|M&x0``RrHO!I>wQMykDa_eS#cOI<QdqK?
ziVoE<fy8TABpGU$YS<(hYFKO-3S|(Y+$iGV4268*3@Hr344SNdMWE2sWV*$ilV5&|
zB_lIEqll4#fuTqM<Z}*47;zRE<d?*kBqrsg-eN6E%u7!#Vg;!IdGr>0X<lYpeo^i%
zmi(fU#9J)M`9(#V?2}is7;!~$q~w<-<)oGvO}@(_DWe7o7ZGr{a4>Q)@-eb8axf+^
z@-Yf9icRKX^<tEp9LlO@!otDAAzH)+vY)ev31kl_+HSGtmF5;y7J=<#$xSTD07nzV
WAxe|ivl?>oFmf>RF!C_5FaZEdL9fgJ

delta 677
zcmbQl^NO3-iI<m)fq{WRj?*B{X(F$rxEBKhLkdF*V-7<uLlgreh|QG47&6h(mx)np
z;?&*RzkHmnVnT~ki;8246Z2AvVqEf*OLJ56N{VBggJXhCV}e7BVuC|rTs>nZPh=Dq
zkIBqS$t=rEDb*{eyu}e8pP83g5+Bb!c|W5D9}fcq0}BHKgEIpIL-B&iUl}vaY8bMZ
zvN&ouYS_gYBpGTsYglSnB^YYCO4v&{YdCATBp8|*n;C1lQ&?-*YPiK2q#0@$;<+Yg
zFewIc-(m|XO3X5LiDFOA&n+k|NiAY$U|_h#lvfbNnpjknSQ*8ho>~G@Qv|a07ISfF
z?k&!u{F3;R#H5_mTg-_`#YG$p3=En)MVt%_3{jI$Fa^{{apoizm&E5K=B7sRfD}Uw
zPl@6H@k)vkv!b|CGSkxH6Z6t@Qj0+02_d*awsWMGCFYbSmZb87JShPRY(_RlK1Mz!
z0Y(8v5he~s4kiIc4rT$SDnU<JP{H&hGclNgbTBZmF)%QIoCXf6SquyeH4Iq{S&X$z
z6+JafE)20PwagWDB}^%d&5SM#u|<;?F&Fq3%7il%@`W>`Fa$GbGW!+rg1p9bi#aF1
z{1!__W_pGuJ2-@jL_iK@ElSKwPc33)U|=W`0tv8}=4Gbk7v)B=<QJ7BYO+l}$YM14
zFN>sz3dkp*xMN`CVB})tV`O9Gm~6!A#V9?wmQ~G?iGzhhv<T#2P0k`Fka2>bz+}xU
r%`K>e7|oKKSdsyb1c-g|AXRLWYgxr7e`Xcs;$Y-p<YDAtVqpRRptGdf

diff --git a/__pycache__/population.cpython-37.pyc b/__pycache__/population.cpython-37.pyc
index 14e980ef62041555b1d3d28efc6dd1b0cc4e3b90..ac693785cdf9586e97d434cfe6cf9ec4648b1453 100644
GIT binary patch
delta 1584
zcmZot+o8ti#LLUYz`(%p*1{mJNn|3Q1Y_Dnbz6;G_9*sTjwlXB26u)OwiNajh7|T@
zrYO!7jug%ohA6HSt`zPThA8fdEzbH(w}g|6@-vH5b5rw5;!E@53-UAbN^XfE38ti$
zRzQS{lP3y_PJH+>31n*#i1?bwz`&p%TAW%`te>2blb@Pfnv;`Sr0<fSTnaL=Sl=}{
zKPOcoMLjbwJ@rguUS?`(k-n*du0n8#k-n>^erl#}R%&U5ZfaS6PH9PIeqLT;W>IRf
z{$wkrOaVa#1_rP-5Q2B|W~M{BU_k)}1_n*0A|VC_hFknOnZ+fk@tJuknPr(NrNt1%
zAlDV~ZeGM3!YB&Ta*Me*wWNpzWTFU&5SYx(D$5}TGKZr`XtDvT0ykI-nBd(U&1%5N
z$U3=)O|M=Yq?{3?kh2J6Qjr8m0Ldf}R}w@>fe2|30W%lGmH`p6AVLmAD1Zog5TOVn
zlt2X7QZT^_@)2KgYEEi0C^X_zN;g}w8!$48PtM}7R|F~1WWL2-l9-f}npk>^G4mE<
z7P5aQpW?V{#SbzP<Q7fVB2|!itSPBUr6sqR(=zjJaTX*Nm1Kg<E>Z*eiLponq#R^&
z5%1)OoLhY~VSG&%u=XM?kbpJ=149&VL4Gk<Z$M^Qeu*YikuJ!1zLKKM_@cyu%#_sl
z#L^0gdq5s3(wqE<t3?tN-kOYHvoslt^gyOTt*htuvjJJB$p#5oP_!0-ozDbPg$PPc
za8wt8gHjYE1&#>)$(%eIGU^~c$UseIh+jaCf>^`5*_Vf#F%1!e97y(nLZ}GjHb|;K
zvymOiMo{EMu@>j&=B5^bors7&kiAe3Z{EkN$%sfTMPQF{6sdrm2XgK$7EnTk7=W-A
z;YV(;jkh@AksrmDnwOTCR|58S6kl0pYGzJOYJ5o|h$;d(stD{5aEgK^CRtD{CFhqG
z<fO(!bt5@(ax;Hhy)ei@pafc^3}S)ZX9!{$fe3aGVG1G;`oJu3gmN-4Fo0AP^D!_m
za4>SPaIkSnaEWp0aPb#`<dQ-81XLt}LKBoloEaDxicJ_87%KE?7_t~#7-C&jY8guy
zQy7~W85v3#YZ$YbvX~+46s8)+ES6>_MutL;aE26yU<OTQzbYOs1z6Tr;3@(|nkH+J
zz~nOmGR_bl(=C>Q{DRV3957{&_<%e57Dr-QT4r)aYEdu9F&rT0G4e2SF!C@K*-cgv
zd|MB4UzGrtLXc}fkiSc)bBL$Ep8}UAJJ?G_mY~1@Mf)v|)Uw2!(!`R~B0G>6IFvxa
zr^!@g0}`+W5ny}41SrIAv6Q41mrMp(3^Ia&kppZoA0r1N2p2gqFffE^@)Uu>tB4t-
z9~5duV3SxuTsBY+<4T5?(M6!(F9LZ2;ySQPK&Bx18e;q8J3?|C0!)1M4D1|i0I&`?
AHvj+t

delta 1473
zcmdm?)}+Sg#LLUYz`(#TL(m}3Q*<Jq1Y_Jpbz6lH26u)OwiNajh7|T@rYQCljug%o
zhA55{t`zPThA7U7J<hC*w-~jOCkl#A7G``|&&j~RPy`~r<})xbI9tVp7N-^!$0R2f
z<>be><R_QrrskCt$2bSa1cw;Kgk&6EnO~Hds*sXetl*VeS`p*w38ocX%kpzdOEUBG
z@)9$PQj23!Gj+34ODl9!(Zmb#3rcemK??N>Dt~cJ&Si=c5P-P>?2sa!$=8_<>4F9M
z85kHenTiA%7#MEx=VTU_q{e6FrDT?6rj!;#6oZ^z#IyMra|oj-NXsqe;?$BN7LbX;
zAcB9gKC3K;D99X+BEiWatP0#<EntFYb3Lm8BO~MF4QzV#Vj$&=AcdSoAd`y3K>|o7
zfw&SNLJ~wsfe4tnAhtA!kO2|0AVMBQ$bkq25TOVnz?Omu9*~dtic@n^lR;q-pHjLx
zmfe7nQEYM_hrJ?5i6-+c_L9V;oYch9Ta1~v7_*T5JNX^QT`NA2ks!BdvKFa;%wtVS
zO)4$9#hjLzcZ;(iv8W^yWOk7%$WM$#>LBGHlZ$vJvvO?}*MRXgS-{$hG(iGdlP_|K
zD(HZW<0~o3j4w(o$V^F%Pb{r~*bj1ek?v$R?iNW<_-ZnO^=dK}>4J1ajbF^|X9F@`
zlMND*plB=tJC_Nh3K4Xi;HWJE2b~B=3LNlylXZDCWYj=>kb#=a5VwOI1+j)_b0H5m
zV>TkjIFRfCg-8*|ZID!eW+OY2jiAViVlB?k%}p%=I}s6GAbSxWz9lhPpHE`*e_kHO
zP`IT<U>|Z6DTCYza`!D3Pzr^Zgs>msS#Ge^w>aUkev2(NFD)^zq)2*l0>6kc$T>w|
zCxFuqJlRC?Cg+zH<fO(!RU^4=@^bz*Ss{=EKq;|E3B&@s#{k4KWME*JctKRU$P~mw
zXalpr5y>$*OF%lBgMon|8I<xt1qvv<m_bDW0|P@b$cq(9H4Iq{E)1~}wTvZ<DU8jG
zj0`1=HH=wIS<E1IAxAhv3PUi1CX-(k50?Tge=2ZkvJ~-8{wN@0qserO1(fe^alj-Y
zK?`@sEsn&rw9Mp;)S_OHt!yB7F!C^RFc#TQ4iJ3HXgt|YNTMF(%pxn0S3r?<izBrx
zF{d=KB(=yMBnI{)$j6#YMYbRTI}ic30!)DXdyAzcwYX#w$PQ41F)(s4axn5R@-cF-
z@PTY|2IUm4B2W+%fx-Zig1`o`GEBZIB;pEo1K2*0S|o2E?BKA;%}*)KNwouoXfenh
S4n`419*}>S`05$hIamS7vmSZ?

diff --git a/algogenetique.py b/algogenetique.py
index 9b91cb9..901ad3e 100644
--- a/algogenetique.py
+++ b/algogenetique.py
@@ -3,19 +3,22 @@ import math
 import numpy
 import RotTable
 from individu import Individu
-from population import Population
+from population import Population, afficher
 import croisement
 from Traj3D import *
 from random import random
 import matplotlib.pyplot as plt
 
 
+
 def main(N,tmax,pmutation, proportion,brin="plasmid_8k.fasta"):
     '''lineList = [line.rstrip('\n') for line in open(brin)]
 	brin = ''.join(lineList[1:])'''
     L=[]
     People=Population(N)
+    afficher(People)
     for i in range(tmax):
+        print("\n \n NOUVELLE GENERATION \n \n")
         max=0
         best=None
         for individu in People.indiv:
@@ -29,11 +32,12 @@ def main(N,tmax,pmutation, proportion,brin="plasmid_8k.fasta"):
                 best=individu
                 max=individu.score
         L.append(max)
-        print(L)
+        # print(L)
+        afficher(People)
     plt.plot([i for i in range(tmax)], L)
     plt.show()
     return(individu)
 
 
-main(100,50,0.015,2)
+main(10,3,0.015,2)
 
diff --git a/population.py b/population.py
index c16d010..7268915 100644
--- a/population.py
+++ b/population.py
@@ -142,6 +142,7 @@ def afficher(popu):
     for individu in popu.indiv :
         print("\n individu \n")
         print(individu.table.rot_table)
+        print ("score", individu.score)
     
 def test():
     popu = Population(4)
-- 
GitLab