Merge branch 'master' of https://github.com/danielwilczak101/EasyGA

src/database/matplotlib_graph.py

@@ -30,9 +30,11 @@ class Matplotlib_Graph:
     def plot(self):
         """Plot all the graph attributes"""
 
+        if self.xlabel is not None: xlabel = self.xlabel
+        if self.ylabel is not None: xlabel = self.ylabel
+        if self.title  is not None: xlabel = self.title
 
-
-        if self.yscale == "log":
+        if yscale == "log":
             # If using log then the values have to be positive numbers
             self.y  =  [abs(ele) for ele in self.y]
 

src/structure/chromosome.py

@@ -1,11 +1,12 @@
+from copy import deepcopy
+
 class Chromosome:
 
-    def __init__(self, gene_list = None):
-        if gene_list is None:
-            self.gene_list = []
-        else:
-            self.gene_list = gene_list
+    def __init__(self, gene_list = []):
+        """Initialize the chromosome with fitness value of None, and a
+        set of genes dependent on user-passed parameter."""
 
+        self.gene_list = deepcopy(gene_list)
         self.fitness = None
 
 

src/structure/gene.py

@@ -1,15 +1,11 @@
-def check_gene(value):
-    #Check to make sure the gene is not empty
-    assert value != "" , "Gene can not be empty"
-    return value
-
+from copy import deepcopy
 
 class Gene:
 
     def __init__(self, value):
         """Initialize a gene with fitness of value None and the input value"""
+        self.value = deepcopy(value)
         self.fitness = None
-        self.value = check_gene(value)
 
 
     def get_fitness(self):

src/structure/population.py

@@ -1,14 +1,12 @@
+from copy import deepcopy
+
 class Population:
 
-    def __init__(self, chromosome_list = None):
-        """Intiialize the population with fitness of value None, and a
-        set of chromosomes dependant on user-passed parameter"""
-
-        if chromosome_list is None:
-          self.chromosome_list = []
-        else:
-          self.chromosome_list = chromosome_list
+    def __init__(self, chromosome_list = []):
+        """Initialize the population with fitness of value None, and a
+        set of chromosomes dependant on user-passed parameter."""
 
+        self.chromosome_list = deepcopy(chromosome_list)
         self.fitness = None
         self.mating_pool = []
         self.next_population = []