Changeset 2548

Timestamp:

Aug 7, 2011, 6:36:44 PM (11 years ago)

Author:

Peter

Message:

avoid crash. return nan when area is nan. fixes #669

Location:

branches/0.7-stable

Files:

• test/roc.cc (modified) (3 diffs)
• yat/statistics/ROC.cc (modified) (4 diffs)

branches/0.7-stable/test/roc.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2011 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -34 +35 @@
 
 using namespace theplu::yat;
+
+void test_empty(test::Suite&);
 
 int main(int argc, char* argv[])
@@ -92 +95 @@
   classifier::DataLookupWeighted1D dlw(target.size(),1.3);
   add(roc, dlw.begin(), dlw.end(), target);
+  test_empty(suite);
 
   return suite.return_value();
 }
+
+void test_empty(test::Suite& suite)
+{
+  suite.out() << "test empty\n";
+  // testing buf #669
+  statistics::ROC roc;
+  roc.p_value();
+  roc.area();
+}

branches/0.7-stable/yat/statistics/ROC.cc

@@ -4 +4 @@
   Copyright (C) 2004, 2005 Peter Johansson
   Copyright (C) 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2011 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -30 +31 @@
 #include <gsl/gsl_cdf.h>
 
+#include <cassert>
 #include <cmath>
+#include <limits>
 #include <utility>
 #include <vector>
@@ -94 +97 @@
     if (block > nof_neg*nof_pos)
       return 0.0;
+    assert(nof_pos>0);
+    assert(nof_neg>0);
     double p1 = get_p_exact(block-nof_neg, nof_pos-1, nof_neg);
     double p2 = get_p_exact(block, nof_pos, nof_neg-1);
@@ -143 +148 @@
       area = auc.score(multimap_);
     }
+    if (std::isnan(area))
+      return std::numeric_limits<double>::quiet_NaN();
     if (n_pos() < minimum_size_ && n_neg() < minimum_size_) {
       // for small areas we calculate probabilitu to get larger area -