You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by fr...@apache.org on 2014/03/05 21:04:15 UTC
svn commit: r1574645 - in /mahout/trunk/core/src: main/java/org/apache/mahout/clustering/kmeans/ main/java/org/apache/mahout/clustering/spectral/kmeans/ test/java/org/apache/mahout/clustering/kmeans/ test/java/org/apache/mahout/clustering/spectral/kmeans/

Author: frankscholten
Date: Wed Mar  5 20:04:15 2014
New Revision: 1574645

URL: http://svn.apache.org/r1574645
Log:
Moved EigenSeedgenerator plus test into spectral package because it is only used by SpectralKMeansDriver.

Added:
    mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/EigenSeedGenerator.java
      - copied, changed from r1574608, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/EigenSeedGenerator.java
    mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/kmeans/
    mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/kmeans/TestEigenSeedGenerator.java
      - copied, changed from r1574608, mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestEigenSeedGenerator.java
Removed:
    mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/EigenSeedGenerator.java
    mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestEigenSeedGenerator.java
Modified:
    mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/SpectralKMeansDriver.java

Copied: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/EigenSeedGenerator.java (from r1574608, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/EigenSeedGenerator.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/EigenSeedGenerator.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/EigenSeedGenerator.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/EigenSeedGenerator.java&r1=1574608&r2=1574645&rev=1574645&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/EigenSeedGenerator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/EigenSeedGenerator.java Wed Mar  5 20:04:15 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.mahout.clustering.kmeans;
+package org.apache.mahout.clustering.spectral.kmeans;
 
 import java.io.IOException;
 import java.util.Map;
@@ -28,6 +28,7 @@ import org.apache.hadoop.io.SequenceFile
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;
 import org.apache.mahout.clustering.iterator.ClusterWritable;
+import org.apache.mahout.clustering.kmeans.Kluster;
 import org.apache.mahout.common.HadoopUtil;
 import org.apache.mahout.common.Pair;
 import org.apache.mahout.common.distance.DistanceMeasure;

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/SpectralKMeansDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/SpectralKMeansDriver.java?rev=1574645&r1=1574644&r2=1574645&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/SpectralKMeansDriver.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/SpectralKMeansDriver.java Wed Mar  5 20:04:15 2014
@@ -30,7 +30,6 @@ import org.apache.hadoop.io.Text;
 import org.apache.hadoop.util.ToolRunner;
 import org.apache.mahout.clustering.Cluster;
 import org.apache.mahout.clustering.classify.WeightedVectorWritable;
-import org.apache.mahout.clustering.kmeans.EigenSeedGenerator;
 import org.apache.mahout.clustering.kmeans.KMeansDriver;
 import org.apache.mahout.clustering.spectral.AffinityMatrixInputJob;
 import org.apache.mahout.clustering.spectral.MatrixDiagonalizeJob;

Copied: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/kmeans/TestEigenSeedGenerator.java (from r1574608, mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestEigenSeedGenerator.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/kmeans/TestEigenSeedGenerator.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/kmeans/TestEigenSeedGenerator.java&p1=mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestEigenSeedGenerator.java&r1=1574608&r2=1574645&rev=1574645&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestEigenSeedGenerator.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/kmeans/TestEigenSeedGenerator.java Wed Mar  5 20:04:15 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.mahout.clustering.kmeans;
+package org.apache.mahout.clustering.spectral.kmeans;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -28,6 +28,7 @@ import org.apache.hadoop.mapreduce.Job;
 import org.apache.mahout.clustering.Cluster;
 import org.apache.mahout.clustering.ClusteringTestUtils;
 import org.apache.mahout.clustering.iterator.ClusterWritable;
+import org.apache.mahout.clustering.spectral.kmeans.EigenSeedGenerator;
 import org.apache.mahout.common.MahoutTestCase;
 import org.apache.mahout.common.distance.ManhattanDistanceMeasure;
 import org.apache.mahout.common.iterator.sequencefile.SequenceFileValueIterable;