extradata

Matias Gonzalez · Matias Gonzalez · commit 2bd8bab1150a · 2022-04-25T19:23:14.000-03:00
diff --git a/pygad.py b/pygad.py
@@ -48,7 +48,8 @@ def __init__(self,
                  save_best_solutions=False,
                  save_solutions=False,
                  suppress_warnings=False,
-                 stop_criteria=None):
+                 stop_criteria=None,
+                 extra_data=None):
 
         """
         The constructor of the GA class accepts all parameters required to create an instance of the GA class. It validates such parameters.
@@ -111,6 +112,8 @@ def __init__(self,
         stop_criteria: Added in PyGAD 2.15.0. It is assigned to some criteria to stop the evolution if at least one criterion holds.
         """
 
+        self.extra_data = extra_data
+
         # If suppress_warnings is bool and its valud is False, then print warning messages.
         if type(suppress_warnings) is bool:
             self.suppress_warnings = suppress_warnings
@@ -635,11 +638,11 @@ def __init__(self,
         # Check if the fitness_func is a function.
         if callable(fitness_func):
             # Check if the fitness function accepts 2 paramaters.
-            if (fitness_func.__code__.co_argcount == 2):
+            if (fitness_func.__code__.co_argcount >= 2 and fitness_func.__code__.co_argcount <= 3):
                 self.fitness_func = fitness_func
             else:
                 self.valid_parameters = False
-                raise ValueError("The fitness function must accept 2 parameters:\n1) A solution to calculate its fitness value.\n2) The solution's index within the population.\n\nThe passed fitness function named '{funcname}' accepts {argcount} parameter(s).".format(funcname=fitness_func.__code__.co_name, argcount=fitness_func.__code__.co_argcount))
+                raise ValueError("The fitness function must accept up to 3 parameters:\n1) A solution to calculate its fitness value.\n2) The solution's index within the population.\n\nThe passed fitness function named '{funcname}' accepts {argcount} parameter(s).".format(funcname=fitness_func.__code__.co_name, argcount=fitness_func.__code__.co_argcount))
         else:
             self.valid_parameters = False
             raise ValueError("The value assigned to the fitness_func parameter is expected to be of type function but ({fitness_func_type}) found.".format(fitness_func_type=type(fitness_func)))
@@ -1160,7 +1163,7 @@ def cal_pop_fitness(self):
                 # Use the parent's index to return its pre-calculated fitness value.
                 fitness = self.previous_generation_fitness[parent_idx]
             else:
-                fitness = self.fitness_func(sol, sol_idx)
+                fitness = self.fitness_func(sol, self.extra_data, sol_idx)
                 if type(fitness) in GA.supported_int_float_types:
                     pass
                 else:
