You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by gs...@apache.org on 2009/12/18 00:22:41 UTC
svn commit: r891983 [2/47] - in /lucene/mahout/trunk: ./ core/
core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/
core/src/main/java/org/apache/mahout/clustering/
core/src/main/java/org/apache/mahout/clustering/canopy/
core/src/main/java/org/ap...
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java Thu Dec 17 23:22:16 2009
@@ -36,8 +36,8 @@
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.SequenceFileInputFormat;
import org.apache.hadoop.mapred.SequenceFileOutputFormat;
-import org.apache.mahout.matrix.SparseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.SparseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.CommandLineUtil;
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.common.distance.SquaredEuclideanDistanceMeasure;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansInfo.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansInfo.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansInfo.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansInfo.java Thu Dec 17 23:22:16 2009
@@ -18,8 +18,8 @@
package org.apache.mahout.clustering.kmeans;
import org.apache.hadoop.io.Writable;
-import org.apache.mahout.matrix.AbstractVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.AbstractVector;
+import org.apache.mahout.math.Vector;
import java.io.DataInput;
import java.io.DataOutput;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansMapper.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansMapper.java Thu Dec 17 23:22:16 2009
@@ -24,7 +24,7 @@
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reporter;
import org.apache.mahout.common.distance.DistanceMeasure;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import java.io.IOException;
import java.util.ArrayList;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/RandomSeedGenerator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/RandomSeedGenerator.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/RandomSeedGenerator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/RandomSeedGenerator.java Thu Dec 17 23:22:16 2009
@@ -23,7 +23,7 @@
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapred.JobConf;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java Thu Dec 17 23:22:16 2009
@@ -39,7 +39,7 @@
import org.apache.hadoop.mapreduce.lib.input.SequenceFileInputFormat;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat;
-import org.apache.mahout.matrix.DenseMatrix;
+import org.apache.mahout.math.DenseMatrix;
import org.apache.mahout.common.CommandLineUtil;
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.common.RandomUtils;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAInference.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAInference.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAInference.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAInference.java Thu Dec 17 23:22:16 2009
@@ -22,11 +22,11 @@
import java.util.Map;
import org.apache.commons.math.special.Gamma;
-import org.apache.mahout.matrix.BinaryFunction;
-import org.apache.mahout.matrix.DenseMatrix;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Matrix;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.BinaryFunction;
+import org.apache.mahout.math.DenseMatrix;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Matrix;
+import org.apache.mahout.math.Vector;
/**
* Class for performing infererence on a document, which involves
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAMapper.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAMapper.java Thu Dec 17 23:22:16 2009
@@ -25,7 +25,7 @@
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
/**
* Runs inference on the input documents (which are
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAState.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAState.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAState.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAState.java Thu Dec 17 23:22:16 2009
@@ -16,7 +16,7 @@
*/
package org.apache.mahout.clustering.lda;
-import org.apache.mahout.matrix.Matrix;
+import org.apache.mahout.math.Matrix;
public class LDAState {
public final int numTopics;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java Thu Dec 17 23:22:16 2009
@@ -21,12 +21,12 @@
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import org.apache.mahout.clustering.ClusterBase;
-import org.apache.mahout.matrix.AbstractVector;
-import org.apache.mahout.matrix.CardinalityException;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.JsonVectorAdapter;
-import org.apache.mahout.matrix.PlusFunction;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.AbstractVector;
+import org.apache.mahout.math.CardinalityException;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.JsonVectorAdapter;
+import org.apache.mahout.math.PlusFunction;
+import org.apache.mahout.math.Vector;
import java.io.DataInput;
import java.io.DataOutput;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java Thu Dec 17 23:22:16 2009
@@ -9,7 +9,7 @@
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
public class MeanShiftCanopyClusterer {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/CosineDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/CosineDistanceMeasure.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/CosineDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/CosineDistanceMeasure.java Thu Dec 17 23:22:16 2009
@@ -18,8 +18,8 @@
package org.apache.mahout.common.distance;
import org.apache.hadoop.mapred.JobConf;
-import org.apache.mahout.matrix.CardinalityException;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.CardinalityException;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.parameters.Parameter;
import java.util.Collection;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/DistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/DistanceMeasure.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/DistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/DistanceMeasure.java Thu Dec 17 23:22:16 2009
@@ -17,7 +17,7 @@
package org.apache.mahout.common.distance;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.parameters.Parametered;
/** This interface is used for objects which can determine a distance metric between two points */
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/EuclideanDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/EuclideanDistanceMeasure.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/EuclideanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/EuclideanDistanceMeasure.java Thu Dec 17 23:22:16 2009
@@ -17,7 +17,7 @@
package org.apache.mahout.common.distance;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
/**
* This class implements a Euclidean distance metric by summing the square root of the squared differences between each
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/ManhattanDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/ManhattanDistanceMeasure.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/ManhattanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/ManhattanDistanceMeasure.java Thu Dec 17 23:22:16 2009
@@ -18,8 +18,8 @@
package org.apache.mahout.common.distance;
import org.apache.hadoop.mapred.JobConf;
-import org.apache.mahout.matrix.CardinalityException;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.CardinalityException;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.parameters.Parameter;
import java.util.Collection;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/SquaredEuclideanDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/SquaredEuclideanDistanceMeasure.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/SquaredEuclideanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/SquaredEuclideanDistanceMeasure.java Thu Dec 17 23:22:16 2009
@@ -18,8 +18,8 @@
package org.apache.mahout.common.distance;
import org.apache.hadoop.mapred.JobConf;
-import org.apache.mahout.matrix.CardinalityException;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.CardinalityException;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.parameters.Parameter;
import java.util.Collection;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/TanimotoDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/TanimotoDistanceMeasure.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/TanimotoDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/TanimotoDistanceMeasure.java Thu Dec 17 23:22:16 2009
@@ -17,7 +17,7 @@
package org.apache.mahout.common.distance;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import java.util.Iterator;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedDistanceMeasure.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedDistanceMeasure.java Thu Dec 17 23:22:16 2009
@@ -20,8 +20,8 @@
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobConf;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.parameters.ClassParameter;
import org.apache.mahout.common.parameters.Parameter;
import org.apache.mahout.common.parameters.PathParameter;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedEuclideanDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedEuclideanDistanceMeasure.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedEuclideanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedEuclideanDistanceMeasure.java Thu Dec 17 23:22:16 2009
@@ -17,7 +17,7 @@
package org.apache.mahout.common.distance;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import java.util.Iterator;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedManhattanDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedManhattanDistanceMeasure.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedManhattanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedManhattanDistanceMeasure.java Thu Dec 17 23:22:16 2009
@@ -17,7 +17,7 @@
package org.apache.mahout.common.distance;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import java.util.Iterator;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataConverter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataConverter.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataConverter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataConverter.java Thu Dec 17 23:22:16 2009
@@ -21,7 +21,7 @@
import java.util.Arrays;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.mahout.matrix.DenseVector;
+import org.apache.mahout.math.DenseVector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java Thu Dec 17 23:22:16 2009
@@ -27,7 +27,7 @@
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.mahout.df.data.Dataset.Attribute;
-import org.apache.mahout.matrix.DenseVector;
+import org.apache.mahout.math.DenseVector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Instance.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Instance.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Instance.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Instance.java Thu Dec 17 23:22:16 2009
@@ -17,7 +17,7 @@
package org.apache.mahout.df.data;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
/**
* Represents one data instance.
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/ClusteringTestUtils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/ClusteringTestUtils.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/ClusteringTestUtils.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/ClusteringTestUtils.java Thu Dec 17 23:22:16 2009
@@ -22,8 +22,8 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.SequenceFile;
-import org.apache.mahout.matrix.SparseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.SparseVector;
+import org.apache.mahout.math.Vector;
import java.io.File;
import java.io.IOException;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java Thu Dec 17 23:22:16 2009
@@ -27,8 +27,8 @@
import org.apache.hadoop.mapred.Reducer;
import org.apache.hadoop.mapred.lib.IdentityReducer;
import org.apache.mahout.clustering.ClusteringTestUtils;
-import org.apache.mahout.matrix.SparseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.SparseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.DummyOutputCollector;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java Thu Dec 17 23:22:16 2009
@@ -17,7 +17,7 @@
package org.apache.mahout.clustering.canopy;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import java.util.ArrayList;
import java.util.List;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/JsonModelHolderAdapter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/JsonModelHolderAdapter.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/JsonModelHolderAdapter.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/JsonModelHolderAdapter.java Thu Dec 17 23:22:16 2009
@@ -28,7 +28,7 @@
import com.google.gson.JsonSerializer;
import com.google.gson.reflect.TypeToken;
import org.apache.mahout.clustering.dirichlet.models.Model;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import java.lang.reflect.Type;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDirichletClustering.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDirichletClustering.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDirichletClustering.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDirichletClustering.java Thu Dec 17 23:22:16 2009
@@ -22,8 +22,8 @@
import org.apache.mahout.clustering.dirichlet.models.Model;
import org.apache.mahout.clustering.dirichlet.models.NormalModelDistribution;
import org.apache.mahout.clustering.dirichlet.models.SampledNormalDistribution;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
import java.util.ArrayList;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDistributions.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDistributions.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDistributions.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDistributions.java Thu Dec 17 23:22:16 2009
@@ -18,8 +18,9 @@
package org.apache.mahout.clustering.dirichlet;
import junit.framework.TestCase;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
public class TestDistributions extends TestCase {
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java Thu Dec 17 23:22:16 2009
@@ -33,10 +33,10 @@
import org.apache.mahout.clustering.dirichlet.models.SampledNormalDistribution;
import org.apache.mahout.clustering.dirichlet.models.SampledNormalModel;
import org.apache.mahout.clustering.kmeans.KMeansDriver;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.JsonVectorAdapter;
-import org.apache.mahout.matrix.SparseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.JsonVectorAdapter;
+import org.apache.mahout.math.SparseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.DummyOutputCollector;
import org.apache.mahout.common.RandomUtils;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java Thu Dec 17 23:22:16 2009
@@ -26,8 +26,8 @@
import org.apache.hadoop.mapred.JobConf;
import org.apache.mahout.clustering.ClusteringTestUtils;
import org.apache.mahout.clustering.kmeans.TestKmeansClustering;
-import org.apache.mahout.matrix.SparseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.SparseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.DummyOutputCollector;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java Thu Dec 17 23:22:16 2009
@@ -26,10 +26,10 @@
import org.apache.hadoop.mapred.JobConf;
import org.apache.mahout.clustering.ClusteringTestUtils;
import org.apache.mahout.clustering.canopy.CanopyDriver;
-import org.apache.mahout.matrix.AbstractVector;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.SparseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.AbstractVector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.SparseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.DummyOutputCollector;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java Thu Dec 17 23:22:16 2009
@@ -33,8 +33,8 @@
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapred.JobConf;
import org.apache.mahout.clustering.ClusteringTestUtils;
-import org.apache.mahout.matrix.SparseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.SparseVector;
+import org.apache.mahout.math.Vector;
public class TestRandomSeedGenerator extends TestCase {
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/VisibleCluster.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/VisibleCluster.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/VisibleCluster.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/VisibleCluster.java Thu Dec 17 23:22:16 2009
@@ -17,7 +17,7 @@
package org.apache.mahout.clustering.kmeans;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import java.util.ArrayList;
import java.util.List;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestLDAInference.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestLDAInference.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestLDAInference.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestLDAInference.java Thu Dec 17 23:22:16 2009
@@ -26,10 +26,10 @@
import org.apache.commons.math.distribution.PoissonDistributionImpl;
import org.apache.commons.math.MathException;
-import org.apache.mahout.matrix.DenseMatrix;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Matrix;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseMatrix;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Matrix;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
public class TestLDAInference extends TestCase {
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java Thu Dec 17 23:22:16 2009
@@ -28,10 +28,10 @@
import org.apache.commons.math.MathException;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.Text;
-import org.apache.mahout.matrix.DenseMatrix;
-import org.apache.mahout.matrix.Matrix;
-import org.apache.mahout.matrix.SparseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseMatrix;
+import org.apache.mahout.math.Matrix;
+import org.apache.mahout.math.SparseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
import static org.easymock.classextension.EasyMock.*;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java Thu Dec 17 23:22:16 2009
@@ -25,8 +25,8 @@
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.DummyOutputCollector;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java Thu Dec 17 23:22:16 2009
@@ -18,8 +18,9 @@
package org.apache.mahout.common.distance;
import junit.framework.TestCase;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
public class CosineDistanceMeasureTest extends TestCase {
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java Thu Dec 17 23:22:16 2009
@@ -18,9 +18,10 @@
package org.apache.mahout.common.distance;
import junit.framework.TestCase;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.SparseVector;
-import org.apache.mahout.matrix.Vector;
+
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.SparseVector;
+import org.apache.mahout.math.Vector;
public abstract class DefaultDistanceMeasureTest extends TestCase {
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultWeightedDistanceMeasureTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultWeightedDistanceMeasureTest.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultWeightedDistanceMeasureTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultWeightedDistanceMeasureTest.java Thu Dec 17 23:22:16 2009
@@ -17,8 +17,8 @@
package org.apache.mahout.common.distance;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
public abstract class DefaultWeightedDistanceMeasureTest extends DefaultDistanceMeasureTest {
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/canopy/DisplayCanopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/canopy/DisplayCanopy.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/canopy/DisplayCanopy.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/canopy/DisplayCanopy.java Thu Dec 17 23:22:16 2009
@@ -25,8 +25,8 @@
import org.apache.mahout.clustering.dirichlet.DisplayDirichlet;
import org.apache.mahout.clustering.dirichlet.models.NormalModelDistribution;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.distance.ManhattanDistanceMeasure;
import org.apache.mahout.common.RandomUtils;
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/Display2dASNDirichlet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/Display2dASNDirichlet.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/Display2dASNDirichlet.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/Display2dASNDirichlet.java Thu Dec 17 23:22:16 2009
@@ -24,8 +24,8 @@
import org.apache.mahout.clustering.dirichlet.models.AsymmetricSampledNormalDistribution;
import org.apache.mahout.clustering.dirichlet.models.AsymmetricSampledNormalModel;
import org.apache.mahout.clustering.dirichlet.models.Model;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
class Display2dASNDirichlet extends DisplayDirichlet {
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNDirichlet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNDirichlet.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNDirichlet.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNDirichlet.java Thu Dec 17 23:22:16 2009
@@ -24,8 +24,8 @@
import org.apache.mahout.clustering.dirichlet.models.AsymmetricSampledNormalDistribution;
import org.apache.mahout.clustering.dirichlet.models.AsymmetricSampledNormalModel;
import org.apache.mahout.clustering.dirichlet.models.Model;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
class DisplayASNDirichlet extends DisplayDirichlet {
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNOutputState.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNOutputState.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNOutputState.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNOutputState.java Thu Dec 17 23:22:16 2009
@@ -30,9 +30,9 @@
import org.apache.mahout.clustering.dirichlet.models.Model;
import org.apache.mahout.clustering.dirichlet.models.NormalModelDistribution;
import org.apache.mahout.clustering.kmeans.KMeansDriver;
-import org.apache.mahout.matrix.AbstractVector;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.AbstractVector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.common.FileLineIterable;
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayDirichlet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayDirichlet.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayDirichlet.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayDirichlet.java Thu Dec 17 23:22:16 2009
@@ -33,9 +33,9 @@
import org.apache.mahout.clustering.dirichlet.models.Model;
import org.apache.mahout.clustering.dirichlet.models.ModelDistribution;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.TimesFunction;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.TimesFunction;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
public class DisplayDirichlet extends Frame {
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayNDirichlet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayNDirichlet.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayNDirichlet.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayNDirichlet.java Thu Dec 17 23:22:16 2009
@@ -24,8 +24,8 @@
import org.apache.mahout.clustering.dirichlet.models.Model;
import org.apache.mahout.clustering.dirichlet.models.NormalModel;
import org.apache.mahout.clustering.dirichlet.models.NormalModelDistribution;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
class DisplayNDirichlet extends DisplayDirichlet {
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayOutputState.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayOutputState.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayOutputState.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayOutputState.java Thu Dec 17 23:22:16 2009
@@ -30,9 +30,9 @@
import org.apache.mahout.clustering.dirichlet.models.NormalModel;
import org.apache.mahout.clustering.dirichlet.models.NormalModelDistribution;
import org.apache.mahout.clustering.kmeans.KMeansDriver;
-import org.apache.mahout.matrix.AbstractVector;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.AbstractVector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.common.FileLineIterable;
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplaySNDirichlet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplaySNDirichlet.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplaySNDirichlet.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplaySNDirichlet.java Thu Dec 17 23:22:16 2009
@@ -24,8 +24,8 @@
import org.apache.mahout.clustering.dirichlet.models.Model;
import org.apache.mahout.clustering.dirichlet.models.NormalModel;
import org.apache.mahout.clustering.dirichlet.models.SampledNormalDistribution;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
class DisplaySNDirichlet extends DisplayDirichlet {
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java Thu Dec 17 23:22:16 2009
@@ -27,8 +27,8 @@
import org.apache.mahout.clustering.canopy.Canopy;
import org.apache.mahout.clustering.dirichlet.DisplayDirichlet;
import org.apache.mahout.clustering.kmeans.Cluster;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.distance.ManhattanDistanceMeasure;
import org.apache.mahout.common.RandomUtils;
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/kmeans/DisplayKMeans.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/kmeans/DisplayKMeans.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/kmeans/DisplayKMeans.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/kmeans/DisplayKMeans.java Thu Dec 17 23:22:16 2009
@@ -26,8 +26,8 @@
import org.apache.mahout.clustering.canopy.Canopy;
import org.apache.mahout.clustering.dirichlet.DisplayDirichlet;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.distance.ManhattanDistanceMeasure;
import org.apache.mahout.common.RandomUtils;
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java Thu Dec 17 23:22:16 2009
@@ -26,8 +26,8 @@
import org.apache.mahout.clustering.dirichlet.DisplayDirichlet;
import org.apache.mahout.clustering.dirichlet.models.NormalModelDistribution;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
import org.apache.mahout.common.RandomUtils;
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java Thu Dec 17 23:22:16 2009
@@ -35,7 +35,7 @@
import org.apache.hadoop.mapred.SequenceFileOutputFormat;
import org.apache.mahout.common.CommandLineUtil;
import org.apache.mahout.common.commandline.DefaultOptionCreator;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,7 +74,7 @@
String input = cmdLine.getValue(inputOpt, "testdata").toString();
String output = cmdLine.getValue(outputOpt, "output").toString();
- String vectorClassName = cmdLine.getValue(vectorOpt, "org.apache.mahout.matrix.SparseVector").toString();
+ String vectorClassName = cmdLine.getValue(vectorOpt, "org.apache.mahout.math.SparseVector").toString();
Class<? extends Vector> vectorClass = (Class<? extends Vector>) Class.forName(vectorClassName);
runJob(input, output, vectorClass);
} catch (OptionException e) {
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java Thu Dec 17 23:22:16 2009
@@ -24,7 +24,7 @@
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reporter;
import org.apache.hadoop.mapred.JobConf;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import java.io.IOException;
import java.util.ArrayList;
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java Thu Dec 17 23:22:16 2009
@@ -34,7 +34,7 @@
import org.apache.mahout.clustering.canopy.CanopyClusteringJob;
import org.apache.mahout.clustering.syntheticcontrol.Constants;
import org.apache.mahout.common.CommandLineUtil;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,7 +96,7 @@
String measureClass = cmdLine.getValue(
measureClassOpt, "org.apache.mahout.common.distance.EuclideanDistanceMeasure").toString();
- String className = cmdLine.getValue(vectorClassOpt, "org.apache.mahout.matrix.SparseVector").toString();
+ String className = cmdLine.getValue(vectorClassOpt, "org.apache.mahout.math.SparseVector").toString();
Class<? extends Vector> vectorClass = Class.forName(className).asSubclass(Vector.class);
double t1 = Double.parseDouble(cmdLine.getValue(t1Opt, "80").toString());
double t2 = Double.parseDouble(cmdLine.getValue(t2Opt, "55").toString());
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java Thu Dec 17 23:22:16 2009
@@ -41,7 +41,7 @@
import org.apache.mahout.clustering.syntheticcontrol.canopy.InputDriver;
import org.apache.mahout.common.CommandLineUtil;
import org.apache.mahout.common.commandline.DefaultOptionCreator;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -102,7 +102,7 @@
int maxIterations = Integer.parseInt(cmdLine.getValue(maxIterOpt, "5").toString());
double alpha_0 = Double.parseDouble(cmdLine.getValue(mOpt, "1.0").toString());
int numReducers = Integer.parseInt(cmdLine.getValue(redOpt, "1").toString());
- String vectorClassName = cmdLine.getValue(vectorOpt, "org.apache.mahout.matrix.SparseVector").toString();
+ String vectorClassName = cmdLine.getValue(vectorOpt, "org.apache.mahout.math.SparseVector").toString();
Class<? extends Vector> vectorClass = (Class<? extends Vector>) Class.forName(vectorClassName);
runJob(input, output, modelFactory, numModels, maxIterations, alpha_0, numReducers, vectorClass);
} catch (OptionException e) {
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/NormalScModelDistribution.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/NormalScModelDistribution.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/NormalScModelDistribution.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/NormalScModelDistribution.java Thu Dec 17 23:22:16 2009
@@ -21,8 +21,8 @@
import org.apache.mahout.clustering.dirichlet.models.Model;
import org.apache.mahout.clustering.dirichlet.models.ModelDistribution;
import org.apache.mahout.clustering.dirichlet.models.NormalModel;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
/**
* An implementation of the ModelDistribution interface suitable for testing the
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java Thu Dec 17 23:22:16 2009
@@ -39,7 +39,7 @@
import org.apache.mahout.clustering.syntheticcontrol.canopy.InputDriver;
import org.apache.mahout.common.CommandLineUtil;
import org.apache.mahout.common.commandline.DefaultOptionCreator;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -97,7 +97,7 @@
double t2 = Double.parseDouble(cmdLine.getValue(t2Opt, "55").toString());
double convergenceDelta = Double.parseDouble(cmdLine.getValue(convergenceDeltaOpt, "0.5").toString());
int maxIterations = Integer.parseInt(cmdLine.getValue(maxIterationsOpt, 10).toString());
- String className = cmdLine.getValue(vectorClassOpt, "org.apache.mahout.matrix.SparseVector").toString();
+ String className = cmdLine.getValue(vectorClassOpt, "org.apache.mahout.math.SparseVector").toString();
Class<? extends Vector> vectorClass = Class.forName(className).asSubclass(Vector.class);
runJob(input, output, measureClass, t1, t2, convergenceDelta, maxIterations, vectorClass);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java Thu Dec 17 23:22:16 2009
@@ -24,8 +24,8 @@
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reporter;
import org.apache.mahout.clustering.meanshift.MeanShiftCanopy;
-import org.apache.mahout.matrix.DenseVector;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.Vector;
import java.io.IOException;
import java.util.ArrayList;
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputMapper.java?rev=891983&r1=891982&r2=891983&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputMapper.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputMapper.java Thu Dec 17 23:22:16 2009
@@ -23,7 +23,7 @@
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reporter;
import org.apache.mahout.clustering.meanshift.MeanShiftCanopy;
-import org.apache.mahout.matrix.Vector;
+import org.apache.mahout.math.Vector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: lucene/mahout/trunk/math/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 17 23:22:16 2009
@@ -0,0 +1 @@
+target
Added: lucene/mahout/trunk/math/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/pom.xml?rev=891983&view=auto
==============================================================================
--- lucene/mahout/trunk/math/pom.xml (added)
+++ lucene/mahout/trunk/math/pom.xml Thu Dec 17 23:22:16 2009
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-parent</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <relativePath>../maven</relativePath>
+ </parent>
+
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-math</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <name>Mahout Math</name>
+ <description>High performance scientific and technical computing data structures and methods, mostly based on CERN's
+ Colt Java API
+ </description>
+
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>bin</descriptorRef>
+ </descriptorRefs>
+
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <!-- this is used for inheritance merges -->
+ <phase>package</phase>
+ <!-- append to the packaging phase. -->
+ <goals>
+ <goal>single</goal>
+ <!-- goals == mojos -->
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <supplementalModels>
+ <supplementalModel>supplemental-models.xml</supplementalModel>
+ </supplementalModels>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.mahout.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>0.20.1</version>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ </dependency>
+ <!-- Gson: Java to Json conversion -->
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout/tags/mahout-0.2-colt</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout/tags/mahout-0.2</developerConnection>
+ <url>https://svn.apache.org/repos/asf/lucene/mahout/mahout-colt</url>
+ </scm>
+ <repositories>
+ <repository>
+ <id>Apache snapshots</id>
+ <url>http://people.apache.org/maven-snapshot-repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>gson</id>
+ <url>http://google-gson.googlecode.com/svn/mavenrepo</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+</project>
Propchange: lucene/mahout/trunk/math/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java?rev=891983&view=auto
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java (added)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java Thu Dec 17 23:22:16 2009
@@ -0,0 +1,530 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.mahout.math;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+/** A few universal implementations of convenience functions */
+public abstract class AbstractMatrix implements Matrix {
+
+ private Map<String, Integer> columnLabelBindings;
+
+ private Map<String, Integer> rowLabelBindings;
+
+ @Override
+ public double get(String rowLabel, String columnLabel) throws IndexException,
+ UnboundLabelException {
+ if (columnLabelBindings == null || rowLabelBindings == null) {
+ throw new UnboundLabelException();
+ }
+ Integer row = rowLabelBindings.get(rowLabel);
+ Integer col = columnLabelBindings.get(columnLabel);
+ if (row == null || col == null) {
+ throw new UnboundLabelException();
+ }
+
+ return get(row, col);
+ }
+
+ @Override
+ public Map<String, Integer> getColumnLabelBindings() {
+ return columnLabelBindings;
+ }
+
+ @Override
+ public Map<String, Integer> getRowLabelBindings() {
+ return rowLabelBindings;
+ }
+
+ @Override
+ public void set(String rowLabel, double[] rowData) {
+ if (columnLabelBindings == null) {
+ throw new UnboundLabelException();
+ }
+ Integer row = rowLabelBindings.get(rowLabel);
+ if (row == null) {
+ throw new UnboundLabelException();
+ }
+ set(row, rowData);
+ }
+
+ @Override
+ public void set(String rowLabel, int row, double[] rowData) {
+ if (rowLabelBindings == null) {
+ rowLabelBindings = new HashMap<String, Integer>();
+ }
+ rowLabelBindings.put(rowLabel, row);
+ set(row, rowData);
+ }
+
+ @Override
+ public void set(String rowLabel, String columnLabel, double value)
+ throws IndexException, UnboundLabelException {
+ if (columnLabelBindings == null || rowLabelBindings == null) {
+ throw new UnboundLabelException();
+ }
+ Integer row = rowLabelBindings.get(rowLabel);
+ Integer col = columnLabelBindings.get(columnLabel);
+ if (row == null || col == null) {
+ throw new UnboundLabelException();
+ }
+ set(row, col, value);
+ }
+
+ @Override
+ public void set(String rowLabel, String columnLabel, int row, int column,
+ double value) throws IndexException, UnboundLabelException {
+ if (rowLabelBindings == null) {
+ rowLabelBindings = new HashMap<String, Integer>();
+ }
+ rowLabelBindings.put(rowLabel, row);
+ if (columnLabelBindings == null) {
+ columnLabelBindings = new HashMap<String, Integer>();
+ }
+ columnLabelBindings.put(columnLabel, column);
+
+ set(row, column, value);
+ }
+
+ @Override
+ public void setColumnLabelBindings(Map<String, Integer> bindings) {
+ columnLabelBindings = bindings;
+ }
+
+ @Override
+ public void setRowLabelBindings(Map<String, Integer> bindings) {
+ rowLabelBindings = bindings;
+ }
+
+ // index into int[2] for column value
+ public static final int COL = 1;
+
+ // index into int[2] for row value
+ public static final int ROW = 0;
+
+ @Override
+ public int numRows() {
+ return size()[ROW];
+ }
+
+ @Override
+ public int numCols() {
+ return size()[COL];
+ }
+
+ public static Matrix decodeMatrix(String formatString) {
+ Type vectorType = new TypeToken<Vector>() {
+ }.getType();
+ Type matrixType = new TypeToken<Matrix>() {
+ }.getType();
+ GsonBuilder builder = new GsonBuilder();
+ builder.registerTypeAdapter(vectorType, new JsonVectorAdapter());
+ builder.registerTypeAdapter(matrixType, new JsonMatrixAdapter());
+ Gson gson = builder.create();
+ return gson.fromJson(formatString, matrixType);
+ }
+
+ @Override
+ public String asFormatString() {
+ Type vectorType = new TypeToken<Vector>() {
+ }.getType();
+ Type matrixType = new TypeToken<Matrix>() {
+ }.getType();
+ GsonBuilder builder = new GsonBuilder();
+ builder.registerTypeAdapter(vectorType, new JsonVectorAdapter());
+ builder.registerTypeAdapter(matrixType, new JsonMatrixAdapter());
+ Gson gson = builder.create();
+ return gson.toJson(this, matrixType);
+ }
+
+ @Override
+ public Matrix assign(double value) {
+ int[] c = size();
+ for (int row = 0; row < c[ROW]; row++) {
+ for (int col = 0; col < c[COL]; col++) {
+ setQuick(row, col, value);
+ }
+ }
+ return this;
+ }
+
+ @Override
+ public Matrix assign(double[][] values) {
+ int[] c = size();
+ if (c[ROW] != values.length) {
+ throw new CardinalityException();
+ }
+ for (int row = 0; row < c[ROW]; row++) {
+ if (c[COL] != values[row].length) {
+ throw new CardinalityException();
+ } else {
+ for (int col = 0; col < c[COL]; col++) {
+ setQuick(row, col, values[row][col]);
+ }
+ }
+ }
+ return this;
+ }
+
+ @Override
+ public Matrix assign(Matrix other, BinaryFunction function) {
+ int[] c = size();
+ int[] o = other.size();
+ if (c[ROW] != o[ROW] || c[COL] != o[COL]) {
+ throw new CardinalityException();
+ }
+ for (int row = 0; row < c[ROW]; row++) {
+ for (int col = 0; col < c[COL]; col++) {
+ setQuick(row, col, function.apply(getQuick(row, col), other.getQuick(
+ row, col)));
+ }
+ }
+ return this;
+ }
+
+ @Override
+ public Matrix assign(Matrix other) {
+ int[] c = size();
+ int[] o = other.size();
+ if (c[ROW] != o[ROW] || c[COL] != o[COL]) {
+ throw new CardinalityException();
+ }
+ for (int row = 0; row < c[ROW]; row++) {
+ for (int col = 0; col < c[COL]; col++) {
+ setQuick(row, col, other.getQuick(row, col));
+ }
+ }
+ return this;
+ }
+
+ @Override
+ public Matrix assign(UnaryFunction function) {
+ int[] c = size();
+ for (int row = 0; row < c[ROW]; row++) {
+ for (int col = 0; col < c[COL]; col++) {
+ setQuick(row, col, function.apply(getQuick(row, col)));
+ }
+ }
+ return this;
+ }
+
+ @Override
+ public double determinant() {
+ int[] card = size();
+ int rowSize = card[ROW];
+ int columnSize = card[COL];
+ if (rowSize != columnSize) {
+ throw new CardinalityException();
+ }
+
+ if (rowSize == 2) {
+ return getQuick(0, 0) * getQuick(1, 1) - getQuick(0, 1) * getQuick(1, 0);
+ } else {
+ int sign = 1;
+ double ret = 0;
+
+ for (int i = 0; i < columnSize; i++) {
+ Matrix minor = new DenseMatrix(rowSize - 1, columnSize - 1);
+ for (int j = 1; j < rowSize; j++) {
+ boolean flag = false; /* column offset flag */
+ for (int k = 0; k < columnSize; k++) {
+ if (k == i) {
+ flag = true;
+ continue;
+ }
+ minor.set(j - 1, flag ? k - 1 : k, getQuick(j, k));
+ }
+ }
+ ret += getQuick(0, i) * sign * minor.determinant();
+ sign *= -1;
+
+ }
+
+ return ret;
+ }
+
+ }
+
+ @Override
+ public Matrix clone() {
+ AbstractMatrix clone;
+ try {
+ clone = (AbstractMatrix) super.clone();
+ } catch (CloneNotSupportedException cnse) {
+ throw new IllegalStateException(cnse); // can't happen
+ }
+ if (rowLabelBindings != null) {
+ clone.rowLabelBindings = (Map<String, Integer>) ((HashMap<String, Integer>) rowLabelBindings).clone();
+ }
+ if (columnLabelBindings != null) {
+ clone.columnLabelBindings = (Map<String, Integer>) ((HashMap<String, Integer>) columnLabelBindings).clone();
+ }
+ return clone;
+ }
+
+ @Override
+ public Matrix divide(double x) {
+ Matrix result = clone();
+ int[] c = size();
+ for (int row = 0; row < c[ROW]; row++) {
+ for (int col = 0; col < c[COL]; col++) {
+ result.setQuick(row, col, result.getQuick(row, col) / x);
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public double get(int row, int column) {
+ int[] c = size();
+ if (row < 0 || column < 0 || row >= c[ROW] || column >= c[COL]) {
+ throw new IndexException();
+ }
+ return getQuick(row, column);
+ }
+
+ @Override
+ public Matrix minus(Matrix other) {
+ int[] c = size();
+ int[] o = other.size();
+ if (c[ROW] != o[ROW] || c[COL] != o[COL]) {
+ throw new CardinalityException();
+ }
+ Matrix result = clone();
+ for (int row = 0; row < c[ROW]; row++) {
+ for (int col = 0; col < c[COL]; col++) {
+ result.setQuick(row, col, result.getQuick(row, col)
+ - other.getQuick(row, col));
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public Matrix plus(double x) {
+ Matrix result = clone();
+ int[] c = size();
+ for (int row = 0; row < c[ROW]; row++) {
+ for (int col = 0; col < c[COL]; col++) {
+ result.setQuick(row, col, result.getQuick(row, col) + x);
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public Matrix plus(Matrix other) {
+ int[] c = size();
+ int[] o = other.size();
+ if (c[ROW] != o[ROW] || c[COL] != o[COL]) {
+ throw new CardinalityException();
+ }
+ Matrix result = clone();
+ for (int row = 0; row < c[ROW]; row++) {
+ for (int col = 0; col < c[COL]; col++) {
+ result.setQuick(row, col, result.getQuick(row, col)
+ + other.getQuick(row, col));
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public void set(int row, int column, double value) {
+ int[] c = size();
+ if (row < 0 || column < 0 || row >= c[ROW] || column >= c[COL]) {
+ throw new IndexException();
+ }
+ setQuick(row, column, value);
+ }
+
+ @Override
+ public void set(int row, double[] data) {
+ int[] c = size();
+ if (c[COL] < data.length) {
+ throw new CardinalityException();
+ }
+ if ((c[ROW] < row) || (row < 0)) {
+ throw new IndexException();
+ }
+
+ for (int i = 0; i < c[COL]; i++) {
+ setQuick(row, i, data[i]);
+ }
+ }
+
+ @Override
+ public Matrix times(double x) {
+ Matrix result = clone();
+ int[] c = size();
+ for (int row = 0; row < c[ROW]; row++) {
+ for (int col = 0; col < c[COL]; col++) {
+ result.setQuick(row, col, result.getQuick(row, col) * x);
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public Matrix times(Matrix other) {
+ int[] c = size();
+ int[] o = other.size();
+ if (c[COL] != o[ROW]) {
+ throw new CardinalityException();
+ }
+ Matrix result = like(c[ROW], o[COL]);
+ for (int row = 0; row < c[ROW]; row++) {
+ for (int col = 0; col < o[COL]; col++) {
+ double sum = 0;
+ for (int k = 0; k < c[COL]; k++) {
+ sum += getQuick(row, k) * other.getQuick(k, col);
+ }
+ result.setQuick(row, col, sum);
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public Vector times(Vector v) {
+ int[] c = size();
+ if (c[COL] != v.size()) {
+ throw new CardinalityException();
+ }
+ Vector w = new DenseVector(c[ROW]);
+ for (int i = 0; i < c[ROW]; i++) {
+ w.setQuick(i, v.dot(getRow(i)));
+ }
+ return w;
+ }
+
+ @Override
+ public Vector timesSquared(Vector v) {
+ int[] c = size();
+ if (c[COL] != v.size()) {
+ throw new CardinalityException();
+ }
+ Vector w = new DenseVector(c[COL]);
+ for (int i = 0; i < c[ROW]; i++) {
+ Vector xi = getRow(i);
+ w.assign(xi, new PlusWithScaleFunction(xi.dot(v)));
+ }
+ return w;
+ }
+
+ @Override
+ public Matrix transpose() {
+ int[] card = size();
+ Matrix result = like(card[COL], card[ROW]);
+ for (int row = 0; row < card[ROW]; row++) {
+ for (int col = 0; col < card[COL]; col++) {
+ result.setQuick(col, row, getQuick(row, col));
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public double zSum() {
+ double result = 0;
+ int[] c = size();
+ for (int row = 0; row < c[ROW]; row++) {
+ for (int col = 0; col < c[COL]; col++) {
+ result += getQuick(row, col);
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public void readFields(DataInput in) throws IOException {
+ // read the label bindings
+ int colSize = in.readInt();
+ if (colSize > 0) {
+ columnLabelBindings = new HashMap<String, Integer>();
+ for (int i = 0; i < colSize; i++) {
+ columnLabelBindings.put(in.readUTF(), in.readInt());
+ }
+ }
+ int rowSize = in.readInt();
+ if (rowSize > 0) {
+ rowLabelBindings = new HashMap<String, Integer>();
+ for (int i = 0; i < rowSize; i++) {
+ rowLabelBindings.put(in.readUTF(), in.readInt());
+ }
+ }
+ }
+
+ @Override
+ public void write(DataOutput out) throws IOException {
+ // write the label bindings
+ if (columnLabelBindings == null) {
+ out.writeInt(0);
+ } else {
+ out.writeInt(columnLabelBindings.size());
+ for (Map.Entry<String, Integer> stringIntegerEntry : columnLabelBindings.entrySet()) {
+ out.writeUTF(stringIntegerEntry.getKey());
+ out.writeInt(stringIntegerEntry.getValue());
+ }
+ }
+ if (rowLabelBindings == null) {
+ out.writeInt(0);
+ } else {
+ out.writeInt(rowLabelBindings.size());
+ for (Map.Entry<String, Integer> stringIntegerEntry : rowLabelBindings.entrySet()) {
+ out.writeUTF(stringIntegerEntry.getKey());
+ out.writeInt(stringIntegerEntry.getValue());
+ }
+ }
+ }
+
+ /** Reads a typed Matrix instance from the input stream */
+ public static Matrix readMatrix(DataInput in) throws IOException {
+ String matrixClassName = in.readUTF();
+ Matrix matrix;
+ try {
+ matrix = Class.forName(matrixClassName).asSubclass(Matrix.class)
+ .newInstance();
+ } catch (ClassNotFoundException e) {
+ throw new IllegalStateException(e);
+ } catch (IllegalAccessException e) {
+ throw new IllegalStateException(e);
+ } catch (InstantiationException e) {
+ throw new IllegalStateException(e);
+ }
+ matrix.readFields(in);
+ return matrix;
+ }
+
+ /** Writes a typed Matrix instance to the output stream */
+ public static void writeMatrix(DataOutput out, Matrix matrix)
+ throws IOException {
+ out.writeUTF(matrix.getClass().getName());
+ matrix.write(out);
+ }
+
+}
Propchange: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java
------------------------------------------------------------------------------
svn:eol-style = native