From 37662cdf733696a598543eaf521dd808213773cf Mon Sep 17 00:00:00 2001
From: Gauthier Roy <gauthierroy83@gmail.com>
Date: Wed, 29 Jan 2020 10:12:47 +0100
Subject: [PATCH] modification of the fitness
---
__pycache__/RotTable.cpython-36.pyc | Bin 2132 -> 2593 bytes
individu.py | 29 ++++++++++++++--------------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/__pycache__/RotTable.cpython-36.pyc b/__pycache__/RotTable.cpython-36.pyc
index a8064bb45dbaad46db289f9e730b7dd816423ae4..459e4374c306aebaf525b830c17f00a8820843ca 100644
GIT binary patch
delta 1205
zcmca2uuz1{n3tDJ#@;aQ7WYK16tO%;28L9ID8>|qD5ey~DCQKV6y_Aqi7n>*UMb=!
z5-IHIY$=i{QYqdOPf0WSOnhd}=sQ`CQJT?jvK6CrJxdB}3L99B#vFktmK4nttrYDP
zofO>^y%hZvgA~IQqZH#5lN8ewvlR0bixiM5Ry0*0HKr++bGV||Qmj&}TNt9)Q*2Uf
zTNt7^QtVRfTNt7^QyfwpTNt9aQk+tpTNt9aQ(RJ9TNt8v_)^?b+*=r;cvC!r88rPj
z&tmjstiQ$N=y;3C(fJmWqx&r;$B<i0&W^X3oSknmIlJFtat^u0<nDNj$=&%Dle_yZ
zCijqAOd*c9m_nRyF@?C_VhRZ<l4oFGD3S&d;vhm8M96^%DG(tBB7{JMEQpW<5uzYM
z5Jbo@xH2#lNr0FlAVPqFfkBh22t*Zu6@YbujRebsb%Koq>j9f4!@$5WS($kaqw3@f
z%vp@qldV~F>RA{V7}yyY7@Qdx7>e5%7#J!VN*J;jT^M4^Y8fjEN|;g@n?bykTBZ`_
zES4<R5{4|c8b(Qm8m1H`aRx~SZU%Ib6y{#0TIL#tEOv-GRt8Ci8fJ3_W(FGukSNG}
zkPOHSHi+cpGc1brx0rMC%Wtt{WTt0mauhK!FfiPbix0{#2}w-KNsW&W_74q?clHko
zat#jf_j7Udb9TMOT9lZVo_dQluQa!y@)lcBVqQvq?k)Dxyv(%xqTC`yP*5p=f{LX`
z8N^lr8OoR$#hQ|uQ<7Mu3K9boY77h#3`I(?fZ$?aU|?Y6VdP`fV-%Yl$!ewuGD?#X
zVhUIXm{0?m$C6)ElIT5o1FO{JELIhZTarkQMs+VP1CsNLiu@*TU=?Knu_o_j(=lWO
zxtg&E?06=KwIIi%I+@`XM|x^WNO@*)N%Z6eY!Z|0*etY&(Gs4TlAanjc>!C19wFsC
z>8T|ynMJ9|C7JnoiIe5n9hfxvCa1FNg@b~m$Pg5SS|CClM1VrD$N<DL0uja_!W2Z9
zfe3JzAqY_Df#aDKl=xB@7#KJhS(qn3WS5xyo}JA`goTL_ALPIy&%w+A0?d>Dv&&2A
Tfb0aNBcxCR+pad*f<p!XEj0KV
delta 821
zcmZ1|az%j4n3tDplbb=@JdTN6DPn4j3=F9ZQH&`JQA{a}QOqe!Da<Km6I;yr%~Qlv
zBvRPZ*-|7^q*5#<o|0y?ocPR~(Q2|Bqco%SWGhB#SDO^p6gIFLjX45QEGe2PS}hDw
ztSQ<lIxP%QY$>`adMyl5>?!&w1}zLx94Uq=MlB3coGHdBCM^t6Tq&l(44Sr^A2E6|
zIz%x!Iz}-$I!7@%y5C}Q42fcLcD%*p>>S19>>kDB91_Lk?ij`7?i|JB?jFVD9umbA
z;uysg;vB^k;vU5m5;FNc^BP9+$#Yn;7-c52v+ATWGcYi4F)%PVGcYg|r!g=vR3wxz
zWHGuh#D>)}Rs@tVr7$*wcrLX}H4ItIHH?xBHB77wk_;s*S*%%XAhi&&6ee*7Nd|5P
zbdeP1UZ%-ASQT@km~-;WqgXOB(=#;Li<lS~7>a}$7#MD`7A5ATrxpo;*?Fb81(i{3
zMTvPS`MFW-rFofY`9-;!%tfLg^<p43jG0B^AP$(20I@_E7#LJQ?q_3QU|?Y6VdR@!
zz-DFzGF_7qq7$qbOn`LUV#zNmNz?*q0l9;Lv5Ge+za%6vDJNAABs2K}yS7mgBLf42
zCL`EknoJO5Kn_5&{T4@hYDq|WW^sx6WL*x4$*0*Zv_O6#q$NBxB|X(@vMxt}9wFsC
z>8T|ynMJ9|C7Jnowv$(LIIw4?{r~@8lY8=84n0SZKZ_(`0Z}9iV#$FB1rVVKBEUXJ
z5TGys#{erR2=pdrbE>m&aB#3qKEo+*CJoX63Kk@fg0+Hl-Quvx%}*)KNwouoPBAFJ
KIT$$@IhX(xuBlxB
diff --git a/individu.py b/individu.py
index 532a278..02ea966 100644
--- a/individu.py
+++ b/individu.py
@@ -17,26 +17,27 @@ class Individu():
def evaluate(self, brin):
traj = Traj3D()
- numb_ajout = 3
+ numb_ajout = 6
fisrt_seq = brin[0:numb_ajout]
last_seq = brin[-numb_ajout:]
traj.compute(last_seq + brin + fisrt_seq, self.table)
traj_array = np.array(traj.getTraj())
+ print(traj_array)
+
list_distance = []
- for i in range(numb_ajout):
- first_nuc_coordonate = traj_array[numb_ajout+i, 0:3]
- first_nuc_coordonate_compute = traj_array[-(numb_ajout-i), 0:3]
-
- last_nuc_coordonate = traj_array[-(2*numb_ajout-i), 0:3]
- last_nuc_coordonate_compute = traj_array[i, 0:3]
+ begining = traj_array[0:2*numb_ajout, 0:3]
+ end = traj_array[-2*numb_ajout:, 0:3]
- distance_first_nuc = np.linalg.norm(first_nuc_coordonate - first_nuc_coordonate_compute, ord=2)
- distance_last_nuc = np.linalg.norm(last_nuc_coordonate - last_nuc_coordonate_compute, ord=2)
+ for i in range(numb_ajout):
- list_distance += [distance_first_nuc, distance_last_nuc]
+ nuc_coordonate_beg = begining[i]
+ print(nuc_coordonate_beg)
+ nuc_coordonate_end = end[i]
+ distance_nuc = np.linalg.norm(nuc_coordonate_beg - nuc_coordonate_end, ord=2)
+ list_distance += [distance_nuc]
self.score = max(list_distance)
@@ -63,10 +64,10 @@ class Individu():
# print(individu1.table.rot_table)
# individu1.mutation()
-# table = RotTable()
-# test = Individu(table)
-# test.evaluate("AAAGGATCTTCTTGAGATCCTTTTTTTCTGCGCGTAATCTGCTGCCAGTAAACGAAAAAACCGCCTGGGGAGGCGGTTTAGTCGAA")
-# print(test.score)
+table = RotTable()
+test = Individu(table)
+test.evaluate("AAAGGATCTTCTTGAGATCCTTTTTTTCTGCGCGTAATCTGCTGCCAGTAAACGAAAAAACCGCCTGGGGAGGCGGTTTAGTCGAA")
+print(test.score)
# qqun=Individu(RotTable())
--
GitLab