Skip to content

Add Fractional, Real, and RealExt traits and update Round trait. Rename Natural trait to Integer. #6048

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Apr 25, 2013
Merged

Add Fractional, Real, and RealExt traits and update Round trait. Rename Natural trait to Integer. #6048

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
593bdd9
Fix incorrect replacement of `modulo` with `rem`
brendanzab Apr 24, 2013
03932f0
Move impls of `Num` out of core::num and clean up imports
brendanzab Apr 24, 2013
d4868ee
Use #[cfg(not(stage0))] to exclude items from stage0
brendanzab Apr 24, 2013
024bf2e
Rename Natural to Integer
brendanzab Apr 24, 2013
6fa054d
Use borrowed pointers for Integer methods
brendanzab Apr 24, 2013
dcd49cc
Add Fractional, Real and RealExt traits
brendanzab Apr 24, 2013
48c2418
Restore Round trait and move appropriate methods out of Real
brendanzab Apr 25, 2013
225ac21
Update impl of Round for Ratio
brendanzab Apr 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update impl of Round for Ratio
  • Loading branch information
@brendanzab
brendanzab committed Apr 25, 2013
commit 225ac216157cf530332cef1c926875e2023e48e6
42 changes: 22 additions & 20 deletions src/libstd/num/rational.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,20 +204,6 @@ impl<T: Copy + Num + Ord>
/* Utils */
impl<T: Copy + Num + Ord>
Round for Ratio<T> {
fn round(&self, mode: num::RoundMode) -> Ratio<T> {
match mode {
num::RoundUp => { self.ceil() }
num::RoundDown => { self.floor()}
num::RoundToZero => { Ratio::from_integer(self.numer / self.denom) }
num::RoundFromZero => {
if *self < Zero::zero() {
Ratio::from_integer((self.numer - self.denom + One::one()) / self.denom)
} else {
Ratio::from_integer((self.numer + self.denom - One::one()) / self.denom)
}
}
}
}

fn floor(&self) -> Ratio<T> {
if *self < Zero::zero() {
Expand All @@ -226,13 +212,29 @@ impl<T: Copy + Num + Ord>
Ratio::from_integer(self.numer / self.denom)
}
}

fn ceil(&self) -> Ratio<T> {
if *self < Zero::zero() {
Ratio::from_integer(self.numer / self.denom)
} else {
Ratio::from_integer((self.numer + self.denom - One::one()) / self.denom)
}
}

#[inline(always)]
fn round(&self) -> Ratio<T> {
if *self < Zero::zero() {
Ratio::from_integer((self.numer - self.denom + One::one()) / self.denom)
} else {
Ratio::from_integer((self.numer + self.denom - One::one()) / self.denom)
}
}

#[inline(always)]
fn trunc(&self) -> Ratio<T> {
Ratio::from_integer(self.numer / self.denom)
}

fn fract(&self) -> Ratio<T> {
Ratio::new_raw(self.numer % self.denom, self.denom)
}
Expand Down Expand Up @@ -421,18 +423,18 @@ mod test {
fn test_round() {
assert_eq!(_1_2.ceil(), _1);
assert_eq!(_1_2.floor(), _0);
assert_eq!(_1_2.round(num::RoundToZero), _0);
assert_eq!(_1_2.round(num::RoundFromZero), _1);
assert_eq!(_1_2.round(), _1);
assert_eq!(_1_2.trunc(), _0);

assert_eq!(_neg1_2.ceil(), _0);
assert_eq!(_neg1_2.floor(), -_1);
assert_eq!(_neg1_2.round(num::RoundToZero), _0);
assert_eq!(_neg1_2.round(num::RoundFromZero), -_1);
assert_eq!(_neg1_2.round(), -_1);
assert_eq!(_neg1_2.trunc(), _0);

assert_eq!(_1.ceil(), _1);
assert_eq!(_1.floor(), _1);
assert_eq!(_1.round(num::RoundToZero), _1);
assert_eq!(_1.round(num::RoundFromZero), _1);
assert_eq!(_1.round(), _1);
assert_eq!(_1.trunc(), _1);
}

#[test]
Expand Down