You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@climate.apache.org by jo...@apache.org on 2013/09/10 19:18:26 UTC

svn commit: r1521554 - /incubator/climate/trunk/ocw/evaluation.py

Author: joyce
Date: Tue Sep 10 17:18:26 2013
New Revision: 1521554

URL: http://svn.apache.org/r1521554
Log:
CLIMATE-291 - Update Evaluation imports and unary check

Modified:
    incubator/climate/trunk/ocw/evaluation.py

Modified: incubator/climate/trunk/ocw/evaluation.py
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/ocw/evaluation.py?rev=1521554&r1=1521553&r2=1521554&view=diff
==============================================================================
--- incubator/climate/trunk/ocw/evaluation.py (original)
+++ incubator/climate/trunk/ocw/evaluation.py Tue Sep 10 17:18:26 2013
@@ -21,7 +21,7 @@ Classes: 
 '''
 
 import logging
-from metrics import Metric
+from metrics import Metric, UnaryMetric, BinaryMetric
 from dataset import Dataset, Bounds
 import ocw.dataset_processor as DSP
 
@@ -181,7 +181,7 @@ class Evaluation(object):
             logging.error(error)
             raise TypeError(error)
 
-        if metric.is_unary:
+        if isinstance(metric, UnaryMetric):
             self.unary_metrics.append(metric)
         else:
             self.metrics.append(metric)