From 9f1f9bd5b29965a0d517d303416efe7809bed9ba Mon Sep 17 00:00:00 2001
From: Loic <loic.busson@student-cs.fr>
Date: Tue, 28 Jan 2020 15:43:44 +0100
Subject: [PATCH] merge
---
RotTable.py | 6 +++---
__pycache__/croisement.cpython-37.pyc | Bin 1708 -> 2365 bytes
algogenetique.py | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/RotTable.py b/RotTable.py
index 0930820..c635aba 100644
--- a/RotTable.py
+++ b/RotTable.py
@@ -89,13 +89,13 @@ class RotTable:
###################
def getTwist(self, dinucleotide):
- return RotTable.__ORIGINAL_ROT_TABLE[dinucleotide][0]
+ return self.rot_table[dinucleotide][0]
def getWedge(self, dinucleotide):
- return RotTable.__ORIGINAL_ROT_TABLE[dinucleotide][1]
+ return self.rot_table[dinucleotide][1]
def getDirection(self, dinucleotide):
- return RotTable.__ORIGINAL_ROT_TABLE[dinucleotide][2]
+ return self.rot_table[dinucleotide][2]
###################
diff --git a/__pycache__/croisement.cpython-37.pyc b/__pycache__/croisement.cpython-37.pyc
index 1c3ec7b081655a26338694b19c7d0710ced76b8b..11ad47cc7baf3d1ad9232ef520a1896624a379fb 100644
GIT binary patch
delta 1216
zcmZ3(yH|+MiI<m)fq{WxqLo1$htNhoVMbN96!sL36oz!R6umhDQ7kF?DF!VJQLHJ3
zDMl>}QEVxU!3>(lo81@#7$?tW^5*AcU|?WnU|?`&U|=Yo!Z`UWlZL_s#)_m8Ru_f|
zjIj~5Y&C2t%-Kvub^#1EEH$jz3`I{S>obd*Gi9+Y;8@5|!zRg4%U;8f#g@fh!!F5C
z!vta3z*&+EDJ-lEk_;)VmJG}clO37G>}r^iG;`E2g0*l+GJwRh*lRd!;4D<lHVk=l
zY8WRQG7HzES`RUS2<vSapiX6j+r|d54el8Zs0xs2%n+ABRDfItbB{g5H#Q74EGcZ}
z47DtUdf^N;Of}4DOu-DA?0!Xz3=9k}IT#oiiX=e<8;JY=|Ns9lK@ysrlUFjkbKGJ{
z&Mzv`<edD8*}>$N7>JWvT#%oalA2c%pORmil#^Owh(p|HB}0+%WHXlFP!muBVB})t
zVq{_DW8`DxU}R$CU=(5GV-#VOV1m$6%n%yJmtf*yEHY(aU`S>H>1JSH03{=MI#>fv
z2lXXPS<DMqQW#U17BbbcO<=6Zfu@S2TJ{>261E!F8n$MpY=+{v8kQ1vD37J+PYpvB
zM;0eEHGo;*)WETTYas(jv=$V^AaPKXGlA8Dq8!SSWJqBKr<ZybP=c{xs9^*vfy4($
z8#_2Y5XNyrRd9mi6r_R^q9Tj4h7)ca)HF~Ef}01i5@a4z7Q#GGisZ=RtgpfEKB$36
zzGa3O46z*UTTZA7kZBMVc$`<mlEMm3Pd4E?hy=w3Nl-<Ku(VX91Y#*OFfeFx7cnz1
zFidV>RZ-Ib32K4}EszXXkv52}10r-mgdT{{pL~E-LCOHcGz1YwAi@|<m`wh_Ds5{G
qDh@z03`i-9k5PtDx?<#EEV7tvz@{PvN?k=3aAT1z$YZl*R0042!t7W8
delta 644
zcmdlhw1$_@iI<m)fq{Xc-rOLrh+`w4Fr%to3VRAi3PU<uivApdD3%n16vGyVDAp9C
z6yp|#D7F;FU<OT-&2EeVj7%?QO`go;$Is5dz`(-5z~Iclz)(DoVe$tijrxkb5>^+6
z*tA-<8kQQ?Y=)ww8ip*kEcO~UNroCG2+M|{h7rP&WT;_=uxuFeG>}9QDiONjDr;C$
zn9Uh#SqgQ+8ETknnA4bo88lh^iWnIfco|*_FfcH@WMp7q(BzoBlEs}#lYR0J76+D<
z3`GW$b6A7xB|!dW<YMGvWMSlE<YMGt6k!x&5@8f!<Y6o_VqjoMW&){TU|`^2U|?W{
z`ELaS149WzGea#Cm}E|2tYs--%wk%=oWhvGw2-Nm6@|xEQB=a>!VsHP%U;7$!dk;x
z!`94{%}^XvU&B(u2IaC8mDDg~vDdJJ!-l<v9UL+cJ~K$%h9OU(h7rU<QUTKeRRIqT
zBaF~sC{kizU?@@s2SyRdTSY39->}QdXhKA^K(g8(LI*_Xf(X6I`Wy-Z`XHtOoG_f6
z$sw%@(p4-43LHi@MmBKpfdWv5QGij1Nq|uR6o96a4|1qTfr7Ef6s{fFp#L1Ui~;~q
Cn|Ztd
diff --git a/algogenetique.py b/algogenetique.py
index 1c0fb87..bf30d68 100644
--- a/algogenetique.py
+++ b/algogenetique.py
@@ -15,10 +15,10 @@ def main(N,tmax,pmutation, proportion,brin="plasmid_8k.fasta"):
brin = ''.join(lineList[1:])'''
L=[]
People=Population(N)
- print(People.indiv[0].table.rot_table)
- print(People.indiv[1].table.rot_table)
- print(People.indiv[2].table.rot_table)
- print(People.indiv[3].table.rot_table)
+ #print(People.indiv[0].table.rot_table)
+ #print(People.indiv[1].table.rot_table)
+ #print(People.indiv[2].table.rot_table)
+ #print(People.indiv[3].table.rot_table)
for i in range(tmax):
max=0
best=None
--
GitLab