svn commit: r1059367 - in /mahout/trunk: core/src/main/java/org/apache/mahout/math/DenseMatrixWritable.java math/src/main/java/org/apache/mahout/math/DenseMatrix.java math/src/main/java/org/apache/mahout/math/DenseVector.java

[sr...@apache.org]

Author: srowen
Date: Sat Jan 15 16:36:30 2011
New Revision: 1059367

URL: http://svn.apache.org/viewvc?rev=1059367&view=rev
Log:
MAHOUT-435

Removed:
    mahout/trunk/core/src/main/java/org/apache/mahout/math/DenseMatrixWritable.java
Modified:
    mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseMatrix.java
    mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseVector.java

Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseMatrix.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseMatrix.java?rev=1059367&r1=1059366&r2=1059367&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseMatrix.java (original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseMatrix.java Sat Jan 15 16:36:30 2011
@@ -21,7 +21,8 @@ import java.util.Arrays;
 
 /** Matrix of doubles implemented using a 2-d array */
 public class DenseMatrix extends AbstractMatrix {
-  protected double[][] values;
+
+  private double[][] values;
 
   public DenseMatrix() {
   }
@@ -121,6 +122,18 @@ public class DenseMatrix extends Abstrac
     return this;
   }
   
+  public Matrix assign(DenseMatrix matrix) {
+    // make sure the data field has the correct length
+    if (matrix.values[0].length != this.values[0].length || matrix.values.length != this.values.length) {
+      this.values = new double[matrix.values.length][matrix.values[0].length];
+    }
+    // now copy the values
+    for (int i = 0; i < this.values.length; i++) {
+      System.arraycopy(matrix.values[i], 0, this.values[i], 0, this.values[0].length);
+    }
+    return this;
+  }
+  
   public Matrix assignColumn(int column, Vector other) {
     if (rowSize() != other.size()) {
       throw new CardinalityException(rowSize(), other.size());

Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseVector.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseVector.java?rev=1059367&r1=1059366&r2=1059367&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseVector.java (original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseVector.java Sat Jan 15 16:36:30 2011
@@ -144,6 +144,16 @@ public class DenseVector extends Abstrac
     return this;
   }
 
+  public Vector assign(DenseVector vector) {
+    // make sure the data field has the correct length
+    if (vector.values.length != this.values.length) {
+      this.values = new double[vector.values.length];
+    }
+    // now copy the values
+    System.arraycopy(vector.values, 0, this.values, 0, this.values.length);
+    return this;
+  }
+
   public int getNumNondefaultElements() {
     return values.length;
   }