andreacavalli/rust-average
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/vks/average

Browse Source
This commit is contained in:
Vinzent Steinberg 2017-11-19 10:13:41 +01:00
commit 6568725139
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/quantile.rs
View File

@ -1,7 +1,7 @@
use core;
use core::cmp::min;
use conv::{ApproxFrom, ConvAsUtil, ValueFrom};
use conv::{ApproxFrom, ConvAsUtil, ConvUtil, ValueFrom};
use quickersort::sort_floats;
use super::Estimate;
@ -83,7 +83,7 @@ impl Quantile {
];
let len = usize::value_from(self.len()).unwrap(); // < 5
sort_floats(&mut heights[..len]);
let desired_index = f64::approx_from(len).unwrap() * self.p() - 1.;
let desired_index = ConvUtil::approx_as::<f64>(len).unwrap() * self.p() - 1.;
let mut index = desired_index.ceil();
if desired_index == index && index >= 0. {
let index: usize = index.approx().unwrap(); // < 5
@ -170,7 +170,8 @@ impl Estimate for Quantile {
} else {
self.q[i] = self.linear(i, d);
}
self.n[i] += d.approx().unwrap(); // d == +-1
let delta: i64 = d.approx().unwrap(); // d == +-1
self.n[i] += delta;
}
}
}