Merge branch 'master' of...

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

RotTable.py

@@ -85,7 +85,7 @@ class RotTable:
 
     ###################
 
-# table1 = RotTable()
-# print(table1.orta())
+table1 = RotTable()
+print(table1.orta())
 
-# print(table1.rot_table["AA"])
+print(table1.rot_table["AA"])

algogenetique.py

+import mathutils
+import math
+import numpy
+import RotTable
+from individu import Individu
+from population import Population
+import croisement
+from Traj3D import *
+from random import random
+import matplotlib.pyplot as plt
+
+
+def main(N,tmax,pmutation, proportion,brin="plasmid_8k.fasta"):
+    '''lineList = [line.rstrip('\n') for line in open(brin)]
+	brin = ''.join(lineList[1:])'''
+    L=[]
+    People=Population(N)
+    for i in range(tmax):
+        max=0
+        best=None
+        for individu in People.indiv:
+            individu.evaluate("AAAGGATCTTCTTGAGATCCTTTTTTTCTGCGCGTAATCTGCTGCCAGTAAACGAAAAAACCGCCTGGGGAGGCGGTTTAGTCGAA")
+        People.reproduction(p = proportion)
+        for individu in People.indiv:
+            individu.mutation(pmutation)
+        for individu in People.indiv:
+            individu.evaluate("AAAGGATCTTCTTGAGATCCTTTTTTTCTGCGCGTAATCTGCTGCCAGTAAACGAAAAAACCGCCTGGGGAGGCGGTTTAGTCGAA")
+            if individu.score>max:
+                best=individu
+                max=individu.score
+        L.append(max)
+        print(L)
+    plt.plot([i for i in range(tmax)], L)
+    plt.show()
+    return(individu)
+
+
+main(100,50,0.015,2)
+

population.py

@@ -153,7 +153,7 @@ def test():
     print("\n REPRODUCTION \n")
     afficher(popu)
 
-# test()
+#test()