Add tests

Author: Tanguy Damart

bluepyopt/ephys/evaluators.py

@@ -184,17 +184,17 @@ def run_protocols(self, protocols, param_values):
 
     def evaluate_with_dicts(self, param_dict=None, target='scores'):
         """Run evaluation with dict as input and output"""
-        
+
         if target not in ['scores', 'values']:
             raise Exception(
                 'CellEvaluator: target has to be "scores" or "values".')
-            
+
         if self.fitness_calculator is None:
             raise Exception(
                 'CellEvaluator: need fitness_calculator to evaluate')
 
         logger.debug('Evaluating %s', self.cell_model.name)
-    
+
         responses = self.run_protocols(
             self.fitness_protocols.values(),
             param_dict)

bluepyopt/ephys/objectives.py

@@ -75,7 +75,7 @@ def calculate_score(self, responses):
         """Objective score"""
 
         return self.calculate_feature_scores(responses)[0]
-    
+
     def calculate_value(self, responses):
         """Objective value"""
 

bluepyopt/tests/test_ephys/test_evaluators.py

@@ -110,7 +110,11 @@ def test_CellEvaluator_evaluate():
         sim=sim)
 
     responses = protocol.run(cell_model, {'cm': 1.0}, sim=sim)
+
     feature_value = efeature.calculate_feature(responses)
+    feature_value_eva = evaluator.evaluate_with_dicts(
+        {'cm': 1.0}, target='values'
+    )
 
     score = evaluator.evaluate([1.0])
     expected_score = abs(mean - feature_value)
@@ -120,3 +124,6 @@ def test_CellEvaluator_evaluate():
     score_dict = evaluator.objective_dict(score)
 
     nt.assert_almost_equal(score_dict['singleton'], expected_score)
+    nt.assert_almost_equal(
+        feature_value, feature_value_eva['singleton']
+    )

bluepyopt/tests/test_ephys/test_objectives.py

@@ -79,10 +79,12 @@ def test_SingletonObjective():
     responses = {'square_pulse_step1.soma.v': response, }
 
     efeature_value = efeature.calculate_feature(responses)
+    efeature_value_obj = s_obj.calculate_value(responses)
 
     nt.assert_almost_equal(
         s_obj.calculate_score(responses),
         abs(efeature_value - mean))
+    nt.assert_almost_equal(efeature_value_obj, efeature_value)
 
 
 @attr('unit')