Changeset 117

Timestamp:

Jul 19, 2004, 5:09:14 PM (18 years ago)

Author:

Peter

Message:

modified to take vector<size_t>

Location:

trunk/src

Files:

• Statistics.cc (modified) (3 diffs)
• Statistics.h (modified) (1 diff)

trunk/src/Statistics.cc

@@ -25 +25 @@
   }
 
+  double Statistics::median(std::vector<size_t>& vec) 
+  {
+    return percentile(vec, 50.0);
+  }
+
   double Statistics::percentile(std::vector<double>& vec, double percentile) 
   {
@@ -35 +40 @@
     if (k<.500000000001 && k>.499999999999){
       int i = static_cast<int>(j+0.5);
-      double r = (vec[i]+vec[i-1])/2;
-      
-      return r;
-      //return (vec[i]+vec[i-1])/2;
+      return (vec[i]+vec[i-1])/2;
     }
     else{
@@ -47 +49 @@
   }
 
+  double Statistics::percentile(std::vector<size_t>& vec, double percentile) 
+  {
+    sort(vec.begin(), vec.end());
+    double j = percentile/100 * vec.size();
+    if (percentile==100)
+      return vec[vec.size()-1];   
+    
+    double k = j + 0.5 - static_cast<int> (j+0.5);
+    if (k<.500000000001 && k>.499999999999){
+      int i = static_cast<int>(j+0.5);
+      double r = static_cast<double>(vec[i]+vec[i-1])/2;
+      return r;
+      
+    }
+    else{
+      int i = static_cast<int>(j);
+      return  static_cast<double>(vec[i]);
+    }
+    
+  }
+
 
 }} // of namespace cpptools and namespace theplu

trunk/src/Statistics.h

@@ -31 +31 @@
     double median(std::vector<double>&);  
 
+    ///
+    /// @return median
+    ///
+    double median(std::vector<size_t>&);  
+
     ///
     /// @return \a i'th percentile
     ///
     double percentile(std::vector<double>&, double i);
+
+    ///
+    /// @return \a i'th percentile
+    ///
+    double percentile(std::vector<size_t>&, double i);
 
   private: