Skip to content

Commit

Permalink
refactor(rad): rename ModeEmpty by EmptyArray
Browse files Browse the repository at this point in the history
  • Loading branch information
lrubiorod committed Sep 1, 2021
1 parent 294e070 commit f620bc2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion rad/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ pub enum RadError {
ModeTie { values: RadonArray, max_count: u16 },
/// Tried to apply mod reducer on an empty array
#[fail(display = "Tried to apply mode reducer on an empty array")]
ModeEmpty,
EmptyArray,
/// The given arguments are not valid for the given operator
#[fail(
display = "Wrong `{}::{}()` arguments: `{:?}`",
Expand Down
2 changes: 1 addition & 1 deletion rad/src/filters/mode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ mod tests {
#[test]
fn test_filter_mode_empty() {
let input = vec![];
let expected = RadError::ModeEmpty;
let expected = RadError::EmptyArray;

let mut ctx = ReportContext {
stage: Stage::Tally(TallyMetaData::default()),
Expand Down
12 changes: 6 additions & 6 deletions rad/src/reducers/median.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub fn median(input: &RadonArray) -> Result<RadonTypes, RadError> {
let value_len = value.len();

match value.first() {
None => Err(RadError::ModeEmpty),
None => Err(RadError::EmptyArray),
Some(RadonTypes::Float(_)) => {
// Collect non-NaN values into a vector, and sort them
let mut input_not_nan: Vec<NotNan<f64>> = Vec::with_capacity(value_len);
Expand All @@ -44,7 +44,7 @@ pub fn median(input: &RadonArray) -> Result<RadonTypes, RadError> {

if input_not_nan.is_empty() {
// This can happen if all elements are NaN
Err(RadError::ModeEmpty)
Err(RadError::EmptyArray)
} else if input_not_nan.len() % 2 == 1 {
// Odd number of elements: take element at floor(N/2):
let median_pos = input_not_nan.len() / 2;
Expand Down Expand Up @@ -77,7 +77,7 @@ pub fn median(input: &RadonArray) -> Result<RadonTypes, RadError> {

if sorted_input.is_empty() {
// This is unreachable
Err(RadError::ModeEmpty)
Err(RadError::EmptyArray)
} else if sorted_input.len() % 2 == 1 {
// Odd number of elements: take element at floor(N/2):
let median_pos = sorted_input.len() / 2;
Expand Down Expand Up @@ -111,14 +111,14 @@ mod tests {

use crate::{
types::{float::RadonFloat, integer::RadonInteger, string::RadonString},
RadError::ModeEmpty,
RadError::EmptyArray,
};

#[test]
fn test_operate_reduce_median_empty() {
let input = RadonArray::from(vec![]);
let output = median(&input).unwrap_err();
let expected_error = ModeEmpty;
let expected_error = EmptyArray;
assert_eq!(output, expected_error);
}

Expand Down Expand Up @@ -167,7 +167,7 @@ mod tests {
]);

let output = median(&input).unwrap_err();
let expected_error = ModeEmpty;
let expected_error = EmptyArray;
assert_eq!(output, expected_error);
}

Expand Down
6 changes: 3 additions & 3 deletions rad/src/reducers/mode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub fn mode(input: &RadonArray) -> Result<RadonTypes, RadError> {
let temp_counter = counter.clone();

// Compute how many times does the most frequent item appear
let max_count = temp_counter.values().max().ok_or(RadError::ModeEmpty)?;
let max_count = temp_counter.values().max().ok_or(RadError::EmptyArray)?;

// Collect items that appear as many times as the one that appears the most
let mode_vector: Vec<RadonTypes> = counter
Expand All @@ -42,7 +42,7 @@ mod tests {
use super::*;

use crate::{
error::RadError::{ModeEmpty, ModeTie},
error::RadError::{EmptyArray, ModeTie},
types::{float::RadonFloat, integer::RadonInteger, string::RadonString},
};

Expand Down Expand Up @@ -129,7 +129,7 @@ mod tests {
fn test_mode_empty() {
let input = RadonArray::from(vec![]);
let output = mode(&input).unwrap_err();
let expected_error = ModeEmpty;
let expected_error = EmptyArray;
assert_eq!(output, expected_error);
}

Expand Down

0 comments on commit f620bc2

Please sign in to comment.