Merge branch 'dev'

Author: geoffreyp

moead_framework/algorithm/combinatorial/moead.py

@@ -15,6 +15,7 @@ def __init__(self, problem,
                  weight_file,
                  termination_criteria=None,
                  number_of_crossover_points=2,
+                 mutation_probability=1,
                  mating_pool_selector=None,
                  genetic_operator=None,
                  parent_selector=None,
@@ -39,6 +40,7 @@ def __init__(self, problem,
                          offspring_generator=offspring_generator,
                          weight_file=weight_file)
         self.number_of_crossover_points = number_of_crossover_points
+        self.mutation_probability = mutation_probability
 
         if genetic_operator is None:
             self.genetic_operator = CrossoverAndMutation

moead_framework/core/offspring_generator/offspring_generator.py

@@ -18,8 +18,14 @@ def run(self, population_indexes):
         else:
             crossover_point = None
 
+        if hasattr(self.algorithm, 'mutation_probability'):
+            mutation_probability = self.algorithm.mutation_probability
+        else:
+            mutation_probability = None
+
         y_sol = self.algorithm.genetic_operator(solutions=parents_solutions,
-                                                crossover_points=crossover_point
+                                                crossover_points=crossover_point,
+                                                mutation_probability=mutation_probability
                                                 ).run()
 
         return self.algorithm.problem.generate_solution(array=y_sol)

setup.py

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