Skip to content

Make argmin/max_skipnan use EmptyInput error type #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2019
Merged

Make argmin/max_skipnan use EmptyInput error type #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/quantile/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ where

/// Finds the index of the minimum value of the array skipping NaN values.
///
/// Returns `Err(MinMaxError::EmptyInput)` if the array is empty or none of the values in the array
/// Returns `Err(EmptyInput)` if the array is empty or none of the values in the array
/// are non-NaN values.
///
/// Even if there are multiple (equal) elements that are minima, only one
Expand All @@ -65,7 +65,7 @@ where
/// [2., 0., 6.]];
/// assert_eq!(a.argmin_skipnan(), Ok((1, 1)));
/// ```
fn argmin_skipnan(&self) -> Result<D::Pattern, MinMaxError>
fn argmin_skipnan(&self) -> Result<D::Pattern, EmptyInput>
where
A: MaybeNan,
A::NotNan: Ord;
Expand Down Expand Up @@ -130,7 +130,7 @@ where

/// Finds the index of the maximum value of the array skipping NaN values.
///
/// Returns `Err(MinMaxError::EmptyInput)` if the array is empty or none of the values in the array
/// Returns `Err(EmptyInput)` if the array is empty or none of the values in the array
/// are non-NaN values.
///
/// Even if there are multiple (equal) elements that are maxima, only one
Expand All @@ -150,7 +150,7 @@ where
/// [2., 0., 6.]];
/// assert_eq!(a.argmax_skipnan(), Ok((1, 2)));
/// ```
fn argmax_skipnan(&self) -> Result<D::Pattern, MinMaxError>
fn argmax_skipnan(&self) -> Result<D::Pattern, EmptyInput>
where
A: MaybeNan,
A::NotNan: Ord;
Expand Down Expand Up @@ -319,7 +319,7 @@ where
Ok(current_pattern_min)
}

fn argmin_skipnan(&self) -> Result<D::Pattern, MinMaxError>
fn argmin_skipnan(&self) -> Result<D::Pattern, EmptyInput>
where
A: MaybeNan,
A::NotNan: Ord,
Expand All @@ -337,7 +337,7 @@ where
if min.is_some() {
Ok(pattern_min)
} else {
Err(MinMaxError::EmptyInput)
Err(EmptyInput)
}
}

Expand Down Expand Up @@ -386,7 +386,7 @@ where
Ok(current_pattern_max)
}

fn argmax_skipnan(&self) -> Result<D::Pattern, MinMaxError>
fn argmax_skipnan(&self) -> Result<D::Pattern, EmptyInput>
where
A: MaybeNan,
A::NotNan: Ord,
Expand All @@ -404,7 +404,7 @@ where
if max.is_some() {
Ok(pattern_max)
} else {
Err(MinMaxError::EmptyInput)
Err(EmptyInput)
}
}

Expand Down
14 changes: 7 additions & 7 deletions tests/quantile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use itertools::izip;
use ndarray::array;
use ndarray::prelude::*;
use ndarray_stats::{
errors::{MinMaxError, QuantileError},
errors::{EmptyInput, MinMaxError, QuantileError},
interpolate::{Higher, Interpolate, Linear, Lower, Midpoint, Nearest},
Quantile1dExt, QuantileExt,
};
Expand Down Expand Up @@ -51,10 +51,10 @@ fn test_argmin_skipnan() {
assert_eq!(a.argmin_skipnan(), Ok((1, 0)));

let a: Array2<f64> = array![[], []];
assert_eq!(a.argmin_skipnan(), Err(MinMaxError::EmptyInput));
assert_eq!(a.argmin_skipnan(), Err(EmptyInput));

let a = arr2(&[[::std::f64::NAN; 2]; 2]);
assert_eq!(a.argmin_skipnan(), Err(MinMaxError::EmptyInput));
assert_eq!(a.argmin_skipnan(), Err(EmptyInput));
}

quickcheck! {
Expand All @@ -63,7 +63,7 @@ quickcheck! {
let min = a.min_skipnan();
let argmin = a.argmin_skipnan();
if min.is_none() {
argmin == Err(MinMaxError::EmptyInput)
argmin == Err(EmptyInput)
} else {
a[argmin.unwrap()] == *min
}
Expand Down Expand Up @@ -134,10 +134,10 @@ fn test_argmax_skipnan() {
assert_eq!(a.argmax_skipnan(), Ok((1, 2)));

let a: Array2<f64> = array![[], []];
assert_eq!(a.argmax_skipnan(), Err(MinMaxError::EmptyInput));
assert_eq!(a.argmax_skipnan(), Err(EmptyInput));

let a = arr2(&[[::std::f64::NAN; 2]; 2]);
assert_eq!(a.argmax_skipnan(), Err(MinMaxError::EmptyInput));
assert_eq!(a.argmax_skipnan(), Err(EmptyInput));
}

quickcheck! {
Expand All @@ -146,7 +146,7 @@ quickcheck! {
let max = a.max_skipnan();
let argmax = a.argmax_skipnan();
if max.is_none() {
argmax == Err(MinMaxError::EmptyInput)
argmax == Err(EmptyInput)
} else {
a[argmax.unwrap()] == *max
}
Expand Down