Changeset 2720

Timestamp:

Apr 12, 2012, 5:40:00 AM (11 years ago)

Author:

Peter

Message:

ROC: remove a data value. closes #688

Location:

trunk

Files:

• test/roc.cc (modified) (3 diffs)
• yat/statistics/ROC.cc (modified) (3 diffs)
• yat/statistics/ROC.h (modified) (1 diff)

trunk/test/roc.cc

@@ -54 +54 @@
 void test_p_with_weights(test::Suite& suite);
 void test_p_with_weights_and_ties(test::Suite& suite);
+void test_remove(test::Suite& suite);
 void test_ties(test::Suite& suite);
 
@@ -120 +121 @@
   test_empty(suite);
   test_p_with_weights(suite);
+  test_remove(suite);
   return suite.return_value();
 }
@@ -426 +428 @@
   }
 }
+
+void test_remove(test::Suite& suite)
+{
+  using statistics::ROC;
+  ROC roc;
+  roc.add(1, true);
+  roc.add(2, false);
+  ROC roc2(roc);
+  if (!suite.add(suite.equal(roc.area(), roc2.area())))
+    suite.out() << "test_remove failed: copy failed\n";
+  roc.add(2.3, true, 1.2);
+  try {
+    roc.remove(2.3, true, 1.2);
+  }
+  catch (std::runtime_error& e) {
+    suite.add(false);
+    suite.out() << "exception what(): " << e.what() << "\n";
+  }
+  if (!suite.add(suite.equal(roc.area(), roc2.area())))
+    suite.out() << "test remove failed\n";
+  try {
+    roc.remove(2, true);
+    suite.out() << "no exception thrown\n";
+    suite.add(false);
+  }
+  catch (std::runtime_error& e) {
+    suite.add(true);
+  }
+}

trunk/yat/statistics/ROC.cc

@@ -25 +25 @@
 #include "AUC.h"
 
+#include "yat/utility/Exception.h"
+
 #include <gsl/gsl_cdf.h>
 
@@ -31 +33 @@
 #include <cmath>
 #include <limits>
+#include <sstream>
 #include <utility>
 
@@ -226 +229 @@
 
 
+  void ROC::remove(double value, bool target, double weight)
+  {
+    std::pair<Map::iterator, Map::iterator> iter = multimap_.equal_range(value);
+    while (iter.first!=iter.second) {
+      if (iter.first->second.first==target && iter.first->second.first==target){
+        multimap_.erase(iter.first);
+        return;
+      }
+      ++iter.first;
+    }
+    std::stringstream ss;
+    ss << "ROC::remove(" << value << "," << target << "," << weight << "): "
+       << "no such element";
+    throw utility::runtime_error(ss.str());
+  }
+
+
   void ROC::reset(void)
   {

trunk/yat/statistics/ROC.h

@@ -190 +190 @@
     */
     double p_value(void) const;
+
+    /**
+       \brief remove a data value
+
+       A data point with identical \a value, \a target, and \a weight
+       must have beed added prior calling this function; else an
+       exception is thrown.
+
+       \since New in yat 0.9
+     */
+    void remove(double value, bool target, double weight=1.0);
 
     /**