diff --git a/RotTable.py b/RotTable.py index ae2a83b202eef1af57c50fe80c3c33243a82a4eb..123d72f673f64e36d78b569545aa3d71c6807892 100644 --- a/RotTable.py +++ b/RotTable.py @@ -25,22 +25,22 @@ class RotTable: } __CORRESPONDANCE = {\ - "AA": "TT" - "AC": "TG" - "AG": "TC" - "AT": "TA" - "CA": "GT" - "CC": "GG" - "CG": "GC" - "CT": "GA" - "GA": "CT" - "GC": "CG" - "GG": "CC" - "GT": "CA" - "TA": "AT" - "TC": "AG" - "TG": "AC" - "TT": "AA" + "AA": "TT",\ + "AC": "TG",\ + "AG": "TC",\ + "AT": "TA",\ + "CA": "GT",\ + "CC": "GG",\ + "CG": "GC",\ + "CT": "GA",\ + "GA": "CT",\ + "GC": "CG",\ + "GG": "CC",\ + "GT": "CA",\ + "TA": "AT",\ + "TC": "AG",\ + "TG": "AC",\ + "TT": "AA",\ } # get the angles in each axis (x, y, z), considering the deviation diff --git a/individu.py b/individu.py index ba4e59560700d887a64925fbe71bb92802446d4e..3231c882bf6429ea91c9344ca12af95fde0d8ccd 100644 --- a/individu.py +++ b/individu.py @@ -49,6 +49,7 @@ class Individu(): #sur l'axe z il y a un moins table_rotations[doublet2][coord] = - table_rotations[doublet][coord] + # individu1 = Individu(RotTable()) # print(individu1.table.rot_table) # individu1.mutation() diff --git a/population.py b/population.py index 5fe490a6d715086ff6e363f27c68d0f47d01110f..66aa2f050839e2fc0d5ab03dd5eb6d607baef418 100644 --- a/population.py +++ b/population.py @@ -2,7 +2,7 @@ import random from random import random, randint, randrange from individu import Individu from RotTable import RotTable -from croisement import * +from croisement import croisement_un_point, croisement_deux_points class Population: def __init__(self,n): @@ -149,14 +149,11 @@ def test(): for individu in popu.indiv : individu.evaluate("AAAGGATCTTCTTGAGATCCTTTTTTTCTGCGCGTAATCTGCTGCCAGTAAACGAAAAAACCGCCTGGGGAGGCGGTTTAGTCGAA") afficher(popu) - # popu.selection_par_rang() - # print("\n SELECTION PAR RANG \n") - # afficher(popu) - popu.reproduction(selection = popu.selection_proportionelle) + popu.reproduction(selection = popu.selection_duel) print("\n REPRODUCTION \n") afficher(popu) -test() +# test()