Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 66 additions & 1 deletion src/libextra/stats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use std::cmp;
use std::hashmap;
use std::io;
use std::num;
use std::util;

// NB: this can probably be rewritten in terms of num::Num
// to be less f64-specific.
Expand All @@ -23,6 +24,12 @@ use std::num;
pub trait Stats {

/// Sum of the samples.
///
/// Note: this method sacrifices performance at the altar of accuracy
/// Depends on IEEE-754 arithmetic guarantees. See proof of correctness at:
/// ["Adaptive Precision Floating-Point Arithmetic and Fast Robust Geometric Predicates"]
/// (http://www.cs.cmu.edu/~quake-papers/robust-arithmetic.ps)
/// *Discrete & Computational Geometry 18*, 3 (Oct 1997), 305-363, Shewchuk J.R.
fn sum(self) -> f64;

/// Minimum value of the samples.
Expand Down Expand Up @@ -147,8 +154,37 @@ impl Summary {

impl<'self> Stats for &'self [f64] {

// FIXME #11059 handle NaN, inf and overflow
fn sum(self) -> f64 {
self.iter().fold(0.0, |p,q| p + *q)
let mut partials : ~[f64] = ~[];

for &mut x in self.iter() {
let mut j = 0;
// This inner loop applies `hi`/`lo` summation to each
// partial so that the list of partial sums remains exact.
for i in range(0, partials.len()) {
let mut y = partials[i];
if num::abs(x) < num::abs(y) {
util::swap(&mut x, &mut y);
}
// Rounded `x+y` is stored in `hi` with round-off stored in
// `lo`. Together `hi+lo` are exactly equal to `x+y`.
let hi = x + y;
let lo = y - (hi - x);
if lo != 0f64 {
partials[j] = lo;
j += 1;
}
x = hi;
}
if j >= partials.len() {
partials.push(x);
} else {
partials[j] = x;
partials.truncate(j+1);
}
}
partials.iter().fold(0.0, |p, q| p + *q)
}

fn min(self) -> f64 {
Expand Down Expand Up @@ -955,5 +991,34 @@ mod tests {
t(&Summary::new([-2.0, 0.0]), ~"-2 |[------******#******---]| 0");

}
#[test]
fn test_sum_f64s() {
assert_eq!([0.5, 3.2321, 1.5678].sum(), 5.2999);
}
#[test]
fn test_sum_f64_between_ints_that_sum_to_0() {
assert_eq!([1e30, 1.2, -1e30].sum(), 1.2);
}
}

#[cfg(test)]
mod bench {
use extra::test::BenchHarness;
use std::vec;

#[bench]
fn sum_three_items(bh: &mut BenchHarness) {
bh.iter(|| {
[1e20, 1.5, -1e20].sum();
})
}
#[bench]
fn sum_many_f64(bh: &mut BenchHarness) {
let nums = [-1e30, 1e60, 1e30, 1.0, -1e60];
let v = vec::from_fn(500, |i| nums[i%5]);

bh.iter(|| {
v.sum();
})
}
}