From 46d399aea51b627058e6ad52e7887e629cf75e6e Mon Sep 17 00:00:00 2001
From: Nihama Sandra Ayumi <sandra.nihama@student-cs.fr>
Date: Wed, 29 Jan 2020 13:21:04 +0100
Subject: [PATCH] croisement loop corrected
---
__pycache__/RotTable.cpython-37.pyc | Bin 2578 -> 2582 bytes
__pycache__/Traj3D.cpython-37.pyc | Bin 1932 -> 1936 bytes
__pycache__/individu.cpython-37.pyc | Bin 2706 -> 2710 bytes
croisement.py | 6 ++++--
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/__pycache__/RotTable.cpython-37.pyc b/__pycache__/RotTable.cpython-37.pyc
index d0d2bee9e71c849781de9a96c497f02788ecaaf7..871a676fa8235c0400b419269ae9e4181252734d 100644
GIT binary patch
delta 67
zcmbOvGEIcriI<m)fq{WxUW~y;?(Hm^KF(G#p~b01#WBT+c_~FPF8Rr&xv6<2#WBvo
XF~O!W!68O5!67lOo|~VuXtM$UkO>tF
delta 63
zcmbOxGD(EniI<m)fq{X+(bI4v_jVRlk7TQu(Bjmh;u!D5f`ZiI7?;%I?2`O~m=G`B
S)Uuf5#G;)1;?1vFv{?ZzyA&1x
diff --git a/__pycache__/Traj3D.cpython-37.pyc b/__pycache__/Traj3D.cpython-37.pyc
index 9f5f20ef7c01a060943e03ea5beaee567c92ae7e..dea944e68cade651c52da0042ac2d62a176dc023 100644
GIT binary patch
delta 67
zcmeC-pTN)U#LLUYz`(#TFUDXacNL?im$Ow&XmM&$aZGVyUP@7nOMY@`Zfaghag1|t
WOt5K8aEMV%a7c`+=jK(6k5~bIKNTtf
delta 63
zcmbQh-^0)C#LLUYz`(%Z=xMl-yNXfOE!iq2v^ce>IL14%pdht4#wE2lyClCLCd5lO
SwJat%u_!0Mc=I~ON2~xIQ4}=*
diff --git a/__pycache__/individu.cpython-37.pyc b/__pycache__/individu.cpython-37.pyc
index 83b7aac12df9ffd210cc807f63745df4b2a39629..96ed7d90f93ff50da4b4f4476bc9f4ce8555ea0f 100644
GIT binary patch
delta 66
zcmbOvI!%<ziI<m)fq{YHi|<CRZH$^e&Q>v@#i>QbF~x~_DMc|Z`N^fZsd**EG0wp;
W!KN|6Ax1I5Au+C=o1ZeS<p2PZlog%;
delta 62
zcmbOxI!TnviI<m)fq{YHvd>1YZH%fO$yPC;#i>QbG2V#<1*yd`E~&-YCHVz0Azr$v
SWiiQ#MLGG!n_n`n<p2Oc78LdX
diff --git a/croisement.py b/croisement.py
index 96f85a8..f582b97 100644
--- a/croisement.py
+++ b/croisement.py
@@ -27,7 +27,8 @@ def croisement_un_point(parent1, parent2):
enfant2 = Individu(RotTable())
comp = 0
point_crois= numpy.random.random_integers(0,8)
- for doublet in ROT_TABLE:
+ list_dinucleotides = sorted(ROT_TABLE)
+ for doublet in list_dinucleotides:
if doublet == "GA":
break
if comp < point_crois:
@@ -62,7 +63,8 @@ def croisement_deux_points(parent1, parent2):
comp = 0
point_crois1= numpy.random.random_integers(0,8)
point_crois2= numpy.random.random_integers(0,8)
- for doublet in ROT_TABLE:
+ list_dinucleotides = sorted(ROT_TABLE)
+ for doublet in list_dinucleotides:
if comp < min(point_crois1,point_crois2) or comp > max(point_crois1,point_crois2):
enfant1.table.rot_table[doublet] = parent1.table.rot_table[doublet]
correspondent_doublet1 = enfant1.table.corr()[doublet]
--
GitLab