You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by df...@apache.org on 2013/06/16 20:03:05 UTC
svn commit: r1493557 - in
/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/streaming/mapreduce:
StreamingKMeansReducer.java StreamingKMeansThread.java
Author: dfilimon
Date: Sun Jun 16 18:03:05 2013
New Revision: 1493557
URL: http://svn.apache.org/r1493557
Log:
Fixed botched patch application that broke the build.
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansThread.java
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansReducer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansReducer.java?rev=1493557&r1=1493556&r2=1493557&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansReducer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansReducer.java Sun Jun 16 18:03:05 2013
@@ -54,11 +54,11 @@ public class StreamingKMeansReducer exte
if (conf.getBoolean(StreamingKMeansDriver.REDUCE_STREAMING_KMEANS, false)) {
intermediateCentroids = Lists.newArrayList(
new StreamingKMeansThread(Iterables.transform(centroids, new Function<CentroidWritable, Centroid>() {
- @Override
+ @Override
public Centroid apply(CentroidWritable input) {
- Preconditions.checkNotNull(input);
- return input.getCentroid();
- }
+ Preconditions.checkNotNull(input);
+ return input.getCentroid();
+ }
}), conf).call());
} else {
intermediateCentroids = centroidWritablesToList(centroids);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansThread.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansThread.java?rev=1493557&r1=1493556&r2=1493557&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansThread.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansThread.java Sun Jun 16 18:03:05 2013
@@ -21,8 +21,12 @@ public class StreamingKMeansThread imple
private Iterable<Centroid> datapoints;
public StreamingKMeansThread(Path input, Configuration conf) {
- this.datapoints = StreamingKMeansUtilsMR.getCentroidsFromVectorWritable(
- new SequenceFileValueIterable<VectorWritable>(input, false, conf));
+ this(StreamingKMeansUtilsMR.getCentroidsFromVectorWritable(
+ new SequenceFileValueIterable<VectorWritable>(input, false, conf)), conf);
+ }
+
+ public StreamingKMeansThread(Iterable<Centroid> datapoints, Configuration conf) {
+ this.datapoints = datapoints;
this.conf = conf;
}