From f620bc2f2b6b358c368eda97b6aee5a73777a48b Mon Sep 17 00:00:00 2001 From: Luis Rubio Date: Wed, 1 Sep 2021 12:56:41 +0200 Subject: [PATCH] refactor(rad): rename ModeEmpty by EmptyArray --- rad/src/error.rs | 2 +- rad/src/filters/mode.rs | 2 +- rad/src/reducers/median.rs | 12 ++++++------ rad/src/reducers/mode.rs | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rad/src/error.rs b/rad/src/error.rs index 3d9c181f01..03b5243cd7 100644 --- a/rad/src/error.rs +++ b/rad/src/error.rs @@ -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: `{:?}`", diff --git a/rad/src/filters/mode.rs b/rad/src/filters/mode.rs index 34df38162b..f02a6cc448 100644 --- a/rad/src/filters/mode.rs +++ b/rad/src/filters/mode.rs @@ -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()), diff --git a/rad/src/reducers/median.rs b/rad/src/reducers/median.rs index f6164e7163..2104e1029f 100644 --- a/rad/src/reducers/median.rs +++ b/rad/src/reducers/median.rs @@ -18,7 +18,7 @@ pub fn median(input: &RadonArray) -> Result { 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> = Vec::with_capacity(value_len); @@ -44,7 +44,7 @@ pub fn median(input: &RadonArray) -> Result { 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; @@ -77,7 +77,7 @@ pub fn median(input: &RadonArray) -> Result { 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; @@ -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); } @@ -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); } diff --git a/rad/src/reducers/mode.rs b/rad/src/reducers/mode.rs index a2bf330b51..7b28c4f073 100644 --- a/rad/src/reducers/mode.rs +++ b/rad/src/reducers/mode.rs @@ -17,7 +17,7 @@ pub fn mode(input: &RadonArray) -> Result { 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 = counter @@ -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}, }; @@ -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); }