From 85e286abc74294613efd2d22c35d4ca1dbc7e28d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chlo=C3=A9=20Muller?= <chloe.muller@student-cs.fr>
Date: Wed, 29 Jan 2020 16:28:38 +0100
Subject: [PATCH] commit avant de merge sur master
---
algogenetique.py | 6 +++---
individu.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/algogenetique.py b/algogenetique.py
index 7474d74..f4f6843 100644
--- a/algogenetique.py
+++ b/algogenetique.py
@@ -106,7 +106,7 @@ def comparaison_selections():
liste_selections = ["selection_p_best", "selection_duel_pondere", "selection_duel", "selection_par_rang", "selection_proportionnelle"]
liste_time = []
# plt.figure()
- People = Population(1000)
+ People = Population(100)
# S2=[individu.score for individu in People.indiv]
# plt.hist(S2, range = (0,int(max(S2)+10)), bins = 20, color = 'blue')
# plt.show()
@@ -114,7 +114,7 @@ def comparaison_selections():
for i in range(5):
print("\n", liste_selections[i], "\n")
start_time = time.time()
- best = main(500, 5, 0.001, 500, i, deepcopy(People))[0]
+ best = main(100, 35, 0.001, 50, i, deepcopy(People), enfant = croisement_deux_points)[0]
liste_time.append((liste_selections[i], time.time() - start_time, best.score))
# plt.legend()
# plt.xlabel("Nombre de générations")
@@ -131,7 +131,7 @@ def comparaison_selections():
# compare_mutation()
liste = []
-for i in range(3):
+for i in range(5):
liste.append(comparaison_selections())
print(liste)
print(liste)
diff --git a/individu.py b/individu.py
index ec36561..aac0d3a 100644
--- a/individu.py
+++ b/individu.py
@@ -23,7 +23,7 @@ class Individu():
traj = Traj3D()
- numb_ajout = 50
+ numb_ajout = 100
fisrt_seq = self.brin[0:numb_ajout]
last_seq = self.brin[-numb_ajout:]
--
GitLab