Mark
/
daisy
mirror of https://github.com/rm-dr/daisy
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed quantity printing

pull/2/head
Mark 2023-04-01 18:26:30 -07:00
parent bb200548f1
commit cb227d9539
Signed by: Mark
GPG Key ID: AD62BB059C2AAEE4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/quantity/mod.rs
View File

@ -4,4 +4,4 @@ pub mod quantity;
pub use crate::quantity::quantity::Quantity; pub use crate::quantity::quantity::Quantity;
const FLOAT_PRECISION: u32 = 2048; const FLOAT_PRECISION: u32 = 2048;
const PRINT_LEN: usize = 4; // How many significant digits we will show in output const PRINT_LEN: usize = 5; // How many significant digits we will show in output

7
src/quantity/quantity.rs
View File

@ -48,15 +48,16 @@ impl ToString for Quantity{
exp_u = exp.try_into().unwrap() exp_u = exp.try_into().unwrap()
} }
if exp_u >= 4 { if exp_u >= PRINT_LEN {
// Exponential notation // Exponential notation
let pre = &string[0..1]; let pre = &string[0..1];
let post = &string[1..]; let post = &string[1..];
format!( format!(
"{pre}{}{post}e{}{exp}", "{pre}{}{post}e{}",
if post.len() != 0 {"."} else {""}, if post.len() != 0 {"."} else {""},
if exp > 0 {"+"} else {""}, //if exp > 0 {"+"} else {""},
exp - 1
) )
} else { } else {
if exp <= 0 { // Decimal, needs `0.` and leading zeros if exp <= 0 { // Decimal, needs `0.` and leading zeros