Merge branch 'master' of...

Merge branch 'master' of https://gitlab-research.centralesupelec.fr/2019santosgc/ei-jeux-evolutionnaires

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

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()

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,10 +149,7 @@ 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)