Index: trunk/src/com/drew/lang/Rational.java =================================================================== --- trunk/src/com/drew/lang/Rational.java (revision 6127) +++ trunk/src/com/drew/lang/Rational.java (revision 8132) @@ -1,4 +1,4 @@ /* - * Copyright 2002-2012 Drew Noakes + * Copyright 2002-2015 Drew Noakes * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,6 @@ * More information about this project is available at: * - * http://drewnoakes.com/code/exif/ - * http://code.google.com/p/metadata-extractor/ + * https://drewnoakes.com/code/exif/ + * https://github.com/drewnoakes/metadata-extractor */ @@ -29,7 +29,10 @@ /** * Immutable class for holding a rational number without loss of precision. Provides - * a familiar representation via toString() in form numerator/denominator. - * - * @author Drew Noakes http://drewnoakes.com + * a familiar representation via {@link Rational#toString} in form numerator/denominator. + * + * Note that any value with a numerator of zero will be treated as zero, even if the + * denominator is also zero. + * + * @author Drew Noakes https://drewnoakes.com */ public class Rational extends java.lang.Number implements Serializable @@ -61,7 +64,10 @@ * to type double. */ + @Override public double doubleValue() { - return (double) _numerator / (double) _denominator; + return _numerator == 0 + ? 0.0 + : (double) _numerator / (double) _denominator; } @@ -73,7 +79,10 @@ * to type float. */ + @Override public float floatValue() { - return (float) _numerator / (float) _denominator; + return _numerator == 0 + ? 0.0f + : (float) _numerator / (float) _denominator; } @@ -81,9 +90,10 @@ * Returns the value of the specified number as a byte. * This may involve rounding or truncation. This implementation simply - * casts the result of doubleValue() to byte. + * casts the result of {@link Rational#doubleValue} to byte. * * @return the numeric value represented by this object after conversion * to type byte. */ + @Override public final byte byteValue() { @@ -94,9 +104,10 @@ * Returns the value of the specified number as an int. * This may involve rounding or truncation. This implementation simply - * casts the result of doubleValue() to int. + * casts the result of {@link Rational#doubleValue} to int. * * @return the numeric value represented by this object after conversion * to type int. */ + @Override public final int intValue() { @@ -107,9 +118,10 @@ * Returns the value of the specified number as a long. * This may involve rounding or truncation. This implementation simply - * casts the result of doubleValue() to long. + * casts the result of {@link Rational#doubleValue} to long. * * @return the numeric value represented by this object after conversion * to type long. */ + @Override public final long longValue() { @@ -120,9 +132,10 @@ * Returns the value of the specified number as a short. * This may involve rounding or truncation. This implementation simply - * casts the result of doubleValue() to short. + * casts the result of {@link Rational#doubleValue} to short. * * @return the numeric value represented by this object after conversion * to type short. */ + @Override public final short shortValue() { @@ -154,5 +167,5 @@ } - /** Checks if this rational number is an Integer, either positive or negative. */ + /** Checks if this {@link Rational} number is an Integer, either positive or negative. */ public boolean isInteger() { @@ -167,4 +180,5 @@ * @return a string representation of the object. */ + @Override @NotNull public String toString() @@ -173,5 +187,5 @@ } - /** Returns the simplest representation of this Rational's value possible. */ + /** Returns the simplest representation of this {@link Rational}'s value possible. */ @NotNull public String toSimpleString(boolean allowDecimal) @@ -211,10 +225,10 @@ /** - * Compares two Rational instances, returning true if they are mathematically + * Compares two {@link Rational} instances, returning true if they are mathematically * equivalent. * - * @param obj the Rational to compare this instance to. + * @param obj the {@link Rational} to compare this instance to. * @return true if instances are mathematically equivalent, otherwise false. Will also - * return false if obj is not an instance of Rational. + * return false if obj is not an instance of {@link Rational}. */ @Override @@ -235,5 +249,5 @@ /** *

- * Simplifies the Rational number.

+ * Simplifies the {@link Rational} number.

*

* Prime number series: 1, 2, 3, 5, 7, 9, 11, 13, 17

@@ -244,5 +258,5 @@ *

* However, generating the prime number series seems to be a hefty task. Perhaps - * it's simpler to check if both d & n are divisible by all numbers from 2 -> + * it's simpler to check if both d & n are divisible by all numbers from 2 {@literal ->} * (Math.min(denominator, numerator) / 2). In doing this, one can check for 2 * and 5 once, then ignore all even numbers, and all numbers ending in 0 or 5. @@ -250,13 +264,13 @@ *

* Therefore, the max number of pairs of modulus divisions required will be:

- * 
+     * 

      *    4   Math.min(denominator, numerator) - 1
      *   -- * ------------------------------------ + 2
      *   10                    2
-     * 

+     *
      *   Math.min(denominator, numerator) - 1
      * = ------------------------------------ + 2
      *                  5
-     * 

+     *
* * @return a simplified instance, or if the Rational could not be simplified,