Author: jeastman
Date: Fri Jun 1 20:13:51 2012
New Revision: 1345331
URL: http://svn.apache.org/viewvc?rev=1345331&view=rev
Log:
Added a Configuration argument to configureWithClusterInfo in FuzzyKMeansUtil
and updated comment in both Utils
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansUtil.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansUtil.java
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java?rev=1345331&r1=1345330&r2=1345331&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
Fri Jun 1 20:13:51 2012
@@ -267,7 +267,7 @@ public class FuzzyKMeansDriver extends A
throws IOException, InterruptedException, ClassNotFoundException {
List<Cluster> clusters = new ArrayList<Cluster>();
- FuzzyKMeansUtil.configureWithClusterInfo(clustersIn, clusters);
+ FuzzyKMeansUtil.configureWithClusterInfo(conf, clustersIn, clusters);
if (conf==null) {
conf = new Configuration();
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansUtil.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansUtil.java?rev=1345331&r1=1345330&r2=1345331&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansUtil.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansUtil.java
Fri Jun 1 20:13:51 2012
@@ -31,23 +31,28 @@ import org.apache.mahout.common.iterator
import
org.apache.mahout.common.iterator.sequencefile.SequenceFileDirValueIterable;
final class FuzzyKMeansUtil {
-
- private FuzzyKMeansUtil() {
- }
-
- /** Configure the mapper with the cluster info */
- public static void configureWithClusterInfo(Path clusterPath, List<Cluster>
clusters) {
- for (Writable value :
- new SequenceFileDirValueIterable<Writable>(clusterPath,
- PathType.LIST,
- PathFilters.partFilter(),
- new Configuration())) {
+
+ private FuzzyKMeansUtil() {}
+
+ /**
+ * Create a list of SoftClusters from whatever type is passed in as the prior
+ *
+ * @param conf
+ * the Configuration
+ * @param clusterPath
+ * the path to the prior Clusters
+ * @param clusters
+ * a List<Cluster> to put values into
+ */
+ public static void configureWithClusterInfo(Configuration conf, Path
clusterPath, List<Cluster> clusters) {
+ for (Writable value : new
SequenceFileDirValueIterable<Writable>(clusterPath, PathType.LIST,
+ PathFilters.partFilter(), conf)) {
Class<? extends Writable> valueClass = value.getClass();
if (valueClass.equals(ClusterWritable.class)) {
- ClusterWritable clusterWritable = (ClusterWritable)value;
- value = clusterWritable.getValue();
- valueClass = value.getClass();
+ ClusterWritable clusterWritable = (ClusterWritable) value;
+ value = clusterWritable.getValue();
+ valueClass = value.getClass();
}
if (valueClass.equals(Kluster.class)) {
@@ -65,7 +70,7 @@ final class FuzzyKMeansUtil {
throw new IllegalStateException("Bad value class: " + valueClass);
}
}
-
+
}
-
+
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansUtil.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansUtil.java?rev=1345331&r1=1345330&r2=1345331&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansUtil.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansUtil.java
Fri Jun 1 20:13:51 2012
@@ -34,7 +34,16 @@ final class KMeansUtil {
private KMeansUtil() {
}
- /** Configure the mapper with the cluster info */
+ /**
+ * Create a list of Klusters from whatever type is passed in as the prior
+ *
+ * @param conf
+ * the Configuration
+ * @param clusterPath
+ * the path to the prior Clusters
+ * @param clusters
+ * a List<Cluster> to put values into
+ */
public static void configureWithClusterInfo(Configuration conf,
Path clusterPath,
Collection<Cluster> clusters) {
