diff --git a/src/main/java/Rational/Rational.java b/src/main/java/Rational/Rational.java index 7bd840e..b2c79a3 100644 --- a/src/main/java/Rational/Rational.java +++ b/src/main/java/Rational/Rational.java @@ -47,50 +47,42 @@ public class Rational { } // COMPLETED - Static method: r1 + r2 - public static Rational add(Rational r1, Rational r2) { - return r1.add(r2); - } + public static Rational add(Rational r1, Rational r2) {return r1.add(r2);} - // TODO: Instance method - this - other - // Formula: a/b - c/d = (a*d - c*b) / (b*d) + //TODO public Rational subtract(Rational other) { - // YOUR CODE HERE - return null; // Remove this line when implemented + int newNumerator = this.numerator * other.denominator - other.numerator * this.denominator; + int newDenominator = this.denominator * other.denominator; + return new Rational(newNumerator, newDenominator); } - // TODO: Static method - r1 - r2 - public static Rational subtract(Rational r1, Rational r2) { - // YOUR CODE HERE - return null; // Remove this line when implemented - } + //TODO + public static Rational subtract(Rational r1, Rational r2) {return r1.subtract(r2);} - // TODO: Instance method - this * other - // Formula: (a/b) * (c/d) = (a*c) / (b*d) + //TODO public Rational multiply(Rational other) { - // YOUR CODE HERE - return null; // Remove this line when implemented + int newNumerator = this.numerator * other.numerator; + int newDenominator = this.denominator * other.denominator; + return new Rational(newNumerator, newDenominator); } - // TODO: Static method - r1 * r2 - public static Rational multiply(Rational r1, Rational r2) { - // YOUR CODE HERE - return null; // Remove this line when implemented - } + //TODO + public static Rational multiply(Rational r1, Rational r2) {return r1.multiply(r2);} - // TODO: Instance method - this / other - // Formula: (a/b) รท (c/d) = (a*d) / (b*c) + //TODO public Rational divide(Rational other) { - // YOUR CODE HERE - // HINT: Division is multiplication by reciprocal - // Don't forget to check if other.numerator is zero! - return null; // Remove this line when implemented + if (other.numerator == 0) { + System.out.println("You can't divide a number by zero!"); + return null; + } + + int newNumerator = this.numerator * other.denominator; + int newDenominator = this.denominator * other.numerator; + return new Rational(newNumerator, newDenominator); } - // TODO: Static method - r1 / r2 - public static Rational divide(Rational r1, Rational r2) { - // YOUR CODE HERE - return null; // Remove this line when implemented - } + //TODO + public static Rational divide(Rational r1, Rational r2) {return r1.divide(r2);} // PROVIDED - String representation @Override