git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug/JAL-3541_cherry_pick_to_releases_Release_2_11_1_Branch' into task...
[jalview.git]
/
src
/
jalview
/
math
/
Matrix.java
diff --git
a/src/jalview/math/Matrix.java
b/src/jalview/math/Matrix.java
index
1e8f39d
..
b22bf4e
100755
(executable)
--- a/
src/jalview/math/Matrix.java
+++ b/
src/jalview/math/Matrix.java
@@
-985,12
+985,6
@@
public class Matrix implements MatrixI
e = v;
}
e = v;
}
- @Override
- public int hashCode()
- {
- return (int) getTotal();
- }
-
public double getTotal()
{
double d = 0d;
public double getTotal()
{
double d = 0d;
@@
-1004,15
+998,14
@@
public class Matrix implements MatrixI
return d;
}
return d;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
@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;
}
{
return false;
}
@@
-1020,7
+1013,8
@@
public class Matrix implements MatrixI
{
for (int j = 0; j < this.width(); j++)
{
{
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;
}
{
return false;
}