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

Equality comparison for complex numbers

Browse Source
This commit is contained in:
PaddiM8 2022-01-14 17:59:04 +01:00
parent e700445cde
commit 82dfd8751a
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -919,16 +919,15 @@ impl KalkValue {
} }
pub(crate) fn eq_without_unit(&self, rhs: &KalkValue) -> KalkValue { pub(crate) fn eq_without_unit(&self, rhs: &KalkValue) -> KalkValue {
if self.has_imaginary() || rhs.has_imaginary() {
return KalkValue::nan();
}
match (self, rhs) { match (self, rhs) {
(KalkValue::Number(real, _, _), KalkValue::Number(real_rhs, _, _)) => { (
KalkValue::Boolean( KalkValue::Number(real, imaginary, _),
(real.clone() - real_rhs.clone()).abs() < ACCEPTABLE_COMPARISON_MARGIN, KalkValue::Number(real_rhs, imaginary_rhs, _),
) ) => KalkValue::Boolean(
} (real.clone() - real_rhs.clone()).abs() < ACCEPTABLE_COMPARISON_MARGIN
&& (imaginary.clone() - imaginary_rhs.clone()).abs()
< ACCEPTABLE_COMPARISON_MARGIN,
),
(KalkValue::Vector(values), KalkValue::Vector(values_rhs)) => { (KalkValue::Vector(values), KalkValue::Vector(values_rhs)) => {
let mut vecs_are_equal = true; let mut vecs_are_equal = true;
for (value, value_rhs) in values.iter().zip(values_rhs) { for (value, value_rhs) in values.iter().zip(values_rhs) {
@ -946,16 +945,15 @@ impl KalkValue {
} }
pub(crate) fn not_eq_without_unit(&self, rhs: &KalkValue) -> KalkValue { pub(crate) fn not_eq_without_unit(&self, rhs: &KalkValue) -> KalkValue {
if self.has_imaginary() || rhs.has_imaginary() {
return KalkValue::nan();
}
match (self, rhs) { match (self, rhs) {
(KalkValue::Number(real, _, _), KalkValue::Number(real_rhs, _, _)) => { (
KalkValue::Boolean( KalkValue::Number(real, imaginary, _),
(real.clone() - real_rhs.clone()).abs() > ACCEPTABLE_COMPARISON_MARGIN, KalkValue::Number(real_rhs, imaginary_rhs, _),
) ) => KalkValue::Boolean(
} (real.clone() - real_rhs.clone()).abs() > ACCEPTABLE_COMPARISON_MARGIN
|| (imaginary.clone() - imaginary_rhs.clone()).abs()
> ACCEPTABLE_COMPARISON_MARGIN,
),
_ => KalkValue::nan(), _ => KalkValue::nan(),
} }
} }