Changeset 2736

Timestamp:

May 29, 2012, 12:06:01 PM (11 years ago)

Author:

Peter

Message:

fixes #702

Location:

trunk

Files:

• test/roc.cc (modified) (2 diffs)
• yat/statistics/ROC.h (modified) (7 diffs)

trunk/test/roc.cc

@@ -350 +350 @@
   }
   double p_value = roc.p_value_one_sided();
-  roc.p_value_one_sided();
   if (!suite.add(suite.equal(p_value, static_cast<double>(k)/perm))) {
     suite.out() << "area: " << roc.area() << "\n"
@@ -404 +403 @@
   statistics::Averager averager;
   for (size_t i=1; i<=perm; ++i) {
-    random::random_shuffle(x.begin(), x.end());
+    theplu::yat::random::random_shuffle(x.begin(), x.end());
     statistics::ROC roc2;
     for (size_t j=0; j<x.size(); ++j)

trunk/yat/statistics/ROC.h

@@ -31 +31 @@
 #include <gsl/gsl_randist.h>
 
+#include <algorithm>
 #include <map>
 #include <utility>
+#include <vector>
 
 namespace theplu {
@@ -209 +211 @@
   private:
     typedef std::multimap<double, std::pair<bool, double> > Map;
+    typedef std::vector<std::pair<bool, Map::mapped_type> > Vector;
 
     // struct used in count functions
@@ -260 +263 @@
      */
     template <typename Iterator>
-    double count(Map& weights, Iterator iter, Iterator last,
+    double count(Vector& weights, Iterator iter, Iterator last,
                  double threshold, double sum, const Weights& weight) const;
 
@@ -269 +272 @@
      */
     template <typename Iterator>
-    double count(Map& weights, Iterator iter, Iterator last,
+    double count(Vector& weights, Iterator iter, Iterator last,
                  double threshold, double sum, Weights weight,
                  const std::pair<bool, double>& entry) const;
@@ -352 +355 @@
   double ROC::count(Iterator first, Iterator last, double threshold) const
   {
-    Map map(multimap_);
+    Vector vec;
+    vec.reserve(multimap_.size());
+    // copy values from multimap_ to v
+    for (Map::const_iterator i = multimap_.begin(); i!=multimap_.end(); ++i)
+      vec.push_back(std::make_pair(false, i->second));
+
     ROC::Weights w;
     w.small_pos = pos_weights_.sum_x();
     w.small_neg = neg_weights_.sum_x();
-    return count(map, first, last, threshold*w.small_pos*w.small_neg, 0, w);
+    return count(vec, first, last, threshold*w.small_pos*w.small_neg, 0, w);
   }
 
@@ -362 +370 @@
 
   template <typename Iterator>
-  double ROC::count(Map& weights, Iterator iter, Iterator last,
+  double ROC::count(ROC::Vector& v, Iterator iter, Iterator last,
                     double threshold, double sum, const Weights& w) const
   {
     double result = 0.0;
     // loop over all elements
-    for (Map::iterator i=weights.begin(); i!=weights.end(); ++i) {
-      Map::value_type save = *i;
-      Map::iterator hint = i;
-      ++hint;
-      weights.erase(i);
-      result += count(weights, iter, last, threshold, sum, w, save.second);
-      i = weights.insert(hint, save);
-    }
-    YAT_ASSERT(weights.size());
-    return result/weights.size();
+    int nof_elements = 0;
+    for (ROC::Vector::iterator i=v.begin(); i!=v.end(); ++i) {
+      if (i->first)
+        continue;
+      i->first = true;
+      result += count(v, iter, last, threshold, sum, w, i->second);
+      i->first = false;
+      ++nof_elements;
+    }
+    YAT_ASSERT(nof_elements);
+    return result/nof_elements;
   }
 
+
   template <typename Iterator>
-  double ROC::count(Map& weights, Iterator iter, Iterator last,
+  double ROC::count(Vector& weights, Iterator iter, Iterator last,
                     double threshold, double sum, Weights w,
                     const std::pair<bool, double>& entry) const
@@ -387 +397 @@
 
     Iterator next(iter);
+    YAT_ASSERT(next!=last);
     ++next;