svn commit: r1497615 - 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/

[sm...@apache.org]

Author: smarthi
Date: Fri Jun 28 00:10:00 2013
New Revision: 1497615

URL: http://svn.apache.org/r1497615
Log:
MAHOUT-1214: Improve the accuracy of the Spectral KMeans Method - minor code cleanup

Modified:
    mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/EigenSeedGenerator.java
    mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/SpectralKMeansDriver.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/kmeans/EigenSeedGenerator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/EigenSeedGenerator.java?rev=1497615&r1=1497614&r2=1497615&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/kmeans/EigenSeedGenerator.java Fri Jun 28 00:10:00 2013
@@ -18,7 +18,6 @@
 package org.apache.mahout.clustering.kmeans;
 
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.hadoop.conf.Configuration;
@@ -90,10 +89,8 @@ public final class EigenSeedGenerator {
             fileStatus.getPath(), true, conf)) {
           Writable key = record.getFirst();
           VectorWritable value = record.getSecond();
-          Iterator<Vector.Element> nonZeroElements = value.get().nonZeroes().iterator();
 
-          while (nonZeroElements.hasNext()) {
-            Vector.Element e = nonZeroElements.next();
+          for (Vector.Element e : value.get().nonZeroes()) {
             int index = e.index();
             double v = Math.abs(e.get());
 
@@ -112,9 +109,7 @@ public final class EigenSeedGenerator {
       }
 
       try {
-        Iterator<Integer> iter = maxEigens.keySet().iterator();
-        while (iter.hasNext()) {
-          int key = iter.next();
+        for (Integer key : maxEigens.keySet()) {
           writer.append(chosenTexts.get(key), chosenClusters.get(key));
         }
         log.info("EigenSeedGenerator:: Wrote {} Klusters to {}", chosenTexts.size(), outFile);

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=1497615&r1=1497614&r2=1497615&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 Fri Jun 28 00:10:00 2013
@@ -255,7 +255,7 @@ public class SpectralKMeansDriver extend
       Text mappingValue = new Text();
       IntWritable mappingIndex = new IntWritable();
       while (reader.next(mappingIndex, mappingValue)) {
-        String s = new String(mappingValue.toString());
+        String s = mappingValue.toString();
         mapping.add(s);
       }
       HadoopUtil.delete(conf, mappingPath);

Modified: 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/kmeans/TestEigenSeedGenerator.java?rev=1497615&r1=1497614&r2=1497615&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/kmeans/TestEigenSeedGenerator.java Fri Jun 28 00:10:00 2013
@@ -65,7 +65,6 @@ public final class TestEigenSeedGenerato
     fs = FileSystem.get(conf);
   }
 
-  /** Story: test eigen seed generation generates 3 clusters with proper ids and data */
   @Test
   public void testEigenSeedGenerator() throws Exception {
     List<VectorWritable> points = getPoints();