From be7073e74982ae3fd1dcc46b9499f2da3c715003 Mon Sep 17 00:00:00 2001
From: Nihama Sandra Ayumi <sandra.nihama@student-cs.fr>
Date: Tue, 28 Jan 2020 09:04:12 +0100
Subject: [PATCH] corrections in croisement
---
croisement.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/croisement.py b/croisement.py
index 67eadf5..a59546f 100644
--- a/croisement.py
+++ b/croisement.py
@@ -28,11 +28,11 @@ def croisement_un_point(parent1, parent2):
point_crois= numpy.random.random_integers(0,16)
for doublet in ROT_TABLE:
if comp < point_crois:
- enfant1.__ORIGINAL_ROT_TABLE[doublet] = parent1.__ORIGINAL_ROT_TABLE[doublet]
- enfant2.__ORIGINAL_ROT_TABLE[doublet] = parent2.__ORIGINAL_ROT_TABLE[doublet]
+ enfant1.rot_table[doublet] = parent1.rot_table[doublet]
+ enfant2.rot_table[doublet] = parent2.rot_table[doublet]
else :
- enfant1.__ORIGINAL_ROT_TABLE[doublet] = parent2.__ORIGINAL_ROT_TABLE[doublet]
- enfant2.__ORIGINAL_ROT_TABLE[doublet] = parent1.__ORIGINAL_ROT_TABLE[doublet]
+ enfant1.rot_table[doublet] = parent2.rot_table[doublet]
+ enfant2.rot_table[doublet] = parent1.rot_table[doublet]
comp += 1
return enfant1, enfant2
@@ -45,10 +45,10 @@ def croisement_deux_points(parent1, parent2):
point_crois2= numpy.random.random_integers(0,16)
for doublet in ROT_TABLE:
if comp < min(point_crois1,point_crois2) or comp > max(point_crois1,point_crois2):
- enfant1.__ORIGINAL_ROT_TABLE[doublet] = parent1.__ORIGINAL_ROT_TABLE[doublet]
- enfant2.__ORIGINAL_ROT_TABLE[doublet] = parent2.__ORIGINAL_ROT_TABLE[doublet]
+ enfant1.rot_table[doublet] = parent1.rot_table[doublet]
+ enfant2.rot_table[doublet] = parent2.rot_table[doublet]
else :
- enfant1.__ORIGINAL_ROT_TABLE[doublet] = parent2.__ORIGINAL_ROT_TABLE[doublet]
- enfant2.__ORIGINAL_ROT_TABLE[doublet] = parent1.__ORIGINAL_ROT_TABLE[doublet]
+ enfant1.rot_table[doublet] = parent2.rot_table[doublet]
+ enfant2.rot_table[doublet] = parent1.rot_table[doublet]
comp += 1
return enfant1, enfant2
\ No newline at end of file
--
GitLab