X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fmath%2FMatrixI.java;h=e98007e5b084cf243c3d5919599a2a4ff7d13984;hb=747167089ecf8d6afc70d417f5a20352e029bd95;hp=d7a1b70b4e5c659fed8e28505cbed9d1ebcacb00;hpb=df1447b81289138e8bd0caaf7c7117ad71f74f29;p=jalview.git
diff --git a/src/jalview/math/MatrixI.java b/src/jalview/math/MatrixI.java
index d7a1b70..e98007e 100644
--- a/src/jalview/math/MatrixI.java
+++ b/src/jalview/math/MatrixI.java
@@ -1,7 +1,31 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see
+ * This method simply returns the result of in.preMultiply(this) + * + * @param in + * + * @return + * @throws IllegalArgumentException + * if the number of rows in the post-multiplier is not equal to the + * number of columns in the multiplicand (this) + * @see #preMultiply(Matrix) + */ MatrixI postMultiply(MatrixI m); double[] getD(); double[] getE(); + void setD(double[] v); + + void setE(double[] v); + void print(PrintStream ps, String format); void printD(PrintStream ps, String format); @@ -72,13 +137,13 @@ public interface MatrixI *
* If parameter maxToZero
is true, then the maximum value becomes
* zero, i.e. all values are subtracted from the maximum. This is consistent
- * with converting a similarity score to a distance score - the most similar
- * (identity) corresponds to zero distance. However note that the operation is
- * not reversible (unless the original minimum value is zero). For example a
- * range of 10-40 would become 30-0, which would reverse a second time to
- * 0-30. Also note that a similarity measure (such as BLOSUM) may give
- * different identity scores for different sequences, so they cannot all
- * convert to zero distance.
+ * with converting an identity similarity score to a distance score - the most
+ * similar (identity) corresponds to zero distance. However note that the
+ * operation is not reversible (unless the original minimum value is zero).
+ * For example a range of 10-40 would become 30-0, which would reverse a
+ * second time to 0-30. Also note that a general similarity measure (such as
+ * BLOSUM) may give different 'identity' scores for different sequences, so
+ * they cannot all convert to zero distance.
*
* If parameter maxToZero
is false, then the values are reflected
* about the average of {min, max} (effectively swapping min and max). This
@@ -87,4 +152,22 @@ public interface MatrixI
* @param maxToZero
*/
void reverseRange(boolean maxToZero);
+
+ /**
+ * Multiply all entries by the given value
+ *
+ * @param d
+ */
+ void multiply(double d);
+
+ /**
+ * Answers true if the two matrices have the same dimensions, and
+ * corresponding values all differ by no more than delta (which should be a
+ * positive value), else false
+ *
+ * @param m2
+ * @param delta
+ * @return
+ */
+ boolean equals(MatrixI m2, double delta);
}