extern/kalker
1
0
Fork 0
mirror of https://github.com/PaddiM8/kalker.git synced 2024-11-07 08:24:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

kalk: Fix returned unit for some trig functions

Browse Source
This commit is contained in:
PaddiM8 2023-07-19 23:08:38 +02:00
parent 28b6e42542
commit 7e41531b91
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kalk/src/prelude/mod.rs
View File

@ -514,22 +514,22 @@ pub mod funcs {
} }
pub fn cos(x: KalkValue) -> Result<KalkValue, KalkError> { pub fn cos(x: KalkValue) -> Result<KalkValue, KalkError> {
let (real, imaginary, unit) = as_number_or_return!(x); let (real, imaginary, _) = as_number_or_return!(x);
Ok(KalkValue::Number( Ok(KalkValue::Number(
real.clone().cos() * imaginary.clone().cosh(), real.clone().cos() * imaginary.clone().cosh(),
-real.sin() * imaginary.sinh(), -real.sin() * imaginary.sinh(),
unit, None,
)) ))
} }
pub fn cosh(x: KalkValue) -> Result<KalkValue, KalkError> { pub fn cosh(x: KalkValue) -> Result<KalkValue, KalkError> {
let (real, imaginary, unit) = as_number_or_return!(x); let (real, imaginary, _) = as_number_or_return!(x);
Ok(KalkValue::Number( Ok(KalkValue::Number(
real.clone().cosh() * imaginary.clone().cos(), real.clone().cosh() * imaginary.clone().cos(),
real.sinh() * imaginary.sin(), real.sinh() * imaginary.sin(),
unit, None,
)) ))
} }
@ -542,25 +542,25 @@ pub mod funcs {
} }
pub fn cot(x: KalkValue) -> Result<KalkValue, KalkError> { pub fn cot(x: KalkValue) -> Result<KalkValue, KalkError> {
let (real, imaginary, unit) = as_number_or_return!(x); let (real, imaginary, _) = as_number_or_return!(x);
let a = real * 2f64; let a = real * 2f64;
let b = imaginary * 2f64; let b = imaginary * 2f64;
Ok(KalkValue::Number( Ok(KalkValue::Number(
-a.clone().sin() / (a.clone().cos() - b.clone().cosh()), -a.clone().sin() / (a.clone().cos() - b.clone().cosh()),
b.clone().sinh() / (a.cos() - b.cosh()), b.clone().sinh() / (a.cos() - b.cosh()),
unit, None,
)) ))
} }
pub fn coth(x: KalkValue) -> Result<KalkValue, KalkError> { pub fn coth(x: KalkValue) -> Result<KalkValue, KalkError> {
let (real, imaginary, unit) = as_number_or_return!(x); let (real, imaginary, _) = as_number_or_return!(x);
let a = real * 2f64; let a = real * 2f64;
let b = imaginary * 2f64; let b = imaginary * 2f64;
Ok(KalkValue::Number( Ok(KalkValue::Number(
-a.clone().sinh() / (b.clone().cos() - a.clone().cosh()), -a.clone().sinh() / (b.clone().cos() - a.clone().cosh()),
b.clone().sin() / (b.cos() - a.cosh()), b.clone().sin() / (b.cos() - a.cosh()),
unit, None,
)) ))
} }
@ -911,20 +911,20 @@ pub mod funcs {
} }
pub fn sin(x: KalkValue) -> Result<KalkValue, KalkError> { pub fn sin(x: KalkValue) -> Result<KalkValue, KalkError> {
let (real, imaginary, unit) = as_number_or_return!(x); let (real, imaginary, _) = as_number_or_return!(x);
Ok(KalkValue::Number( Ok(KalkValue::Number(
real.clone().sin() * imaginary.clone().cosh(), real.clone().sin() * imaginary.clone().cosh(),
real.cos() * imaginary.sinh(), real.cos() * imaginary.sinh(),
unit, None,
)) ))
} }
pub fn sinh(x: KalkValue) -> Result<KalkValue, KalkError> { pub fn sinh(x: KalkValue) -> Result<KalkValue, KalkError> {
let (real, imaginary, unit) = as_number_or_return!(x); let (real, imaginary, _) = as_number_or_return!(x);
Ok(KalkValue::Number( Ok(KalkValue::Number(
real.clone().sinh() * imaginary.clone().cos(), real.clone().sinh() * imaginary.clone().cos(),
real.cosh() * imaginary.sin(), real.cosh() * imaginary.sin(),
unit, None,
)) ))
} }
@ -1001,33 +1001,33 @@ pub mod funcs {
pub fn tan(x: KalkValue) -> Result<KalkValue, KalkError> { pub fn tan(x: KalkValue) -> Result<KalkValue, KalkError> {
let has_imaginary = x.has_imaginary(); let has_imaginary = x.has_imaginary();
let (real, imaginary, unit) = as_number_or_return!(x); let (real, imaginary, _) = as_number_or_return!(x);
if has_imaginary { if has_imaginary {
let a = real * 2f64; let a = real * 2f64;
let b = imaginary * 2f64; let b = imaginary * 2f64;
Ok(KalkValue::Number( Ok(KalkValue::Number(
a.clone().sin() / (a.clone().cos() + b.clone().cosh()), a.clone().sin() / (a.clone().cos() + b.clone().cosh()),
b.clone().sinh() / (a.cos() + b.cosh()), b.clone().sinh() / (a.cos() + b.cosh()),
unit, None,
)) ))
} else { } else {
Ok(KalkValue::Number(real.tan(), float!(0), unit)) Ok(KalkValue::Number(real.tan(), float!(0), None))
} }
} }
pub fn tanh(x: KalkValue) -> Result<KalkValue, KalkError> { pub fn tanh(x: KalkValue) -> Result<KalkValue, KalkError> {
let has_imaginary = x.has_imaginary(); let has_imaginary = x.has_imaginary();
let (real, imaginary, unit) = as_number_or_return!(x); let (real, imaginary, _) = as_number_or_return!(x);
if has_imaginary { if has_imaginary {
let a = real * 2f64; let a = real * 2f64;
let b = imaginary * 2f64; let b = imaginary * 2f64;
Ok(KalkValue::Number( Ok(KalkValue::Number(
a.clone().sinh() / (a.clone().cosh() + b.clone().cos()), a.clone().sinh() / (a.clone().cosh() + b.clone().cos()),
b.clone().sin() / (a.cosh() + b.cos()), b.clone().sin() / (a.cosh() + b.cos()),
unit, None,
)) ))
} else { } else {
Ok(KalkValue::Number(real.tanh(), float!(0), unit)) Ok(KalkValue::Number(real.tanh(), float!(0), None))
} }
} }