extern/kalker
1
0
Fork 0
mirror of https://github.com/PaddiM8/kalker.git synced 2025-06-27 21:21:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Print large numbers accurately

Browse Source
This commit is contained in:
PaddiM8 2024-03-23 02:34:42 +01:00
parent fee73e6b26
commit d91a10f3fa
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/src/output.rs
View File

@ -1,7 +1,7 @@
use ansi_term::Colour::Red; use ansi_term::Colour::Red;
use kalk::{kalk_value::ScientificNotationFormat, parser}; use kalk::{kalk_value::ScientificNotationFormat, parser};
pub(crate) const DEFAULT_PRECISION: u32 = 63; pub(crate) const DEFAULT_PRECISION: u32 = 1024;
pub fn eval(parser: &mut parser::Context, input: &str, precision: u32, base: u8, format: ScientificNotationFormat) { pub fn eval(parser: &mut parser::Context, input: &str, precision: u32, base: u8, format: ScientificNotationFormat) {
match parser::eval(parser, input, precision) { match parser::eval(parser, input, precision) {

33
kalk/src/kalk_value/mod.rs
View File

@ -33,7 +33,7 @@ macro_rules! float {
macro_rules! float { macro_rules! float {
($x:expr) => {{ ($x:expr) => {{
use rug::Float; use rug::Float;
Float::with_val(63, $x) Float::with_val(1024, $x)
}}; }};
} }
@ -187,10 +187,10 @@ impl std::fmt::Display for KalkValue {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self { match self {
KalkValue::Number(real, imaginary, _) => { KalkValue::Number(real, imaginary, _) => {
let as_str = format_number(primitive!(real)); let as_str = format_number_big(real);
if self.has_imaginary() { if self.has_imaginary() {
let imaginary_as_str = format_number(primitive!(imaginary).abs()); let imaginary_as_str = format_number_big(&imaginary.clone().abs());
let sign = if imaginary < &0f64 { "-" } else { "+" }; let sign = if imaginary < &0f64 { "-" } else { "+" };
if &as_str == "0" { if &as_str == "0" {
@ -1155,6 +1155,33 @@ pub fn format_number(input: f64) -> String {
spaced(&result) spaced(&result)
} }
#[cfg(feature = "rug")]
pub fn format_number_big(input: &Float) -> String {
let input_str = input.to_string();
let mut result = if input_str.contains('.') {
input_str
.trim_end_matches('0')
.trim_end_matches('.')
.to_string()
} else {
input_str
};
if let Some(dot_index) = result.find('.') {
let decimal_count = result.len() - dot_index;
if decimal_count > 10 {
result = result[..(result.len() - decimal_count + 10)].to_string();
}
}
spaced(&result)
}
#[cfg(not(feature = "rug"))]
pub fn format_number_big(input: &f64) -> String {
format_number(*input)
}
fn calculate_vector( fn calculate_vector(
x: KalkValue, x: KalkValue,
y: &KalkValue, y: &KalkValue,