X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fmath%2FMatrix.java;h=ad914646549386777670575772c86b2b85f5604b;hb=85299bc2db43c8b108169661ebc1c4d9b2d3d2e5;hp=77862c86af5feabe4081151aacc61f2bc5f238d6;hpb=97fbcf746cdd6c998871adcf8e737d43e5307387;p=jalview.git diff --git a/src/jalview/math/Matrix.java b/src/jalview/math/Matrix.java index 77862c8..ad91464 100755 --- a/src/jalview/math/Matrix.java +++ b/src/jalview/math/Matrix.java @@ -464,7 +464,7 @@ public class Matrix implements MatrixI } else { - // System.out.println("Iteration " + iter); + // jalview.bin.Console.outPrintln("Iteration " + iter); } g = (d[l] - d[l - 1]) / (2.0 * e[l - 1]); @@ -728,7 +728,7 @@ public class Matrix implements MatrixI } else { - // System.out.println("Iteration " + iter); + // jalview.bin.Console.outPrintln("Iteration " + iter); } g = (d[l] - d[l - 1]) / (2.0 * e[l - 1]); @@ -984,4 +984,42 @@ public class Matrix implements MatrixI { e = v; } + + public double getTotal() + { + double d = 0d; + for (int i = 0; i < this.height(); i++) + { + for (int j = 0; j < this.width(); j++) + { + d += value[i][j]; + } + } + return d; + } + + /** + * {@inheritDoc} + */ + @Override + public boolean equals(MatrixI m2, double delta) + { + if (m2 == null || this.height() != m2.height() + || this.width() != m2.width()) + { + return false; + } + for (int i = 0; i < this.height(); i++) + { + for (int j = 0; j < this.width(); j++) + { + double diff = this.getValue(i, j) - m2.getValue(i, j); + if (Math.abs(diff) > delta) + { + return false; + } + } + } + return true; + } }