Add parameter names to the pickle files

Author: Tanguy Pierre Louis Damart

bluepyopt/deapext/algorithms.py

@@ -94,7 +94,8 @@ def eaAlphaMuPlusLambdaCheckpoint(
         cp_frequency=1,
         cp_filename=None,
         continue_cp=False,
-        terminator=None):
+        terminator=None,
+        param_names=None):
     r"""This is the :math:`(~\alpha,\mu~,~\lambda)` evolutionary algorithm
 
     Args:
@@ -111,8 +112,12 @@ def eaAlphaMuPlusLambdaCheckpoint(
         continue_cp(bool): whether to continue
         terminator (multiprocessing.Event): exit loop when is set.
             Not taken into account if None.
+        param_names(list): names of the parameters optimized by the evaluator
     """
 
+    if param_names is None:
+        param_names = []
+
     if cp_filename:
         cp_filename_tmp = cp_filename + '.tmp'
 
@@ -178,7 +183,8 @@ def eaAlphaMuPlusLambdaCheckpoint(
                       halloffame=halloffame,
                       history=history,
                       logbook=logbook,
-                      rndstate=random.getstate())
+                      rndstate=random.getstate(),
+                      param_names=param_names)
             pickle.dump(cp, open(cp_filename_tmp, "wb"))
             if os.path.isfile(cp_filename_tmp):
                 shutil.copy(cp_filename_tmp, cp_filename)

bluepyopt/deapext/optimisations.py

@@ -297,6 +297,10 @@ def run(self,
         stats.register("min", numpy.min)
         stats.register("max", numpy.max)
 
+        param_names = []
+        if hasattr(self.evaluator, "param_names"):
+            param_names = self.evaluator.param_names
+
         pop, hof, log, history = algorithms.eaAlphaMuPlusLambdaCheckpoint(
             pop,
             self.toolbox,
@@ -309,7 +313,8 @@ def run(self,
             cp_frequency=cp_frequency,
             continue_cp=continue_cp,
             cp_filename=cp_filename,
-            terminator=terminator)
+            terminator=terminator,
+            param_names=param_names)
 
         # Update hall of fame
         self.hof = hof

bluepyopt/deapext/optimisationsCMA.py

@@ -297,6 +297,10 @@ def run(
 
         pop = CMA_es.get_population(self.to_space)
 
+        param_names = []
+        if hasattr(self.evaluator, "param_names"):
+            param_names = self.evaluator.param_names
+
         # Run until a termination criteria is met
         while utils.run_next_gen(CMA_es.active, terminator):
             logger.info("Generation {}".format(gen))
@@ -347,6 +351,7 @@ def run(
                     rndstate=random.getstate(),
                     np_rndstate=numpy.random.get_state(),
                     CMA_es=CMA_es,
+                    param_names=param_names,
                 )
                 pickle.dump(cp, open(cp_filename_tmp, "wb"))
                 if os.path.isfile(cp_filename_tmp):