Update pygad.py

Takshan · web-flow · commit d44c9bd4f6cb · 2023-10-19T20:45:17.000+09:00
diff --git a/pygad/pygad.py b/pygad/pygad.py
@@ -1646,7 +1646,9 @@ def cal_pop_fitness(self):
                 last_generation_elitism_as_list = [
                     list(gen_elitism) for gen_elitism in self.last_generation_elitism]
 
-            pop_fitness = ["undefined"] * len(self.population)
+            undefined_pop_fitness = object()
+
+            pop_fitness = [undefined_pop_fitness] * len(self.population)
             if self.parallel_processing is None:
                 # Calculating the fitness value of each solution in the current population.
                 for sol_idx, sol in enumerate(self.population):
@@ -1708,8 +1710,12 @@ def cal_pop_fitness(self):
                     # Reaching this block means that batch fitness calculation is used.
 
                     # Indices of the solutions to calculate their fitness.
-                    solutions_indices = numpy.where(
-                        numpy.array(pop_fitness) == "undefined")[0]
+                    solutions_indices = numpy.array([
+                        sol_idx
+                        for (sol_idx, fitness)
+                        in enumerate(pop_fitness)
+                        if fitness is undefined_pop_fitness
+                    ])
                     # Number of batches.
                     num_batches = int(numpy.ceil(len(solutions_indices) / self.fitness_batch_size))
                     # For each batch, get its indices and call the fitness function.
@@ -1787,7 +1793,7 @@ def cal_pop_fitness(self):
                     solutions_to_submit = []
                     for sol_idx, sol in enumerate(self.population):
                         # The "undefined" value means that the fitness of this solution must be calculated.
-                        if pop_fitness[sol_idx] == "undefined":
+                        if pop_fitness[sol_idx] is undefined_pop_fitness:
                             solutions_to_submit.append(sol.copy())
                             solutions_to_submit_indices.append(sol_idx)
 
@@ -2479,4 +2485,4 @@ def load(filename):
     except:
         # raise BaseException("Error loading the file. If the file already exists, please reload all the functions previously used (e.g. fitness function).")
         raise BaseException("Error loading the file.")
-    return ga_in
+    return ga_in
