diff --git a/.gitignore b/.gitignore index 7e99e367f8443d86e5e8825b9fda39dfbb39630d..09bf5d65f59f67ea5457404e72300a693093ada1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -*.pyc \ No newline at end of file +*.pyc +__pycache__/ \ No newline at end of file diff --git a/RotTable.py b/RotTable.py index 093082020f0c1b6b344c9818f438c90b37f82d32..8de05872d6cd6f296fbda465d3b769295eb62284 100644 --- a/RotTable.py +++ b/RotTable.py @@ -101,4 +101,4 @@ class RotTable: table1 = RotTable() -print(table1.rot_table) +# print(table1.rot_table) diff --git a/__pycache__/RotTable.cpython-37.pyc b/__pycache__/RotTable.cpython-37.pyc index c83b8f44bf8d032a00f01146a96d3e6db0a5d8f2..0f0c7511895c47a8cfeb05cd095f0bbee2f31924 100644 Binary files a/__pycache__/RotTable.cpython-37.pyc and b/__pycache__/RotTable.cpython-37.pyc differ diff --git a/__pycache__/croisement.cpython-37.pyc b/__pycache__/croisement.cpython-37.pyc index c042b249f5e73f2201cd389e3d47dd0627706e14..24659b511a06317791374055d8756a71bf947669 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 b92864141ef1be69e4e4b528e4b1f8dedab9d277..1d266105529cfa0c43eefd0edc5dcaf184adefec 100644 Binary files a/__pycache__/individu.cpython-37.pyc and b/__pycache__/individu.cpython-37.pyc differ diff --git a/__pycache__/population.cpython-37.pyc b/__pycache__/population.cpython-37.pyc index 14e980ef62041555b1d3d28efc6dd1b0cc4e3b90..ac693785cdf9586e97d434cfe6cf9ec4648b1453 100644 Binary files a/__pycache__/population.cpython-37.pyc and b/__pycache__/population.cpython-37.pyc differ diff --git a/algogenetique.py b/algogenetique.py index 9b91cb95af25a08044e3ecc9e682ca1e82153211..901ad3e64f23a5422f32c76bf45b20cf17362424 100644 --- a/algogenetique.py +++ b/algogenetique.py @@ -3,19 +3,22 @@ import math import numpy import RotTable from individu import Individu -from population import Population +from population import Population, afficher 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) + afficher(People) for i in range(tmax): + print("\n \n NOUVELLE GENERATION \n \n") max=0 best=None for individu in People.indiv: @@ -29,11 +32,12 @@ def main(N,tmax,pmutation, proportion,brin="plasmid_8k.fasta"): best=individu max=individu.score L.append(max) - print(L) + # print(L) + afficher(People) plt.plot([i for i in range(tmax)], L) plt.show() return(individu) -main(100,50,0.015,2) +main(10,3,0.015,2) diff --git a/population.py b/population.py index c16d0101e1233c9ff230563b1ca492f6bf6656fa..7268915b15f592aa862b42b3c6decc53c587020e 100644 --- a/population.py +++ b/population.py @@ -142,6 +142,7 @@ def afficher(popu): for individu in popu.indiv : print("\n individu \n") print(individu.table.rot_table) + print ("score", individu.score) def test(): popu = Population(4)