Changeset 2444 for branches/0.7-stable

Timestamp:

Mar 19, 2011, 12:30:51 AM (12 years ago)

Author:

Peter

Message:

fixes #660

Location:

branches/0.7-stable

Files:

• test/statistics.cc (modified) (3 diffs)
• yat/statistics/Percentiler.h (modified) (2 diffs)

branches/0.7-stable/test/statistics.cc

@@ -46 +46 @@
 void test_mad(test::Suite&);
 
+void test_median_empty(test::Suite&);
 void test_percentiler(test::Suite&);
 void test_percentiler_nan(test::Suite&);
@@ -124 +125 @@
             
   }
+  test_median_empty(suite);
   return suite.return_value();
 }
@@ -150 +152 @@
             boost::random_access_iterator_archetype<utility::DataWeight>());
   }
+}
+
+
+// test for ticket #660
+void test_median_empty(test::Suite& suite)
+{
+  std::vector<double> x;
+  double m = 0;
+  m = statistics::median(x.begin(), x.end(), true);
 }
 

branches/0.7-stable/yat/statistics/Percentiler.h

@@ -34 +34 @@
 #include <algorithm>
 #include <cmath>
+#include <limits>
 #include <numeric>
 #include <stdexcept>
@@ -99 +100 @@
       BOOST_CONCEPT_ASSERT((boost::RandomAccessIterator<RandomAccessIterator>));
       BOOST_CONCEPT_ASSERT((utility::DataIteratorConcept<RandomAccessIterator>));
+      if (first==last)
+        return std::numeric_limits<double>::quiet_NaN();
       return calculate(first, last, sorted_, 
        typename utility::weighted_iterator_traits<RandomAccessIterator>::type());