Changeset 1039

Timestamp:

Feb 6, 2008, 1:20:31 AM (16 years ago)

Author:

Peter

Message:

fixes #276

Location:

trunk

Files:

• test/statistics_test.cc (modified) (1 diff)
• yat/statistics/utility.h (modified) (1 diff)

trunk/test/statistics_test.cc

@@ -46 +46 @@
   if (m!=4.5 || m!=m_gsl)
     return -1;
+  statistics::percentile(data.begin(), data.end(), 100);
+  data.resize(1);
+  statistics::median(data.begin(), data.end());
 
   double tolerance=1e-10;

trunk/yat/statistics/utility.h

@@ -181 +181 @@
     std::copy(first, last, std::back_inserter(v_copy));
     double j = p/100 * (v_copy.size()-1);
-    int i = static_cast<int>(j);
-    std::partial_sort(v_copy.begin(),v_copy.begin()+i+2 , v_copy.end());
+    size_t i = static_cast<size_t>(j);
+    if (i+2 < v_copy.size()) {
+      utility::yat_assert<std::out_of_range>(i+2 < v_copy.size(), 
+                                             "in utility::percentile");
+      std::partial_sort(v_copy.begin(), v_copy.begin()+i+2, v_copy.end());
+    }
+    else
+      std::sort(v_copy.begin(), v_copy.end());
+      
     return percentile(v_copy.begin(), v_copy.end(), p, true);
   }