Bug fix

Author: Tanguy Damart

bluepyopt/deapext/CMA_MO.py

@@ -120,9 +120,7 @@ def __init__(self,
                     'Impossible to use scoop is providing self defined map '
                     'function: %s' % self.map_function)
             from scoop import futures
-            self.toolbox.register("map", futures.map)
-        elif self.map_function:
-            self.toolbox.register("map", self.map_function)
+            self.map_function = futures.map
 
         # Set termination conditions
         self.active = True
@@ -150,9 +148,10 @@ def hyper_volume(self, front):
             ref = ref[idxs]
 
         # Prepare the data and send it to multiprocess
+        to_evaluate = []
         for i in range(len(front)):
             to_evaluate.append([i, numpy.copy(wobj), numpy.copy(ref)])
-        contrib_values = self.toolbox.map(contribution, to_evaluate)
+        contrib_values = self.map_function(contribution, to_evaluate)
 
         return list(contrib_values)
 

bluepyopt/deapext/CMA_SO.py

@@ -104,7 +104,7 @@ def update(self, population):
         """Update the current covariance matrix strategy from the
         population"""
 
-        population.sort(key=lambda ind: ind.fitness.reduce_weight,
+        population.sort(key=lambda ind: ind.fitness.weighted_reduce,
                         reverse=True)
 
         old_centroid = self.centroid

bluepyopt/deapext/optimisations.py

@@ -238,7 +238,7 @@ def run(self,
         else:
             pop = self.toolbox.population(n=offspring_size)
 
-        stats = deap.tools.Statistics(key=lambda ind: ind.fitness.sum)
+        stats = deap.tools.Statistics(key=lambda ind: ind.fitness.reduce)
         import numpy
         stats.register("avg", numpy.mean)
         stats.register("std", numpy.std)

bluepyopt/deapext/optimisationsCMA.py

@@ -168,7 +168,7 @@ def setup_deap(self):
         self.toolbox.register(
             "RandomInd",
             deap.tools.initIterate,
-            functools.partial(WSListIndividual,
+            functools.partial(utils.WSListIndividual,
                               obj_size=self.ind_size,
                               reduce_fcn=self.fitness_reduce),
             self.toolbox.uniformparams)

bluepyopt/deapext/utils.py

@@ -44,10 +44,10 @@ def weighted_reduce(self):
         return self.reduce_fcn(self.wvalues)
 
     def __le__(self, other):
-        return self.weighted_sum <= other.weighted_sum
+        return self.weighted_reduce <= other.weighted_reduce
 
     def __lt__(self, other):
-        return self.weighted_sum < other.weighted_sum
+        return self.weighted_reduce < other.weighted_reduce
 
     def __deepcopy__(self, _):
         """Override deepcopy"""
@@ -73,7 +73,8 @@ def __init__(self, *args, **kwargs):
         self._ps = "p", 0
 
         del kwargs['obj_size']
-        del kwargs['reduce_fcn']
+        if 'reduce_fcn' in kwargs:
+            del kwargs['reduce_fcn']
         super(WSListIndividual, self).__init__(*args, **kwargs)