From 980531a3b57959a0567bd3127ae73ffe43361997 Mon Sep 17 00:00:00 2001
From: Carlos Santos Garcia <carlos.santos@student-cs.fr>
Date: Tue, 28 Jan 2020 11:48:23 +0100
Subject: [PATCH] d
---
RotTable.py | 8 ++++----
__pycache__/RotTable.cpython-37.pyc | Bin 2230 -> 2162 bytes
__pycache__/individu.cpython-37.pyc | Bin 1556 -> 1550 bytes
population.py | 4 ----
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/RotTable.py b/RotTable.py
index e3486c1..1882a5f 100644
--- a/RotTable.py
+++ b/RotTable.py
@@ -21,7 +21,7 @@ class RotTable:
"TA": [36, 0.9, 0, 1.1, 2, 0],\
"TC": [36.9, 5.3, -120, 0.9, 6, 0],\
"TG": [34.5, 3.5, 64, 0.9, 34, 0],\
- "TT": [35.62, 7.2, -154, 0.06, 0.6, 0]\
+ "TT": [35.62, 7.2, 154, 0.06, 0.6, 0]\
}
# get the angles in each axis (x, y, z), considering the deviation
@@ -63,7 +63,7 @@ class RotTable:
###################
-# table1 = RotTable()
-# print(table1.orta())
+table1 = RotTable()
+print(table1.orta())
-# print(table1.rot_table["AA"])
+print(table1.rot_table["AA"])
diff --git a/__pycache__/RotTable.cpython-37.pyc b/__pycache__/RotTable.cpython-37.pyc
index f25daa2be78dfa969b59255077ce90b2f4993ff2..c4ba5fb8c0ad48c03b7f8a7c221b50aa6d3855e3 100644
GIT binary patch
delta 360
zcmdlc_(_1*iI<m)fq{YHsenP8(L`QJMy-kJnrtbI!3>%#8_QNPF-A>RWPZ&kwwag3
zm62D7fq~%`Yf)ledTNp2<aky&SrG;Xh9XgrFk@zs7>ENV#6c|K$+KA9#X)*B8H>OQ
z!E#_ieDV+0Xc@2^6GRSV2(k&2^VyQ|D|kmpK`wiWG02J{39xfOgaU|A1QE(0LIp&C
z9fTmnC$n(4cxkfS;>=Af$tW$!%qhOb0%8`)fK)Sq2!v`d3*_Bf95%W6DWy57c8m-R
Q48?2=3=ABM9E==H0Et08;Q#;t
delta 428
zcmew)uuYKHiI<m)fq{X+^S6GS&O}~GMz4wLnrf-c%?wd2sjR6i3)mJiG&3?XfY@2=
zDJ+s;UJ7F{gC^_7uvJWqw<a?(zh)HQ{Fd33kyn_3f#DWwQDR<tYLU=ndsaDFQ3eKv
zA~BFKV`h;!hyx}hKrE5TRjlsfAU&FlMPP+sIWQqH`37sW3|Ni{A_p=A*@VgdY{~c)
zoFk;bmp#Q8WJQrA*f}6V5kx3~2o(^a3L?M`LJ$&@pRl{+6$vmfFlchz;>=Af$tW$!
z%qhOb0%8`)g0wI(Ffc^1l_VzRq#E90Ehx&&D=7jSEd-K9m<48m0^=5kO>TZlX-=vg
ZBLf3NF%JU+0|z4qBL@?oEgK^b69A|)P1XPa
diff --git a/__pycache__/individu.cpython-37.pyc b/__pycache__/individu.cpython-37.pyc
index 2b4fb59ee832eef9ce7a2733b2fce8db621d7883..1c9eaac8adf3f0912697d410ab3a2309c5c10947 100644
GIT binary patch
delta 49
zcmbQj)5pW@#LLUYz`(%pRKQ>(_Y)@eTbxDtCGjPjzcFoMWGxb9U|^WMndK0p<m58e
Fc>qO)4nY6_
delta 55
zcmeC<nZm>E#LLUYz`(%Z`CES@_Y)@eD9)h#lK7C#-<UQra^K=C$}fp8NleN~oxGOi
L5TnH80@ir|x2O@|
diff --git a/population.py b/population.py
index f3daad1..5fe490a 100644
--- a/population.py
+++ b/population.py
@@ -74,11 +74,7 @@ class Population:
echanger(tableau,debut,randint(debut,fin-1))
partition=debut
for i in range(debut+1,fin):
-<<<<<<< HEAD
- #if tableau[i] < tableau[debut]:
-=======
# if tableau[i] < tableau[debut]:
->>>>>>> ea595ada3becbb697c8735a8fbdc55f04e1606a2
if tableau[i].score<tableau[debut].score:
partition+=1
echanger(tableau,i,partition)
--
GitLab