pass kwargs in demos

Author: abouter

demos/bbo_discrete/main.py

@@ -4,10 +4,10 @@
 # Custom fitness function resembling the concatenated deceptive trap function of size k
 class CustomTrapFunction(gomea.fitness.BBOFitnessFunctionDiscrete):
     # Any members must be assigned in __new__ to make them accessible during instantiation of superclass
-    def __new__(self, number_of_variables, k, value_to_reach):
+    def __new__(self, number_of_variables, k, **kwargs):
         assert( number_of_variables % k == 0 )
         self.k = k
-        return super().__new__(self,number_of_variables,value_to_reach)
+        return super().__new__(self,number_of_variables,**kwargs)
 
     def objective_function(self, objective_index, variables):
         f = 0

demos/gbo_discrete/main.py

@@ -4,10 +4,10 @@
 # Custom fitness function resembling the concatenated deceptive trap function of size k
 class CustomTrapFunction(gomea.fitness.GBOFitnessFunctionDiscrete):
     # Any members must be assigned in __new__ to make them accessible during instantiation of superclass
-    def __new__(self, number_of_variables, k, value_to_reach):
+    def __new__(self, number_of_variables, k, **kwargs):
         assert( number_of_variables % k == 0 )
         self.k = k
-        return super().__new__(self,number_of_variables,value_to_reach)
+        return super().__new__(self,number_of_variables,**kwargs)
 
     def number_of_subfunctions( self ):
         return self.number_of_variables // self.k

gomea/fitness.pyx

@@ -99,6 +99,7 @@ cdef class GBOFitnessFunctionDiscrete(GBOFitnessFunction):
         number_of_variables : int,
         value_to_reach : float = 1e308,
         alphabet_size : int = 2,
+        **kwargs
     ):
         self.number_of_variables = number_of_variables
         self.alphabet_size = alphabet_size
@@ -111,7 +112,8 @@ cdef class GBOFitnessFunctionDiscrete(GBOFitnessFunction):
 cdef class GBOFitnessFunctionRealValued(GBOFitnessFunction):
     def __cinit__(self, 
         number_of_variables : int,
-        value_to_reach : float = 0.0
+        value_to_reach : float = 0.0,
+        **kwargs
     ):
         self.number_of_variables = number_of_variables
         self.value_to_reach = value_to_reach
@@ -132,6 +134,7 @@ cdef class BBOFitnessFunctionDiscrete(BBOFitnessFunction):
         number_of_variables : int,
         value_to_reach : float = 1e308,
         alphabet_size : int = 2,
+        **kwargs
     ):
         self.number_of_variables = number_of_variables
         self.alphabet_size = alphabet_size
@@ -144,7 +147,8 @@ cdef class BBOFitnessFunctionDiscrete(BBOFitnessFunction):
 cdef class BBOFitnessFunctionRealValued(BBOFitnessFunction):
     def __cinit__(self, 
         number_of_variables : int,
-        value_to_reach : float = 0.0
+        value_to_reach : float = 0.0,
+        **kwargs
     ):
         self.number_of_variables = number_of_variables
         self.value_to_reach = value_to_reach