Skip to content

Fix format_number function #1021

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 3 commits into from
Feb 10, 2021
Merged

Fix format_number function #1021

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e8cda8
fix format_number
Feb 5, 2021
09074a1
fix format_number: be sure that exp_level is less than or equal to five
Feb 5, 2021
7cf64b1
fix format_number: uncomment tests
Feb 5, 2021
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
78 changes: 38 additions & 40 deletions src/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,42 +36,26 @@ pub fn escape_pango_text(text: String) -> String {
.collect()
}

pub fn format_number(raw_value: f64, total_digits: usize, min_unit: &str, suffix: &str) -> String {
let (min_unit_value, min_unit_level) = match min_unit {
"T" => (raw_value / 1_000_000_000_000.0, 4),
"G" => (raw_value / 1_000_000_000.0, 3),
"M" => (raw_value / 1_000_000.0, 2),
"K" => (raw_value / 1_000.0, 1),
"1" => (raw_value, 0),
"m" => (raw_value * 1_000.0, -1),
"u" => (raw_value * 1_000_000.0, -2),
"n" => (raw_value * 1_000_000_000.0, -3),
_ => (raw_value * 1_000_000_000_000.0, -4),
/// Format `raw_value` to engineering notation
pub fn format_number(raw_value: f64, total_digits: usize, min_suffix: &str, unit: &str) -> String {
let min_exp_level = match min_suffix {
"T" => 4,
"G" => 3,
"M" => 2,
"K" => 1,
"1" => 0,
"m" => -1,
"u" => -2,
"n" => -3,
_ => -4,
};

//println!("Min Unit: ({}, {})", min_unit_value, min_unit_level);

let (magnitude_value, magnitude_level) = match raw_value {
x if x >= 100_000_000_000.0 => (raw_value / 1_000_000_000_000.0, 4),
x if x >= 100_000_000.0 => (raw_value / 1_000_000_000.0, 3),
x if x >= 100_000.0 => (raw_value / 1_000_000.0, 2),
x if x >= 100.0 => (raw_value / 1_000.0, 1),
x if x >= 0.1 => (raw_value, 0),
x if x >= 0.000_1 => (raw_value * 1_000.0, -1),
x if x >= 0.000_000_1 => (raw_value * 1_000_000.0, -2),
x if x >= 0.000_000_000_1 => (raw_value * 1_000_000_000.0, -3),
_ => (raw_value * 1_000_000_000_000.0, -4),
};

//println!("Magnitude: ({}, {})", magnitude_value, magnitude_level);

let (value, level) = if magnitude_level < min_unit_level {
(min_unit_value, min_unit_level)
} else {
(magnitude_value, magnitude_level)
};
let exp_level = (raw_value.log10().div_euclid(3.) as i32)
.max(min_exp_level)
.min(4);
Comment on lines +54 to +55
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By the way, clamp() is stabilized in rust 1.50.0 which releases soon.

let value = raw_value / (10f64).powi(exp_level * 3);

let unit = match level {
let suffix = match exp_level {
4 => "T",
3 => "G",
2 => "M",
Expand All @@ -83,14 +67,17 @@ pub fn format_number(raw_value: f64, total_digits: usize, min_unit: &str, suffix
_ => "p",
};

let _decimal_precision = total_digits as i16 - if value >= 10.0 { 2 } else { 1 };
let decimal_precision = if _decimal_precision < 0 {
0
let total_digits = total_digits as isize;
let decimals = (if value >= 100. {
total_digits - 3
} else if value >= 10. {
total_digits - 2
} else {
_decimal_precision
};
total_digits - 1
})
.max(0);

format!("{:.*}{}{}", decimal_precision as usize, value, unit, suffix)
format!("{:.*}{}{}", decimals as usize, value, suffix, unit)
}

pub fn battery_level_to_icon(charge_level: Result<u64>) -> &'static str {
Expand Down Expand Up @@ -512,7 +499,18 @@ macro_rules! if_debug {

#[cfg(test)]
mod tests {
use crate::util::{color_from_rgba, has_command};
use crate::util::{color_from_rgba, format_number, has_command};

#[test]
fn test_format_number() {
assert_eq!(format_number(1.0, 3, "", "s"), "1.00s");
assert_eq!(format_number(1.007, 3, "", "s"), "1.01s");
assert_eq!(format_number(1.007, 4, "K", "s"), "0.001Ks");
assert_eq!(format_number(1007., 3, "K", "s"), "1.01Ks");
assert_eq!(format_number(107_000., 3, "", "s"), "107Ks");
assert_eq!(format_number(107., 3, "", "s"), "107s");
assert_eq!(format_number(0.000_123_123, 3, "", "N"), "123uN");
}

#[test]
// we assume sh is always available
Expand Down