extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-01-11 00:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adding coerce filesize functionality to math avg median (#2848)

Browse Source 
* Adding coerce filesize functionality to math avg median

* Updating initial value creating in Math Summation Reducer

* Update reducers.rs

Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
This commit is contained in:
James Inlow 2021-01-06 21:01:52 -06:00 committed by GitHub
parent b50cdd6de8
commit eb62fd466e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/nu-cli/src/commands/math/median.rs
View File

@ -128,8 +128,9 @@ fn compute_average(values: &[Value], name: impl Into<Tag>) -> Result<Value, Shel
&name,
)
})?;
let total_rows = UntaggedValue::decimal(number);
let total = sum(UntaggedValue::int(0).into_untagged_value(), values.to_vec())?;
let total = sum(Value::nothing(), values.to_vec())?;
match total {
Value {

19
crates/nu-cli/src/commands/math/reducers.rs
View File

@ -41,16 +41,18 @@ pub fn reducer_for(
command: Reduce,
) -> Box<dyn Fn(Value, Vec<Value>) -> Result<Value, ShellError> + Send + Sync + 'static> {
match command {
Reduce::Summation | Reduce::Default => Box::new(formula(
Reduce::Default => Box::new(formula(
UntaggedValue::int(0).into_untagged_value(),
Box::new(sum),
)),
Reduce::Summation => Box::new(|_, values| sum(values)),
Reduce::Minimum => Box::new(|_, values| min(values)),
Reduce::Maximum => Box::new(|_, values| max(values)),
Reduce::Product => Box::new(|_, values| product(values)),
}
}
#[allow(dead_code)]
pub enum Reduce {
Summation,
Minimum,
@ -60,7 +62,20 @@ pub enum Reduce {
}
pub fn sum(data: Vec<Value>) -> Result<Value, ShellError> {
let mut acc = UntaggedValue::int(0).into_untagged_value();
let first_value = data
.get(0)
.ok_or_else(|| ShellError::unexpected(ERR_EMPTY_DATA))?;
// Generate the initial accumulator value, of the correct type for
// the incoming data, this will be used in conjunction with the
// sum aggregator. Currently this is only handling, filesize,
// and other types are defaulting to an integer.
let mut acc = if first_value.is_filesize() {
UntaggedValue::filesize(0u64).into_untagged_value()
} else {
UntaggedValue::int(0).into_untagged_value()
};
for value in data {
match value.value {
UntaggedValue::Primitive(_) => {