diff --git a/__pycache__/RotTable.cpython-36.pyc b/__pycache__/RotTable.cpython-36.pyc index a8064bb45dbaad46db289f9e730b7dd816423ae4..459e4374c306aebaf525b830c17f00a8820843ca 100644 Binary files a/__pycache__/RotTable.cpython-36.pyc and b/__pycache__/RotTable.cpython-36.pyc differ diff --git a/individu.py b/individu.py index 532a2785042d95966bdb92023c148e377a08a920..02ea9661208a3c8570b888b1aac6cade24a8b8fd 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())