svn commit: r1538424 - in /mahout/trunk/integration/src: main/java/org/apache/mahout/utils/clustering/ClusterDumper.java test/java/org/apache/mahout/clustering/TestClusterDumper.java

[smarthi]

Author: smarthi
Date: Sun Nov  3 19:30:34 2013
New Revision: 1538424

URL: http://svn.apache.org/r1538424
Log:
Mahout-1343: more minor cleanups

Modified:
    
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
    
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java

Modified: 
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java?rev=1538424&r1=1538423&r2=1538424&view=diff
==============================================================================
--- 
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
 (original)
+++ 
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
 Sun Nov  3 19:30:34 2013
@@ -24,8 +24,8 @@ import java.io.Writer;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
 
+import com.google.common.collect.Maps;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -306,7 +306,7 @@ public final class ClusterDumper extends
 
   public static Map<Integer, List<WeightedVectorWritable>> readPoints(Path 
pointsPathDir, long maxPointsPerCluster,
       Configuration conf) {
-    Map<Integer, List<WeightedVectorWritable>> result = new TreeMap<Integer, 
List<WeightedVectorWritable>>();
+    Map<Integer, List<WeightedVectorWritable>> result = Maps.newTreeMap();
     for (Pair<IntWritable, WeightedVectorWritable> record
         : new SequenceFileDirIterable<IntWritable, 
WeightedVectorWritable>(pointsPathDir, PathType.LIST,
             PathFilters.logsCRCFilter(), conf)) {

Modified: 
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java?rev=1538424&r1=1538423&r2=1538424&view=diff
==============================================================================
--- 
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
 (original)
+++ 
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
 Sun Nov  3 19:30:34 2013
@@ -24,7 +24,6 @@ import java.util.List;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.util.ToolRunner;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
@@ -193,12 +192,12 @@ public final class TestClusterDumper ext
     CanopyDriver.run(conf, getTestTempDirPath("testdata"), output, measure, 8,
         4, false, 0.0, true);
     // now run the KMeans job
-    Path kmeansOutput = new Path(output, "kmeans");
+    Path kMeansOutput = new Path(output, "kmeans");
     KMeansDriver.run(conf, getTestTempDirPath("testdata"), new Path(output,
-        "clusters-0-final"), kmeansOutput, measure, 0.001, 10, true, 0.0, 
false);
+        "clusters-0-final"), kMeansOutput, measure, 0.001, 10, true, 0.0, 
false);
     // run ClusterDumper
     ClusterDumper clusterDumper = new ClusterDumper(finalClusterPath(conf,
-        output, 10), new Path(kmeansOutput, "clusteredPoints"));
+        output, 10), new Path(kMeansOutput, "clusteredPoints"));
     clusterDumper.printClusters(termDictionary);
   }
 
@@ -230,13 +229,13 @@ public final class TestClusterDumper ext
     CanopyDriver.run(conf, getTestTempDirPath("testdata"), output, measure, 8,
         4, false, 0.0, true);
     // now run the Fuzzy KMeans job
-    Path kmeansOutput = new Path(output, "kmeans");
+    Path kMeansOutput = new Path(output, "kmeans");
     FuzzyKMeansDriver.run(conf, getTestTempDirPath("testdata"), new Path(
-        output, "clusters-0-final"), kmeansOutput, measure, 0.001, 10, 1.1f, 
true,
+        output, "clusters-0-final"), kMeansOutput, measure, 0.001, 10, 1.1f, 
true,
         true, 0, true);
     // run ClusterDumper
     ClusterDumper clusterDumper = new ClusterDumper(finalClusterPath(conf,
-        output, 10), new Path(kmeansOutput, "clusteredPoints"));
+        output, 10), new Path(kMeansOutput, "clusteredPoints"));
     clusterDumper.printClusters(termDictionary);
   }