Return-Path: X-Original-To: apmail-climate-commits-archive@minotaur.apache.org Delivered-To: apmail-climate-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C1CC510307 for ; Fri, 16 Aug 2013 18:07:31 +0000 (UTC) Received: (qmail 19860 invoked by uid 500); 16 Aug 2013 18:07:31 -0000 Delivered-To: apmail-climate-commits-archive@climate.apache.org Received: (qmail 19835 invoked by uid 500); 16 Aug 2013 18:07:29 -0000 Mailing-List: contact commits-help@climate.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@climate.incubator.apache.org Delivered-To: mailing list commits@climate.incubator.apache.org Received: (qmail 19819 invoked by uid 99); 16 Aug 2013 18:07:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Aug 2013 18:07:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Aug 2013 18:07:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 87CEC2388831; Fri, 16 Aug 2013 18:07:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1514828 - /incubator/climate/branches/RefactorInput/ocw/evaluation.py Date: Fri, 16 Aug 2013 18:07:06 -0000 To: commits@climate.incubator.apache.org From: joyce@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130816180706.87CEC2388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: joyce Date: Fri Aug 16 18:07:06 2013 New Revision: 1514828 URL: http://svn.apache.org/r1514828 Log: CLIMATE-258 - Improve Evaluation.run's docstring Modified: incubator/climate/branches/RefactorInput/ocw/evaluation.py Modified: incubator/climate/branches/RefactorInput/ocw/evaluation.py URL: http://svn.apache.org/viewvc/incubator/climate/branches/RefactorInput/ocw/evaluation.py?rev=1514828&r1=1514827&r2=1514828&view=diff ============================================================================== --- incubator/climate/branches/RefactorInput/ocw/evaluation.py (original) +++ incubator/climate/branches/RefactorInput/ocw/evaluation.py Fri Aug 16 18:07:06 2013 @@ -202,7 +202,21 @@ class Evaluation(object): def run(self): - '''Run the evaluation.''' + '''Run the evaluation. + + There are two phases to a run of the Evaluation. First, if there are + any "binary" metrics they are run through the evaluation. Binary + metrics are only run if there is a reference dataset and at least one + target dataset. + + If there is subregion information provided then each dataset is subset + before being run through the binary metrics. + + ..note:: Only the binary metrics are subset with subregion information. + + Next, if there are any "unary" metrics they are run. Unary metrics are + only run if there is at least one target dataset or a reference dataset. + ''' if not self._evaluation_is_valid(): error = "The evaluation is invalid. Check the docs for help." logging.warning(error)