From b42034c402e32bd074e938c8807409525f0061eb Mon Sep 17 00:00:00 2001
From: SimpleArt <71458112+SimpleArt@users.noreply.github.com>
Date: Mon, 12 Oct 2020 23:43:28 -0400
Subject: [PATCH] Added structure directory and improved sort by fitness

---
 src/EasyGA.py                                             | 8 ++++----
 src/initialization/__init__.py                            | 5 +----
 src/structure/README.md                                   | 0
 src/structure/__init__.py                                 | 4 ++++
 .../chromosome_structure => structure}/chromosome.py      | 0
 src/{initialization/gene_structure => structure}/gene.py  | 0
 .../population_structure => structure}/population.py      | 0
 7 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 src/structure/README.md
 create mode 100644 src/structure/__init__.py
 rename src/{initialization/chromosome_structure => structure}/chromosome.py (100%)
 rename src/{initialization/gene_structure => structure}/gene.py (100%)
 rename src/{initialization/population_structure => structure}/population.py (100%)

diff --git a/src/EasyGA.py b/src/EasyGA.py
index 794fe31..a755d49 100644
--- a/src/EasyGA.py
+++ b/src/EasyGA.py
@@ -1,9 +1,9 @@
 import random
 
 # Import all the data structure prebuilt modules
-from initialization import Population as create_population
-from initialization import Chromosome as create_chromosome
-from initialization import Gene as create_gene
+from structure import Population as create_population
+from structure import Chromosome as create_chromosome
+from structure import Gene as create_gene
 
 # Structure Methods
 from fitness_function import Fitness_Examples
@@ -130,4 +130,4 @@ class GA:
         etc.
         """
 
-        return list(reversed(sorted(chromosome_set, key = lambda chromosome: chromosome.get_fitness())))
+        return sorted(chromosome_set, key = lambda chromosome: chromosome.get_fitness(), reverse = True)
diff --git a/src/initialization/__init__.py b/src/initialization/__init__.py
index 0aa9dd3..4195d53 100644
--- a/src/initialization/__init__.py
+++ b/src/initialization/__init__.py
@@ -1,5 +1,2 @@
 # FROM (. means local) file_name IMPORT function_name
-from .initialization_methods import Initialization_Methods
-from .gene_structure.gene import Gene
-from .chromosome_structure.chromosome import Chromosome
-from .population_structure.population import Population
\ No newline at end of file
+from .initialization_methods import Initialization_Methods
\ No newline at end of file
diff --git a/src/structure/README.md b/src/structure/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/src/structure/__init__.py b/src/structure/__init__.py
new file mode 100644
index 0000000..503c4b2
--- /dev/null
+++ b/src/structure/__init__.py
@@ -0,0 +1,4 @@
+# FROM (. means local) file_name IMPORT function_name
+from .gene import Gene
+from .chromosome import Chromosome
+from .population import Population
\ No newline at end of file
diff --git a/src/initialization/chromosome_structure/chromosome.py b/src/structure/chromosome.py
similarity index 100%
rename from src/initialization/chromosome_structure/chromosome.py
rename to src/structure/chromosome.py
diff --git a/src/initialization/gene_structure/gene.py b/src/structure/gene.py
similarity index 100%
rename from src/initialization/gene_structure/gene.py
rename to src/structure/gene.py
diff --git a/src/initialization/population_structure/population.py b/src/structure/population.py
similarity index 100%
rename from src/initialization/population_structure/population.py
rename to src/structure/population.py