Added tests, fix stopping criteria

Author: damart

.idea/.gitignore

@@ -234,5 +234,5 @@ def check_termination(self, ngen):
         for c in self.stopping_conditions:
             if c.criteria_met:
                 logger.info('CMA stopped because of termination criteria: ' +
-                            ' '.join(type(c).__name__))
+                            ' '.join(c.name))
                 self.active = False

.idea/BluePyOpt.iml

@@ -183,5 +183,5 @@ def check_termination(self, ngen):
         for c in self.stopping_conditions:
             if c.criteria_met:
                 logger.info('CMA stopped because of termination criteria: ' +
-                            ' '.join(type(c).__name__))
+                            ' '.join(c.name))
                 self.active = False

.idea/inspectionProfiles/profiles_settings.xml

@@ -44,6 +44,7 @@ def check(self, kwargs):
 
 class Stagnation(StoppingCriteria):
     """Stagnation stopping criteria class"""
+    name = "Stagnation"
 
     def __init__(self, lambda_, problem_size):
         """Constructor"""
@@ -79,6 +80,7 @@ def check(self, kwargs):
 
 class TolHistFun(StoppingCriteria):
     """TolHistFun stopping criteria class"""
+    name = "TolHistFun"
 
     def __init__(self, lambda_, problem_size):
         """Constructor"""
@@ -100,6 +102,7 @@ def check(self, kwargs):
 
 class EqualFunVals(StoppingCriteria):
     """EqualFunVals stopping criteria class"""
+    name = "EqualFunVals"
 
     def __init__(self, lambda_, problem_size):
         """Constructor"""
@@ -130,6 +133,7 @@ def check(self, kwargs):
 
 class TolX(StoppingCriteria):
     """TolX stopping criteria class"""
+    name = "TolX"
 
     def __init__(self):
         """Constructor"""
@@ -148,6 +152,7 @@ def check(self, kwargs):
 
 class TolUpSigma(StoppingCriteria):
     """TolUpSigma stopping criteria class"""
+    name = "TolUpSigma"
 
     def __init__(self, sigma0):
         """Constructor"""
@@ -166,6 +171,7 @@ def check(self, kwargs):
 
 class ConditionCov(StoppingCriteria):
     """ConditionCov stopping criteria class"""
+    name = "ConditionCov"
 
     def __init__(self):
         """Constructor"""
@@ -183,6 +189,7 @@ def check(self, kwargs):
 
 class NoEffectAxis(StoppingCriteria):
     """NoEffectAxis stopping criteria class"""
+    name = "NoEffectAxis"
 
     def __init__(self, problem_size):
         """Constructor"""
@@ -207,6 +214,7 @@ def check(self, kwargs):
 
 class NoEffectCoor(StoppingCriteria):
     """NoEffectCoor stopping criteria class"""
+    name = "NoEffectCoor"
 
     def __init__(self):
         """Constructor"""

.idea/misc.xml

@@ -0,0 +1,42 @@
+"""bluepyopt.optimisationsCMA tests"""
+
+import nose.tools as nt
+
+import bluepyopt.optimisations
+import bluepyopt.ephys.examples as examples
+
+from nose.plugins.attrib import attr
+
+
+@attr('unit')
+def test_optimisationsCMA_normspace():
+    "deapext.optimisationsCMA: Testing optimisationsCMA normspace"
+
+    evaluator = examples.simplecell.cell_evaluator
+    optimisation = bluepyopt.deapext.optimisationsCMA.DEAPOptimisationCMA(
+        evaluator=evaluator)
+
+    x = [n*0.1 for n in range(len(evaluator.params))]
+    y = [f2(f1(_)) for _,f1,f2 in zip(x, optimisation.to_norm,
+                                      optimisation.to_space)]
+    for a, b in zip(x, y):
+        nt.assert_almost_equal(a, b)
+
+@attr('unit')
+def test_optimisationsCMA_run():
+    "deapext.optimisationsCMA: Testing optimisationsCMA run from centroid"
+
+    evaluator = examples.simplecell.cell_evaluator
+    x = [n * 0.1 for n in range(len(evaluator.params))]
+
+    try:
+        optimisation = bluepyopt.deapext.optimisationsCMA.DEAPOptimisationCMA(
+                                                            evaluator=evaluator,
+                                                            centroids=[x])
+
+        pop, hof, log, hist = optimisation.run(max_ngen=1)
+        raised = False
+    except:
+        raised = True
+
+    nt.assert_equal(raised, False)