Merge branch 'master' of https://github.com/tweimer/java-matrix into development

Author: tweimer

src/jama2/Matrix.java

@@ -86,20 +86,19 @@ public static Matrix constructWithCopy(final double A[][])
     {
         final int m = A.length;
         final int n = A[0].length;
-        final Matrix X = new Matrix(m, n);
-        final double[][] C = X.getArray();
-        for (int i = 0; i < m; i++)
+        final double C[][] = new double[m][];
+        for (int i = 0; i < C.length; i++)
         {
-            if (A[i].length != n)
-            {
-                throw new IllegalArgumentException("All rows must have the same length."); //$NON-NLS-1$
-            }
-            for (int j = 0; j < n; j++)
-            {
-                C[i][j] = A[i][j];
-            }
+			if (A[i].length != n)
+			{
+				throw new IllegalArgumentException("All rows must have the same length."); //$NON-NLS-1$
+			}
+			else
+			{
+				C[i] = Arrays.copyOf(A[i], n);
+			}
         }
-        return X;
+        return new Matrix(m, n, C);
     }
 
     /**
@@ -713,10 +712,10 @@ public double[][] getArray()
      */
     public double[][] getArrayCopy()
     {
-        final double C[][] = new double[this.A.length][];
+        final double C[][] = new double[this.m][];
         for (int i = 0; i < C.length; i++)
         {
-            C[i] = Arrays.copyOf(this.A[i], this.A[i].length);
+            C[i] = Arrays.copyOf(this.A[i], this.n);
         }
         return C;
     }

src/jama2/QRDecomposition.java

@@ -221,10 +221,11 @@ else if (!this.isFullRank())
         }
 
         // Copy right hand side
-        final int nx = B.getColumnDimension();
-        final double[][] X = B.getArrayCopy();
+        final Matrix M = new Matrix(B);
+        final double[][] X = M.getArray();
 
         // Compute Y = transpose(Q)*B
+        final int nx = B.getColumnDimension();
         for (int k = 0; k < this.n; k++)
         {
             for (int j = 0; j < nx; j++)
@@ -256,6 +257,6 @@ else if (!this.isFullRank())
                 }
             }
         }
-        return new Matrix(this.n, nx, X).getMatrix(0, this.n - 1, 0, nx - 1);
+        return M.getMatrix(0, this.n - 1, 0, nx - 1);
     }
 }