Merge v0.1.0 into develop

1 files changed, 28 insertions, 1 deletions

diff --git a/src/unitConverter/unit/BaseUnit.java b/src/unitConverter/unit/BaseUnit.java
index 204b1cd..fe36c45 100755
--- a/src/unitConverter/unit/BaseUnit.java
+++ b/src/unitConverter/unit/BaseUnit.java
@@ -26,12 +26,14 @@ import unitConverter.dimension.UnitDimension;
  * 
  * @author Adrien Hopkins
  * @since 2018-12-23
+ * @since v0.1.0
  */
 public final class BaseUnit extends AbstractUnit {
 	/**
 	 * Is this unit a full base (i.e. m, s, ... but not N, J, ...)
 	 * 
 	 * @since 2019-01-15
+	 * @since v0.1.0
 	 */
 	private final boolean isFullBase;
 
@@ -47,6 +49,7 @@ public final class BaseUnit extends AbstractUnit {
 	 * @param symbol
 	 *            symbol of unit
 	 * @since 2018-12-23
+	 * @since v0.1.0
 	 */
 	BaseUnit(final UnitDimension dimension, final UnitSystem system) {
 		super(dimension, system);
@@ -56,6 +59,7 @@ public final class BaseUnit extends AbstractUnit {
 	/**
 	 * @return this unit as a {@code LinearUnit}
 	 * @since 2019-01-25
+	 * @since v0.1.0
 	 */
 	public LinearUnit asLinearUnit() {
 		return this.times(1);
@@ -82,6 +86,7 @@ public final class BaseUnit extends AbstractUnit {
 	 * @throws NullPointerException
 	 *             if other is null
 	 * @since 2018-12-22
+	 * @since v0.1.0
 	 */
 	public BaseUnit dividedBy(final BaseUnit other) {
 		Objects.requireNonNull(other, "other must not be null.");
@@ -97,11 +102,30 @@ public final class BaseUnit extends AbstractUnit {
 	 *            amount to divide by
 	 * @return quotient
 	 * @since 2018-12-23
+	 * @since v0.1.0
 	 */
 	public LinearUnit dividedBy(final double divisor) {
 		return new LinearUnit(this, 1 / divisor);
 	}
 
+	@Override
+	public boolean equals(final Object obj) {
+		if (!(obj instanceof BaseUnit))
+			return false;
+		final BaseUnit other = (BaseUnit) obj;
+		return Objects.equals(this.getSystem(), other.getSystem())
+				&& Objects.equals(this.getDimension(), other.getDimension());
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = result * prime + this.getSystem().hashCode();
+		result = result * prime + this.getDimension().hashCode();
+		return result;
+	}
+
 	/**
 	 * Multiplies this unit by another unit.
 	 * 
@@ -113,6 +137,7 @@ public final class BaseUnit extends AbstractUnit {
 	 * @throws NullPointerException
 	 *             if other is null
 	 * @since 2018-12-22
+	 * @since v0.1.0
 	 */
 	public BaseUnit times(final BaseUnit other) {
 		Objects.requireNonNull(other, "other must not be null.");
@@ -127,7 +152,8 @@ public final class BaseUnit extends AbstractUnit {
 	 * @param multiplier
 	 *            amount to multiply by
 	 * @return product
-	 * @since 2018-12-23B
+	 * @since 2018-12-23
+	 * @since v0.1.0
 	 */
 	public LinearUnit times(final double multiplier) {
 		return new LinearUnit(this, multiplier);
@@ -140,6 +166,7 @@ public final class BaseUnit extends AbstractUnit {
 	 *            exponent
 	 * @return result of exponentiation
 	 * @since 2019-01-15
+	 * @since v0.1.0
 	 */
 	public BaseUnit toExponent(final int exponent) {
 		return this.getSystem().getBaseUnit(this.getDimension().toExponent(exponent));