Merge branch 'dev'

Author: geoffreyp

moead_framework/algorithm/abstract_moead.py

@@ -17,6 +17,7 @@ def __init__(self, problem, max_evaluation, number_of_objective, number_of_weigh
                  parent_selector=None,
                  mating_pool_selector=None,
                  sps_strategy=None,
+                 offspring_generator=None,
                  weight_file=None):
         self.problem = problem
         self.aggregation_function = aggregation_function()
@@ -50,7 +51,11 @@ def __init__(self, problem, max_evaluation, number_of_objective, number_of_weigh
 
         self.genetic_operator = genetic_operator
         self.parent_selector = parent_selector
-        self.offspring_generator = OffspringGeneratorGeneric(algorithm_instance=self)
+
+        if offspring_generator is None:
+            self.offspring_generator = OffspringGeneratorGeneric(algorithm_instance=self)
+        else:
+            self.offspring_generator = offspring_generator
 
     @abstractmethod
     def run(self, checkpoint=None):

moead_framework/algorithm/combinatorial/moead.py

@@ -18,6 +18,7 @@ def __init__(self, problem,
                  genetic_operator=None,
                  parent_selector=None,
                  sps_strategy=None,
+                 offspring_generator=None,
                  weight_file=None):
 
         self.current_eval = 1
@@ -34,6 +35,7 @@ def __init__(self, problem,
                          mating_pool_selector=mating_pool_selector,
                          parent_selector=parent_selector,
                          sps_strategy=sps_strategy,
+                         offspring_generator=offspring_generator,
                          weight_file=weight_file)
         self.number_of_crossover_points = number_of_crossover_points
 

moead_framework/algorithm/numerical/moead.py

@@ -18,6 +18,7 @@ def __init__(self, problem,
                  genetic_operator=None,
                  parent_selector=None,
                  sps_strategy=None,
+                 offspring_generator=None,
                  weight_file=None):
 
         self.current_eval = 1
@@ -34,6 +35,7 @@ def __init__(self, problem,
                          mating_pool_selector=mating_pool_selector,
                          parent_selector=parent_selector,
                          sps_strategy=sps_strategy,
+                         offspring_generator=offspring_generator,
                          weight_file=weight_file)
 
         if genetic_operator is None:

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="moead-framework",
-    version="0.5.1",
+    version="0.5.2",
     author="Geoffrey Pruvost",
     author_email="geoffrey@pruvost.xyz",
     description="MOEA/D Framework in Python 3",