Skip to content

Commit de9b018

Browse files
committed
---
yaml --- r: 104623 b: refs/heads/snap-stage3 c: a871068 h: refs/heads/master i: 104621: 1e0e935 104619: 4554368 104615: 8e78e41 104607: 3d6f2cd v: v3
1 parent 6c17c7e commit de9b018

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 5973b0c4ad26729aa1379b98317479f61cd0d87c
4+
refs/heads/snap-stage3: a871068b472d234e6515d5e979fac4826ec1dac1
55
refs/heads/try: db814977d07bd798feb24f6b74c00800ef458a13
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/stats.rs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#[allow(missing_doc)];
1212

13-
use std::cmp;
1413
use std::hash::Hash;
1514
use std::io;
1615
use std::mem;
@@ -203,12 +202,12 @@ impl<'a> Stats for &'a [f64] {
203202

204203
fn min(self) -> f64 {
205204
assert!(self.len() != 0);
206-
self.iter().fold(self[0], |p,q| cmp::min(p, *q))
205+
self.iter().fold(self[0], |p, q| p.min(*q))
207206
}
208207

209208
fn max(self) -> f64 {
210209
assert!(self.len() != 0);
211-
self.iter().fold(self[0], |p,q| cmp::max(p, *q))
210+
self.iter().fold(self[0], |p, q| p.max(*q))
212211
}
213212

214213
fn mean(self) -> f64 {
@@ -442,6 +441,7 @@ mod tests {
442441
use stats::write_boxplot;
443442
use std::io;
444443
use std::str;
444+
use std::f64;
445445

446446
macro_rules! assert_approx_eq(
447447
($a:expr, $b:expr) => ({
@@ -481,6 +481,14 @@ mod tests {
481481
assert_eq!(summ.iqr, summ2.iqr);
482482
}
483483

484+
#[test]
485+
fn test_min_max_nan() {
486+
let xs = &[1.0, 2.0, f64::NAN, 3.0, 4.0];
487+
let summary = Summary::new(xs);
488+
assert_eq!(summary.min, 1.0);
489+
assert_eq!(summary.max, 4.0);
490+
}
491+
484492
#[test]
485493
fn test_norm2() {
486494
let val = &[

0 commit comments

Comments
 (0)