From 204f3fa349dc260a3a1fe98555b8bb2040c4c532 Mon Sep 17 00:00:00 2001
From: Carlos Santos Garcia <carlos.santos@student-cs.fr>
Date: Tue, 28 Jan 2020 19:57:20 +0100
Subject: [PATCH] vrai brin
---
__pycache__/RotTable.cpython-37.pyc | Bin 2620 -> 2618 bytes
__pycache__/Traj3D.cpython-37.pyc | Bin 1958 -> 1972 bytes
algogenetique.py | 7 ++++---
individu.py | 6 ++++--
population.py | 4 +++-
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/__pycache__/RotTable.cpython-37.pyc b/__pycache__/RotTable.cpython-37.pyc
index 0665bddc8d3fe8aeea7fabbae0d2c01f9aaae884..20d277d55079d7a6401199aa6d99042a10aacd32 100644
GIT binary patch
delta 160
zcmdlZvP*=|iI<m)fq{YHO@l$4GtWdm2}Z4n>Y5wFidfQe85kIxtztrpQ;UjYk`s$^
z@?%``lS^|`^Gb?ioP%S6LyTfVG7hiIFUm|+NJ%YL@JcPMh;j7<(+aL-`8lN}nfZBn
wiJ3*I#WAUwx>>2E6}qWt;+qv%PqHwwOn${FJ(-tFnTw5qfq{dOgOP&?02_KTn*aa+
delta 184
zcmdlbvPXo^iI<m)fq{WRA<7``F!w}02}Xm7>Y8k+%*_l@EE@xgSRCRR7#Q?Ji&Kk=
z^^-Gl@>6q5b8=FP^j-3kOLJ56N{aPelk;;@6;jkQ^U_n#H0EWdmKN!oD(ET%hZyO*
zdg@OWU=?T7->kuUl0}X67H4i^Nk(Z&W=`=f77(*Ymw|zyh>3xLA&RXeF)1h2ut;t4
iK@MRl4x8Nkl+v73J4OZuhGGr|1_lmB4n__pzC-}!#WGj`
diff --git a/__pycache__/Traj3D.cpython-37.pyc b/__pycache__/Traj3D.cpython-37.pyc
index a2a274a976ce1c2947d34c190976cd65879f2491..3051667333c64564621cb2fe405f2b8ac037b6bd 100644
GIT binary patch
delta 131
zcmZ3+zlERAiI<m)fq{YHO@l$4F84;ha>lf51_lOatC-N@)S}{;<iw(!{1}(~<kH;K
zyprM==ir#&5TlrojKeGQi!xIcQc{Z*yi!XmVq87Jw1R6{eokpgW`15?VrEflaZGBa
SZdPh(g>EXE_~yHeCs_g3hAwUZ
delta 117
zcmdnOzl@*HiI<m)fq{WR^^RVg2-ilwa>j^Q1_lQG(BjmhV*TWdocz?>(wv;sB7K+q
z<kH;Kypm#l*W~=1RD~4v%)Io}GmUwfsij5wrV6?W!68QauAcg-nYvl2r4_oVW%)U!
VC7Jnod5M`tsm1!6Uo)O$1po<5Cc^*#
diff --git a/algogenetique.py b/algogenetique.py
index 81da80b..223dc06 100644
--- a/algogenetique.py
+++ b/algogenetique.py
@@ -32,7 +32,8 @@ def main(N,tmax,pmutation, proportion,brin="plasmid_8k.fasta"):
return(best)
-main(100,100,0.1,50)
-
-
+#main(100,100,0.01,50)
+lineList = [line.rstrip('\n') for line in open("plasmid_8k.fasta")]
+brin = ''.join(lineList[1:])
+print(brin)
\ No newline at end of file
diff --git a/individu.py b/individu.py
index f243bfa..33b958b 100644
--- a/individu.py
+++ b/individu.py
@@ -9,8 +9,10 @@ P1 = 0.015
class Individu():
def __init__(self, table):
+ lineList = [line.rstrip('\n') for line in open("plasmid_8k.fasta")]
+ brin = ''.join(lineList[1:])
self.table = table
- self.score = self.evaluate("AAAGGATCTTCTTGAGATCCTTTTTTTCTGCGCGTAATCTGCTGCCAGTAAACGAAAAAACCGCCTGGGGAGGCGGTTTAGTCGAA")
+ self.score = self.evaluate(brin)
def evaluate(self, brin):
traj = Traj3D()
@@ -39,7 +41,7 @@ class Individu():
self.score = 1/max(list_distance)
- return 1/distance
+ return 1/max(list_distance)
def mutation(self, proba = P1):
diff --git a/population.py b/population.py
index 559bebb..3e78cc9 100644
--- a/population.py
+++ b/population.py
@@ -162,8 +162,10 @@ class Population:
y=newself[t]
couple_enfant = enfant(x,y)
for child in couple_enfant :
+ lineList = [line.rstrip('\n') for line in open("plasmid_8k.fasta")]
+ brin = ''.join(lineList[1:])
child.mutation(proba_mutation)
- child.evaluate("AAAGGATCTTCTTGAGATCCTTTTTTTCTGCGCGTAATCTGCTGCCAGTAAACGAAAAAACCGCCTGGGGAGGCGGTTTAGTCGAA")
+ child.evaluate(brin)
newself.append(couple_enfant[0])
newself.append(couple_enfant[1])
self = self.modifier_population(newself)
--
GitLab