Changed error handling in compute_score

scidash · Mar 9, 2018 · 1b8c243 · 1b8c243
1 parent bf920b5
commit 1b8c243
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/sciunit/tests.py b/sciunit/tests.py
@@ -107,15 +107,15 @@ def compute_score(self, observation, prediction):
         No default implementation.
         """
 
-        try:
-            # After some processing of the observation and the prediction.  
-            score = self.score_type.compute(observation,prediction) 
-            return score
-        except:
-            raise NotImplementedError(("Test %s either implements no "
+        if not hasattr(self,'score_type') or \
+           not hasattr(self.score_type,'compute'):
+           raise NotImplementedError(("Test %s either implements no "
                                        "compute_score method or provides no "
                                        "score_type with a compute method.") \
                                        % self.name)
+        # After some processing of the observation and the prediction.  
+        score = self.score_type.compute(observation,prediction) 
+        return score    
 
     def _bind_score(self,score,model,observation,prediction):
         """