X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fmath%2FMatrix.java;h=b22bf4e1d27558fc09c6e59e64a45733f12d75cf;hb=187269da0130408d24901c88acb10c217f6284f9;hp=1e8f39d75718cbafae264f6c529a1cc7d555ed1e;hpb=d90895bf6eed41ff1b2d413306afae3cac458756;p=jalview.git diff --git a/src/jalview/math/Matrix.java b/src/jalview/math/Matrix.java index 1e8f39d..b22bf4e 100755 --- a/src/jalview/math/Matrix.java +++ b/src/jalview/math/Matrix.java @@ -985,12 +985,6 @@ public class Matrix implements MatrixI e = v; } - @Override - public int hashCode() - { - return (int) getTotal(); - } - public double getTotal() { double d = 0d; @@ -1004,15 +998,14 @@ public class Matrix implements MatrixI return d; } + /** + * {@inheritDoc} + */ @Override - public boolean equals(Object obj) + public boolean equals(MatrixI m2, double delta) { - if (!(obj instanceof MatrixI)) - { - return false; - } - MatrixI m2 = (MatrixI) obj; - if (this.height() != m2.height() || this.width() != m2.width()) + if (m2 == null || this.height() != m2.height() + || this.width() != m2.width()) { return false; } @@ -1020,7 +1013,8 @@ public class Matrix implements MatrixI { for (int j = 0; j < this.width(); j++) { - if (this.getValue(i, j) != m2.getValue(i, j)) + double diff = this.getValue(i, j) - m2.getValue(i, j); + if (Math.abs(diff) > delta) { return false; }