X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fmath%2FMatrix.java;h=b39d3c91070fe4905561d1c1d36227e65534cc6f;hb=94ed46d6216e3b3fd195144660815396e6c42683;hp=821fc664a0c3134003248d0aec828d019452bff6;hpb=a581eb571426fb19c6b3421eebaedd90c63bb630;p=jalview.git

diff --git a/src/jalview/math/Matrix.java b/src/jalview/math/Matrix.java
index 821fc66..b39d3c9 100755
--- a/src/jalview/math/Matrix.java
+++ b/src/jalview/math/Matrix.java
@@ -65,7 +65,8 @@ public class Matrix implements MatrixI
   }
   
   /**
-   * Creates a new Matrix object. For example
+   * Creates a new Matrix object containing a copy of the supplied array values.
+   * For example
    * 
    * <pre>
    *   new Matrix(new double[][] {{2, 3, 4}, {5, 6, 7})
@@ -85,13 +86,27 @@ public class Matrix implements MatrixI
   {
     this.rows = values.length;
     this.cols = this.rows == 0 ? 0 : values[0].length;
-    this.value = values;
+
+    /*
+     * make a copy of the values array, for immutability
+     */
+    this.value = new double[rows][];
+    int i = 0;
+    for (double[] row : values)
+    {
+      if (row != null)
+      {
+        value[i] = new double[row.length];
+        System.arraycopy(row, 0, value[i], 0, row.length);
+      }
+      i++;
+    }
   }
 
   /**
    * Returns a new matrix which is the transpose of this one
    * 
-   * @return DOCUMENT ME!
+   * @return
    */
   @Override
   public MatrixI transpose()
@@ -959,11 +974,12 @@ public class Matrix implements MatrixI
   }
 
   /**
-   * Multiply every entry in the matrix by the given value. This method is not
-   * thread-safe.
+   * Multiplies every entry in the matrix by the given value.
+   * 
+   * @param
    */
   @Override
-  public void multiply(double d)
+  public void multiply(double by)
   {
     for (double[] row : value)
     {
@@ -971,7 +987,7 @@ public class Matrix implements MatrixI
       {
         for (int i = 0; i < row.length; i++)
         {
-          row[i] *= d;
+          row[i] *= by;
         }
       }
     }