svn commit: r1488551 - /mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayKMeans.java

[ro...@apache.org]

Author: robinanil
Date: Sat Jun  1 17:54:31 2013
New Revision: 1488551

URL: http://svn.apache.org/r1488551
Log:
MAHOUT-1070 DisplayKMeans example has transposed/mislabelled arguments for Gabriel Reid by robinanil

Modified:
    mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayKMeans.java

Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayKMeans.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayKMeans.java?rev=1488551&r1=1488550&r2=1488551&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayKMeans.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayKMeans.java Sat Jun  1 17:54:31 2013
@@ -59,18 +59,18 @@ public class DisplayKMeans extends Displ
     writeSampleData(samples);
     boolean runClusterer = true;
     double convergenceDelta = 0.001;
+    int numClusters = 3;
+    int maxIterations = 10;
     if (runClusterer) {
-      int numClusters = 3;
-      runSequentialKMeansClusterer(conf, samples, output, measure, numClusters, convergenceDelta);
+      runSequentialKMeansClusterer(conf, samples, output, measure, numClusters, maxIterations, convergenceDelta);
     } else {
-      int maxIterations = 10;
-      runSequentialKMeansClassifier(conf, samples, output, measure, maxIterations, convergenceDelta);
+      runSequentialKMeansClassifier(conf, samples, output, measure, numClusters, maxIterations, convergenceDelta);
     }
     new DisplayKMeans();
   }
   
   private static void runSequentialKMeansClassifier(Configuration conf, Path samples, Path output,
-      DistanceMeasure measure, int numClusters, double convergenceDelta) throws IOException {
+      DistanceMeasure measure, int numClusters, int maxIterations, double convergenceDelta) throws IOException {
     Collection<Vector> points = Lists.newArrayList();
     for (int i = 0; i < numClusters; i++) {
       points.add(SAMPLE_DATA.get(i).get());
@@ -84,16 +84,15 @@ public class DisplayKMeans extends Displ
     Path priorPath = new Path(output, Cluster.INITIAL_CLUSTERS_DIR);
     prior.writeToSeqFiles(priorPath);
     
-    int maxIter = 10;
-    ClusterIterator.iterateSeq(conf, samples, priorPath, output, maxIter);
+    ClusterIterator.iterateSeq(conf, samples, priorPath, output, maxIterations);
     loadClustersWritable(output);
   }
   
   private static void runSequentialKMeansClusterer(Configuration conf, Path samples, Path output,
-      DistanceMeasure measure, int maxIterations, double convergenceDelta) throws IOException, InterruptedException,
+      DistanceMeasure measure, int numClusters, int maxIterations, double convergenceDelta) throws IOException, InterruptedException,
       ClassNotFoundException {
     Path clustersIn = new Path(output, "random-seeds");
-    RandomSeedGenerator.buildRandom(conf, samples, clustersIn, 3, measure);
+    RandomSeedGenerator.buildRandom(conf, samples, clustersIn, numClusters, measure);
     KMeansDriver.run(samples, clustersIn, output, measure, convergenceDelta, maxIterations, true, 0.0, true);
     loadClustersWritable(output);
   }