Changeset 933 for trunk/yat/statistics

Timestamp:

Oct 5, 2007, 11:15:07 PM (16 years ago)

Author:

Peter

Message:

mad function now takes iterators

Location:

trunk/yat/statistics

Files:

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

trunk/yat/statistics/utility.cc

@@ -48 +48 @@
   }
 
-  double mad(const utility::vector& vec, const bool sorted)
-  {
-    double m = median(vec.begin(), vec.end(), sorted);
-    std::vector<double> ad;
-    ad.reserve(vec.size());
-    for (size_t i = 0; i<vec.size(); ++i)
-      ad.push_back(fabs(vec[i]-m));
-    std::sort(ad.begin(), ad.end());
-    return median(ad.begin(), ad.end(),true);
-  }
-  
 
   double skewness(const utility::vector& v)

trunk/yat/statistics/utility.h

@@ -104 +104 @@
   /// @brief Median absolute deviation from median
   ///
+  /// Function is non-mutable function
+  ///
   template <class T>
-  double mad(const std::vector<T>& vec, const bool sorted=false)
+  double mad(T first, T last, const bool sorted=false)
   {
-    double m = median(vec, sorted);
+    double m = median(first, last, sorted);
     std::vector<double> ad;
-    ad.reserve(vec.size());
-    for (size_t i = 0; i<vec.size(); ++i)
-      ad.push_back(fabs(vec[i]-m));
+    ad.reserve(std::distance(first, last));
+    for( ; first!=last; ++first)
+      ad.push_back(fabs(*first-m));
     std::sort(ad.begin(), ad.end());
-    return median(ad.begin(), ad.end(),true);
+    return median(ad.begin(), ad.end(), true);
   }
-  
-
-  ///
-  /// @brief Median absolute deviation from median
-  ///
-  double mad(const utility::vector& vec, const bool sorted=false);
   
 
@@ -130 +126 @@
   /// used to calculate the median.
   ///
+  /// Function is a non-mutable function, i.e., \a first and \a last
+  /// can be const_iterators.
+  ///
   /// Requirements: T should be an iterator over a range of doubles (or
-  /// any type being convertable to double). If \a sorted is false
-  /// iterator must be mutable, else read-only iterator is also ok.
+  /// any type being convertable to double). 
   ///
   /// @return median of range
@@ -151 +149 @@
      and then used to calculate the median.
 
+     Function is a non-mutable function, i.e., \a first and \a last
+     can be const_iterators.
+     
      Requirements: T should be an iterator over a range of doubles (or
      any type being convertable to double). If \a sorted is false