Skip to content
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.

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

Add copysign #207

Merged
merged 7 commits into from May 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions build.rs
Expand Up @@ -21,5 +21,9 @@ fn main() {
ac.emit_expression_cfg("{ let mut x = 1; x += &2; }", "has_int_assignop_ref");
ac.emit_expression_cfg("1u32.div_euclid(1u32)", "has_div_euclid");

if env::var_os("CARGO_FEATURE_STD").is_some() {
ac.emit_expression_cfg("1f64.copysign(-1f64)", "has_copysign");
}

autocfg::rerun_path("build.rs");
}
83 changes: 83 additions & 0 deletions src/float.rs
Expand Up @@ -1862,6 +1862,35 @@ pub trait Float: Num + Copy + NumCast + PartialOrd + Neg<Output = Self> {
/// assert!(abs_difference < 1e-10);
/// ```
fn integer_decode(self) -> (u64, i16, i8);

/// Returns a number composed of the magnitude of `self` and the sign of
/// `sign`.
///
/// Equal to `self` if the sign of `self` and `sign` are the same, otherwise
/// equal to `-self`. If `self` is a `NAN`, then a `NAN` with the sign of
/// `sign` is returned.
///
/// # Examples
///
/// ```
/// use num_traits::Float;
///
/// let f = 3.5_f32;
///
/// assert_eq!(f.copysign(0.42), 3.5_f32);
/// assert_eq!(f.copysign(-0.42), -3.5_f32);
/// assert_eq!((-f).copysign(0.42), 3.5_f32);
/// assert_eq!((-f).copysign(-0.42), -3.5_f32);
///
/// assert!(f32::nan().copysign(1.0).is_nan());
/// ```
fn copysign(self, sign: Self) -> Self {
if self.is_sign_negative() == sign.is_sign_negative() {
self
} else {
self.neg()
}
}
}

#[cfg(feature = "std")]
Expand Down Expand Up @@ -1939,6 +1968,12 @@ macro_rules! float_impl_std {
Self::acosh(self) -> Self;
Self::atanh(self) -> Self;
}

#[cfg(has_copysign)]
#[inline]
fn copysign(self, sign: Self) -> Self {
Self::copysign(self, sign)
}
}
};
}
Expand Down Expand Up @@ -2070,6 +2105,7 @@ impl Float for f32 {
libm::atanhf as atanh(self) -> Self;
libm::fmaxf as max(self, other: Self) -> Self;
libm::fminf as min(self, other: Self) -> Self;
libm::copysignf as copysign(self, other: Self) -> Self;
}
}

Expand Down Expand Up @@ -2117,6 +2153,7 @@ impl Float for f64 {
libm::atanh as atanh(self) -> Self;
libm::fmax as max(self, other: Self) -> Self;
libm::fmin as min(self, other: Self) -> Self;
libm::copysign as copysign(self, sign: Self) -> Self;
}
}

Expand Down Expand Up @@ -2265,4 +2302,50 @@ mod tests {
check::<f32>(1e-6);
check::<f64>(1e-12);
}

#[test]
#[cfg(any(feature = "std", feature = "libm"))]
fn copysign() {
use float::Float;
test_copysign_generic(2.0_f32, -2.0_f32, f32::nan());
test_copysign_generic(2.0_f64, -2.0_f64, f64::nan());
test_copysignf(2.0_f32, -2.0_f32, f32::nan());
}

#[cfg(any(feature = "std", feature = "libm"))]
fn test_copysignf(p: f32, n: f32, nan: f32) {
use core::ops::Neg;
use float::Float;

assert!(p.is_sign_positive());
assert!(n.is_sign_negative());
assert!(nan.is_nan());

assert_eq!(p, Float::copysign(p, p));
assert_eq!(p.neg(), Float::copysign(p, n));

assert_eq!(n, Float::copysign(n, n));
assert_eq!(n.neg(), Float::copysign(n, p));

// FIXME: is_sign... only works on NaN starting in Rust 1.20
// assert!(Float::copysign(nan, p).is_sign_positive());
// assert!(Float::copysign(nan, n).is_sign_negative());
}

#[cfg(any(feature = "std", feature = "libm"))]
fn test_copysign_generic<F: ::float::Float + ::core::fmt::Debug>(p: F, n: F, nan: F) {
assert!(p.is_sign_positive());
assert!(n.is_sign_negative());
assert!(nan.is_nan());

assert_eq!(p, p.copysign(p));
assert_eq!(p.neg(), p.copysign(n));

assert_eq!(n, n.copysign(n));
assert_eq!(n.neg(), n.copysign(p));

// FIXME: is_sign... only works on NaN starting in Rust 1.20
// assert!(nan.copysign(p).is_sign_positive());
// assert!(nan.copysign(n).is_sign_negative());
}
}