MATH-1671: Remove equals and hashcode implementations

Author: aherbert

commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/AbstractStorelessUnivariateStatistic.java

@@ -155,36 +155,4 @@ public void incrementAll(double[] values, int begin, int length) throws MathIlle
             }
         }
     }
-
-    /**
-     * Returns true iff <code>object</code> is the same type of
-     * {@link StorelessUnivariateStatistic} (the object's class equals this
-     * instance) returning the same values as this for <code>getResult()</code>
-     * and <code>getN()</code>.
-     *
-     * @param object object to test equality against.
-     * @return true if object returns the same value as this
-     */
-    @Override
-    public boolean equals(Object object) {
-        if (object == this ) {
-            return true;
-        }
-        if (object == null || object.getClass() != this.getClass()) {
-            return false;
-        }
-        StorelessUnivariateStatistic stat = (StorelessUnivariateStatistic) object;
-        return Precision.equalsIncludingNaN(stat.getResult(), this.getResult()) &&
-               Precision.equalsIncludingNaN(stat.getN(), this.getN());
-    }
-
-    /**
-     * Returns hash code based on getResult() and getN().
-     *
-     * @return hash code
-     */
-    @Override
-    public int hashCode() {
-        return 31 * (31 + Double.hashCode(getResult())) + Double.hashCode(getN());
-    }
 }

commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/AggregateSummaryStatistics.java

@@ -329,34 +329,5 @@ public void addValue(double value) {
                 aggregateStatistics.addValue(value);
             }
         }
-
-        /**
-         * Returns true iff <code>object</code> is a
-         * <code>SummaryStatistics</code> instance and all statistics have the
-         * same values as this.
-         * @param object the object to test equality against.
-         * @return true if object equals this
-         */
-        @Override
-        public boolean equals(Object object) {
-            if (object == this) {
-                return true;
-            }
-            if (!(object instanceof AggregatingSummaryStatistics)) {
-                return false;
-            }
-            AggregatingSummaryStatistics stat = (AggregatingSummaryStatistics)object;
-            return super.equals(stat) &&
-                   aggregateStatistics.equals(stat.aggregateStatistics);
-        }
-
-        /**
-         * Returns hash code based on values of statistics.
-         * @return hash code
-         */
-        @Override
-        public int hashCode() {
-            return 123 + super.hashCode() + aggregateStatistics.hashCode();
-        }
     }
 }

commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/MultivariateSummaryStatistics.java

@@ -362,54 +362,6 @@ public void clear() {
         covarianceImpl.clear();
     }
 
-    /**
-     * Returns true iff <code>object</code> is a <code>MultivariateSummaryStatistics</code>
-     * instance and all statistics have the same values as this.
-     * @param object the object to test equality against.
-     * @return true if object equals this
-     */
-    @Override
-    public boolean equals(Object object) {
-        if (object == this ) {
-            return true;
-        }
-        if (!(object instanceof MultivariateSummaryStatistics)) {
-            return false;
-        }
-        MultivariateSummaryStatistics stat = (MultivariateSummaryStatistics) object;
-        return MathArrays.equalsIncludingNaN(stat.getGeometricMean(), getGeometricMean()) &&
-               MathArrays.equalsIncludingNaN(stat.getMax(),           getMax())           &&
-               MathArrays.equalsIncludingNaN(stat.getMean(),          getMean())          &&
-               MathArrays.equalsIncludingNaN(stat.getMin(),           getMin())           &&
-               Precision.equalsIncludingNaN(stat.getN(),             getN())             &&
-               MathArrays.equalsIncludingNaN(stat.getSum(),           getSum())           &&
-               MathArrays.equalsIncludingNaN(stat.getSumSq(),         getSumSq())         &&
-               MathArrays.equalsIncludingNaN(stat.getSumLog(),        getSumLog())        &&
-               stat.getCovariance().equals( getCovariance());
-    }
-
-    /**
-     * Returns hash code based on values of statistics.
-     *
-     * @return hash code
-     */
-    @Override
-    public int hashCode() {
-        // This does not have to use all the statistics.
-        // Here we avoid duplicate use of stats that are related.
-        // - sum-of-logs; geometric mean
-        // - mean; sum + n
-        // - variance; sum-of-squares + sum + n
-        int result = 31 + Arrays.hashCode(getSumLog());
-        result = result * 31 + Arrays.hashCode(getMax());
-        result = result * 31 + Arrays.hashCode(getMin());
-        result = result * 31 + Double.hashCode(getN());
-        result = result * 31 + Arrays.hashCode(getSum());
-        result = result * 31 + Arrays.hashCode(getSumSq());
-        result = result * 31 + getCovariance().hashCode();
-        return result;
-    }
-
     // Getters and setters for statistics implementations
     /**
      * Sets statistics implementations.

commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/ResizableDoubleArray.java

@@ -794,53 +794,4 @@ private boolean shouldContract() {
     public ResizableDoubleArray copy() {
         return new ResizableDoubleArray(this);
     }
-
-    /**
-     * Returns true iff object is a ResizableDoubleArray with the same properties
-     * as this and an identical internal storage array.
-     *
-     * @param object object to be compared for equality with this
-     * @return true iff object is a ResizableDoubleArray with the same data and
-     * properties as this
-     * @since 2.0
-     */
-    @Override
-    public boolean equals(Object object) {
-        if (object == this ) {
-            return true;
-        }
-        if (!(object instanceof ResizableDoubleArray)) {
-            return false;
-        }
-        boolean result = true;
-        final ResizableDoubleArray other = (ResizableDoubleArray) object;
-        result = result && other.contractionCriterion == contractionCriterion;
-        result = result && other.expansionFactor == expansionFactor;
-        result = result && other.expansionMode == expansionMode;
-        result = result && other.numElements == numElements;
-        result = result && other.startIndex == startIndex;
-        if (!result) {
-            return false;
-        } else {
-            return Arrays.equals(internalArray, other.internalArray);
-        }
-    }
-
-    /**
-     * Returns a hash code consistent with equals.
-     *
-     * @return the hash code representing this {@code ResizableDoubleArray}.
-     * @since 2.0
-     */
-    @Override
-    public int hashCode() {
-        final int[] hashData = new int[6];
-        hashData[0] = Double.valueOf(expansionFactor).hashCode();
-        hashData[1] = Double.valueOf(contractionCriterion).hashCode();
-        hashData[2] = expansionMode.hashCode();
-        hashData[3] = Arrays.hashCode(internalArray);
-        hashData[4] = numElements;
-        hashData[5] = startIndex;
-        return Arrays.hashCode(hashData);
-    }
 }

commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/StatisticalSummaryValues.java

@@ -120,47 +120,6 @@ public double getVariance() {
         return variance;
     }
 
-    /**
-     * Returns true iff <code>object</code> is a
-     * <code>StatisticalSummaryValues</code> instance and all statistics have
-     *  the same values as this.
-     *
-     * @param object the object to test equality against.
-     * @return true if object equals this
-     */
-    @Override
-    public boolean equals(Object object) {
-        if (object == this ) {
-            return true;
-        }
-        if (!(object instanceof StatisticalSummaryValues)) {
-            return false;
-        }
-        StatisticalSummaryValues stat = (StatisticalSummaryValues) object;
-        return Precision.equalsIncludingNaN(stat.getMax(),      getMax())  &&
-               Precision.equalsIncludingNaN(stat.getMean(),     getMean()) &&
-               Precision.equalsIncludingNaN(stat.getMin(),      getMin())  &&
-               Precision.equalsIncludingNaN(stat.getN(),        getN())    &&
-               Precision.equalsIncludingNaN(stat.getSum(),      getSum())  &&
-               Precision.equalsIncludingNaN(stat.getVariance(), getVariance());
-    }
-
-    /**
-     * Returns hash code based on values of statistics.
-     *
-     * @return hash code
-     */
-    @Override
-    public int hashCode() {
-        int result = 31 + Double.hashCode(getMax());
-        result = result * 31 + Double.hashCode(getMean());
-        result = result * 31 + Double.hashCode(getMin());
-        result = result * 31 + Double.hashCode(getN());
-        result = result * 31 + Double.hashCode(getSum());
-        result = result * 31 + Double.hashCode(getVariance());
-        return result;
-    }
-
     /**
      * Generates a text report displaying values of statistics.
      * Each statistic is displayed on a separate line.

commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/SummaryStatistics.java

@@ -307,47 +307,6 @@ private static void clear(StorelessUnivariateStatistic s) {
         }
     }
 
-    /**
-     * Returns true iff <code>object</code> is a
-     * <code>SummaryStatistics</code> instance and all statistics have the
-     * same values as this.
-     * @param object the object to test equality against.
-     * @return true if object equals this
-     */
-    @Override
-    public boolean equals(Object object) {
-        if (object == this) {
-            return true;
-        }
-        if (!(object instanceof SummaryStatistics)) {
-            return false;
-        }
-        SummaryStatistics stat = (SummaryStatistics)object;
-        return Precision.equalsIncludingNaN(stat.getMax(),           getMax())           &&
-               Precision.equalsIncludingNaN(stat.getMean(),          getMean())          &&
-               Precision.equalsIncludingNaN(stat.getMin(),           getMin())           &&
-               Precision.equalsIncludingNaN(stat.getN(),             getN())             &&
-               Precision.equalsIncludingNaN(stat.getSum(),           getSum())           &&
-               Precision.equalsIncludingNaN(stat.getVariance(),      getVariance());
-    }
-
-    /**
-     * Returns hash code based on values of statistics.
-     * @return hash code
-     */
-    @Override
-    public int hashCode() {
-        // This does not have to use all the statistics.
-        // Here we avoid duplicate use of stats that are related.
-        // - mean; sum + n
-        int result = 31 + Double.hashCode(getMax());
-        result = result * 31 + Double.hashCode(getMin());
-        result = result * 31 + Double.hashCode(getN());
-        result = result * 31 + Double.hashCode(getSum());
-        result = result * 31 + Double.hashCode(getVariance());
-        return result;
-    }
-
     // Getters and setters for statistics implementations
 
     /**

commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/SynchronizedMultivariateSummaryStatistics.java

@@ -156,22 +156,6 @@ public synchronized void clear() {
         super.clear();
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public synchronized boolean equals(Object object) {
-        return super.equals(object);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public synchronized int hashCode() {
-        return super.hashCode();
-    }
-
     /**
      * {@inheritDoc}
      */

commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/SynchronizedSummaryStatistics.java

@@ -138,22 +138,6 @@ public synchronized void clear() {
         super.clear();
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public synchronized boolean equals(Object object) {
-        return super.equals(object);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public synchronized int hashCode() {
-        return super.hashCode();
-    }
-
     /**
      * {@inheritDoc}
      */

commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/moment/VectorialCovariance.java

@@ -110,38 +110,4 @@ public void clear() {
         Arrays.fill(sums, 0.0);
         Arrays.fill(productsSums, 0.0);
     }
-
-    /** {@inheritDoc} */
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (isBiasCorrected ? 1231 : 1237);
-        result = prime * result + (int) (n ^ (n >>> 32));
-        result = prime * result + Arrays.hashCode(productsSums);
-        result = prime * result + Arrays.hashCode(sums);
-        return result;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof VectorialCovariance)) {
-            return false;
-        }
-        VectorialCovariance other = (VectorialCovariance) obj;
-        if (isBiasCorrected != other.isBiasCorrected) {
-            return false;
-        }
-        if (n != other.n) {
-            return false;
-        }
-        if (!Arrays.equals(productsSums, other.productsSums)) {
-            return false;
-        }
-        return Arrays.equals(sums, other.sums);
-    }
 }

commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/moment/VectorialMean.java

@@ -74,26 +74,4 @@ public double[] getResult() {
     public long getN() {
         return (means.length == 0) ? 0 : n;
     }
-
-    /** {@inheritDoc} */
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + Arrays.hashCode(getResult());
-        return result;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof VectorialMean)) {
-            return false;
-        }
-        VectorialMean other = (VectorialMean) obj;
-        return Arrays.equals(getResult(), other.getResult());
-    }
 }