eryn/sibil
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Rational addition work!

Browse source
This commit is contained in:
Eryn Wells 2017-04-15 11:01:12 -07:00
parent f9d9a08455
commit c46081c0c3
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
types/src/number/add.rs
View file

@ -18,8 +18,11 @@ impl Add for Real {
} }
else { else {
let lcm = q.lcm(oq); let lcm = q.lcm(oq);
Real::Rational(1, 1) let numer = (p * (lcm / q)) + (op * (lcm / oq));
} let denom = lcm;
println!("lcm = {}, numer = {}, denom = {}", lcm, numer, denom);
Real::Rational(numer, denom)
}.reduce()
}, },
(Real::Irrational(v), Real::Irrational(ov)) => Real::Irrational(v + ov), (Real::Irrational(v), Real::Irrational(ov)) => Real::Irrational(v + ov),
// TODO: The rest. // TODO: The rest.
@ -39,11 +42,17 @@ mod tests {
} }
#[test] #[test]
fn rational_addition() { fn rational_addition_with_like_denominators() {
let r = Real::Rational(1, 4) + Real::Rational(1, 4); let r = Real::Rational(1, 4) + Real::Rational(1, 4);
assert_eq!(r, Real::Rational(1, 2)); assert_eq!(r, Real::Rational(1, 2));
} }
#[test]
fn rational_addition_with_unlike_denominators() {
let r = Real::Rational(4, 7) + Real::Rational(14, 3);
assert_eq!(r, Real::Rational(110, 21));
}
#[test] #[test]
fn irrational_addition() { fn irrational_addition() {
let r = Real::Irrational(3.2) + Real::Irrational(3.2); let r = Real::Irrational(3.2) + Real::Irrational(3.2);