diff --git a/RotTable.py b/RotTable.py index a2f779a499910677002066fb2fc015a4f738fc6a..37762b4121d2412f728194a4da8245389cc6a30a 100644 --- a/RotTable.py +++ b/RotTable.py @@ -26,20 +26,20 @@ class RotTable: __CORRESPONDANCE = {\ "AA": "TT",\ - "AC": "TG",\ - "AG": "TC",\ - "AT": "TA",\ - "CA": "GT",\ + "AC": "GT",\ + "AG": "CT",\ + "AT": "AT",\ + "CA": "TG",\ "CC": "GG",\ - "CG": "GC",\ - "CT": "GA",\ - "GA": "CT",\ - "GC": "CG",\ + "CG": "CG",\ + "CT": "AG",\ + "GA": "TC",\ + "GC": "GC",\ "GG": "CC",\ - "GT": "CA",\ - "TA": "AT",\ - "TC": "AG",\ - "TG": "AC",\ + "GT": "AC",\ + "TA": "TA",\ + "TC": "GA",\ + "TG": "CA",\ "TT": "AA",\ } diff --git a/__pycache__/croisement.cpython-37.pyc b/__pycache__/croisement.cpython-37.pyc index 98b13d554544eea09ac20c1e882b98c4ee553e0c..c042b249f5e73f2201cd389e3d47dd0627706e14 100644 Binary files a/__pycache__/croisement.cpython-37.pyc and b/__pycache__/croisement.cpython-37.pyc differ diff --git a/__pycache__/individu.cpython-37.pyc b/__pycache__/individu.cpython-37.pyc index 1c9eaac8adf3f0912697d410ab3a2309c5c10947..b92864141ef1be69e4e4b528e4b1f8dedab9d277 100644 Binary files a/__pycache__/individu.cpython-37.pyc and b/__pycache__/individu.cpython-37.pyc differ diff --git a/individu.py b/individu.py index 3231c882bf6429ea91c9344ca12af95fde0d8ccd..9082f6167ee8b63ce469d851beb75d9a00c464b0 100644 --- a/individu.py +++ b/individu.py @@ -26,13 +26,13 @@ class Individu(): first_name = brin[0] last_name = brin[-1] - rot_computed = self.table.rot_table[last_name+first_name] - rot_traj = first_nucleotide - last_nucleotide + #rot_computed = self.table.rot_table[last_name+first_name] + #rot_traj = first_nucleotide - last_nucleotide # print(rot_traj) # print(rot_computed) - diff_angle = sum(abs(rot_computed - rot_traj)) + #diff_angle = sum(abs(rot_computed - rot_traj)) - self.score = 1/(distance + diff_angle) + self.score = 1/(distance) def mutation(self, proba = P1):