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

add quantile column (#5583)

Browse Source
This commit is contained in:
WindSoilder 2022-05-19 09:47:26 +08:00 committed by GitHub
parent 6c56829976
commit 2b1e05aad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/nu-command/src/charting/histogram.rs
View File

@ -72,7 +72,7 @@ impl Command for Histogram {
let frequency_column_name = match frequency_name_arg { let frequency_column_name = match frequency_name_arg {
Some(inner) => { Some(inner) => {
let span = inner.span; let span = inner.span;
if ["value", "count", "percentage"].contains(&inner.item.as_str()) { if ["value", "count", "quantile", "percentage"].contains(&inner.item.as_str()) {
return Err(ShellError::UnsupportedInput( return Err(ShellError::UnsupportedInput(
"frequency-column-name can't be 'value', 'count' or 'percentage'" "frequency-column-name can't be 'value', 'count' or 'percentage'"
.to_string(), .to_string(),
@ -208,27 +208,29 @@ fn histogram_impl(
let result_cols = vec![ let result_cols = vec![
value_column_name.to_string(), value_column_name.to_string(),
"count".to_string(), "count".to_string(),
"quantile".to_string(),
"percentage".to_string(), "percentage".to_string(),
freq_column.to_string(), freq_column.to_string(),
]; ];
const MAX_FREQ_COUNT: f64 = 100.0; const MAX_FREQ_COUNT: f64 = 100.0;
for (val, count) in counter.into_iter() { for (val, count) in counter.into_iter() {
let (percentage, freq) = { let quantile = match calc_method {
let percentage = match calc_method {
PercentageCalcMethod::Normalize => (count as f64 / total_cnt as f64), PercentageCalcMethod::Normalize => (count as f64 / total_cnt as f64),
PercentageCalcMethod::Relative => (count as f64 / max_cnt as f64), PercentageCalcMethod::Relative => (count as f64 / max_cnt as f64),
}; };
(
format!("{:.2}%", percentage * 100_f64), let percentage = format!("{:.2}%", quantile * 100_f64);
"*".repeat((MAX_FREQ_COUNT * percentage).floor() as usize), let freq = "*".repeat((MAX_FREQ_COUNT * quantile).floor() as usize);
)
};
result.push(Value::Record { result.push(Value::Record {
cols: result_cols.clone(), cols: result_cols.clone(),
vals: vec![ vals: vec![
val.into_value(), val.into_value(),
Value::Int { val: count, span }, Value::Int { val: count, span },
Value::Float {
val: quantile,
span,
},
Value::String { Value::String {
val: percentage, val: percentage,
span, span,

6
crates/nu-command/tests/commands/histogram.rs
View File

@ -126,7 +126,7 @@ fn count() {
let actual = nu!( let actual = nu!(
cwd: ".", pipeline( cwd: ".", pipeline(
r#" r#"
echo [[bit]; [1] [0] [0] [0] [0] [0] [0] [1]] echo [[bit]; [1] [0] [0] [0] [0] [0] [0] [1] [1]]
| histogram bit --percentage-type relative | histogram bit --percentage-type relative
| sort-by count | sort-by count
| reject frequency | reject frequency
@ -134,7 +134,7 @@ fn count() {
"# "#
)); ));
let bit_json = r#"[ { "bit": 1, "count": 2, "percentage": "33.33%" }, { "bit": 0, "count": 6, "percentage": "100.00%" }]"#; let bit_json = r#"[ { "bit": 1, "count": 3, "quantile": 0.5, "percentage": "50.00%" }, { "bit": 0, "count": 6, "quantile": 1, "percentage": "100.00%" }]"#;
assert_eq!(actual.out, bit_json); assert_eq!(actual.out, bit_json);
} }
@ -152,7 +152,7 @@ fn count_with_normalize_percentage() {
"# "#
)); ));
let bit_json = r#"[ { "bit": 1, "count": 2, "percentage": "25.00%" }, { "bit": 0, "count": 6, "percentage": "75.00%" }]"#; let bit_json = r#"[ { "bit": 1, "count": 2, "quantile": 0.25, "percentage": "25.00%" }, { "bit": 0, "count": 6, "quantile": 0.75, "percentage": "75.00%" }]"#;
assert_eq!(actual.out, bit_json); assert_eq!(actual.out, bit_json);
} }