Author: jeastman
Date: Sun Sep 12 18:58:52 2010
New Revision: 996363
URL: http://svn.apache.org/viewvc?rev=996363&view=rev
Log:
Refactored WeightedVectorWritable to extend VectorWritable and updated relevant
code. All tests run
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/AbstractCluster.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/WeightedVectorWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansClusterer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwMapper.java
mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwReducer.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/AbstractCluster.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/AbstractCluster.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/AbstractCluster.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/AbstractCluster.java
Sun Sep 12 18:58:52 2010
@@ -195,13 +195,12 @@ public abstract class AbstractCluster im
@Override
public String asFormatString(String[] bindings) {
StringBuilder buf = new StringBuilder(50);
- buf.append(getIdentifier()).append("{n=").append(numPoints).append(" c=");
+ buf.append(getIdentifier()).append("{n=").append(numPoints);
if (center != null) {
- buf.append(formatVector(center, bindings));
+ buf.append(" c=").append(formatVector(center, bindings));
}
- buf.append(" r=");
if (radius != null) {
- buf.append(formatVector(radius, bindings));
+ buf.append(" r=").append(formatVector(radius, bindings));
}
buf.append('}');
return buf.toString();
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/WeightedVectorWritable.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/WeightedVectorWritable.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/WeightedVectorWritable.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/WeightedVectorWritable.java
Sun Sep 12 18:58:52 2010
@@ -21,19 +21,17 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.hadoop.io.Writable;
+import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
-public class WeightedVectorWritable implements Writable {
+public class WeightedVectorWritable extends VectorWritable {
private double weight;
- private VectorWritable vector;
-
public WeightedVectorWritable() {
}
- public WeightedVectorWritable(double weight, VectorWritable vector) {
+ public WeightedVectorWritable(double weight, Vector vector) {
this.weight = weight;
this.vector = vector;
}
@@ -48,25 +46,24 @@ public class WeightedVectorWritable impl
/**
* @return the point
*/
- public VectorWritable getVector() {
+ public Vector getVector() {
return vector;
}
@Override
public void readFields(DataInput in) throws IOException {
+ super.readFields(in);
weight = in.readDouble();
- vector = new VectorWritable();
- vector.readFields(in);
}
@Override
public void write(DataOutput out) throws IOException {
+ super.write(out);
out.writeDouble(weight);
- vector.write(out);
}
public String toString() {
- return weight + ": " + (vector == null ? "null" :
AbstractCluster.formatVector(vector.get(), null));
+ return weight + ": " + (vector == null ? "null" :
AbstractCluster.formatVector(vector, null));
}
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java
Sun Sep 12 18:58:52 2010
@@ -134,7 +134,7 @@ public class CanopyClusterer {
Mapper<?, ?, IntWritable,
WeightedVectorWritable>.Context context) throws IOException,
InterruptedException {
Canopy closest = findClosestCanopy(point, canopies);
- context.write(new IntWritable(closest.getId()), new
WeightedVectorWritable(1, new VectorWritable(point)));
+ context.write(new IntWritable(closest.getId()), new
WeightedVectorWritable(1, point));
context.setStatus("Emit Closest Canopy ID:" + closest.getIdentifier());
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
Sun Sep 12 18:58:52 2010
@@ -325,7 +325,7 @@ public class CanopyDriver extends Abstra
VectorWritable vw =
reader.getValueClass().asSubclass(VectorWritable.class).newInstance();
while (reader.next(key, vw)) {
Canopy closest = clusterer.findClosestCanopy(vw.get(), clusters);
- writer.append(new IntWritable(closest.getId()), new
WeightedVectorWritable(1, vw));
+ writer.append(new IntWritable(closest.getId()), new
WeightedVectorWritable(1, vw.get()));
vw =
reader.getValueClass().asSubclass(VectorWritable.class).newInstance();
}
} finally {
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java
Sun Sep 12 18:58:52 2010
@@ -322,7 +322,7 @@ public class DirichletClusterer {
}
}
//System.out.println(clusterId + ": " +
ClusterBase.formatVector(vector.get(), null));
- context.write(new IntWritable(clusterId), new
WeightedVectorWritable(clusterPdf, point));
+ context.write(new IntWritable(clusterId), new
WeightedVectorWritable(clusterPdf, point.get()));
}
/**
@@ -341,7 +341,7 @@ public class DirichletClusterer {
double pdf = pi.get(i);
if (pdf > threshold && clusters.get(i).getTotalCount() > 0) {
//System.out.println(i + ": " + ClusterBase.formatVector(vector.get(),
null));
- context.write(new IntWritable(i), new WeightedVectorWritable(pdf,
point));
+ context.write(new IntWritable(i), new WeightedVectorWritable(pdf,
point.get()));
}
}
}
@@ -381,7 +381,7 @@ public class DirichletClusterer {
double pdf = pi.get(i);
if (pdf > threshold && clusters.get(i).getTotalCount() > 0) {
//System.out.println(i + ": " + ClusterBase.formatVector(vector.get(),
null));
- writer.append(new IntWritable(i), new WeightedVectorWritable(pdf,
vector));
+ writer.append(new IntWritable(i), new WeightedVectorWritable(pdf,
vector.get()));
}
}
}
@@ -408,6 +408,6 @@ public class DirichletClusterer {
}
}
//System.out.println(i + ": " + ClusterBase.formatVector(vector.get(),
null));
- writer.append(new IntWritable(clusterId), new
WeightedVectorWritable(maxPdf, vector));
+ writer.append(new IntWritable(clusterId), new
WeightedVectorWritable(maxPdf, vector.get()));
}
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java
Sun Sep 12 18:58:52 2010
@@ -262,7 +262,7 @@ public class FuzzyKMeansClusterer {
}
}
// System.out.println("cluster-" + clusterId + ": " +
ClusterBase.formatVector(point, null));
- context.write(new IntWritable(clusterId), new
WeightedVectorWritable(clusterPdf, new VectorWritable(point)));
+ context.write(new IntWritable(clusterId), new
WeightedVectorWritable(clusterPdf, point));
}
/**
@@ -277,7 +277,7 @@ public class FuzzyKMeansClusterer {
double pdf = pi.get(i);
if (pdf > threshold) {
// System.out.println("cluster-" + clusterId + ": " +
ClusterBase.formatVector(point, null));
- context.write(new IntWritable(i), new WeightedVectorWritable(pdf, new
VectorWritable(point)));
+ context.write(new IntWritable(i), new WeightedVectorWritable(pdf,
point));
}
}
}
@@ -325,7 +325,7 @@ public class FuzzyKMeansClusterer {
double pdf = pi.get(i);
if (pdf > threshold) {
// System.out.println("cluster-" + clusterId + ": " +
ClusterBase.formatVector(point, null));
- writer.append(new IntWritable(i), new WeightedVectorWritable(pdf, new
VectorWritable(point)));
+ writer.append(new IntWritable(i), new WeightedVectorWritable(pdf,
point));
}
}
}
@@ -343,6 +343,6 @@ public class FuzzyKMeansClusterer {
}
}
// System.out.println("cluster-" + clusterId + ": " +
ClusterBase.formatVector(point, null));
- writer.append(new IntWritable(clusterId), new
WeightedVectorWritable(clusterPdf, new VectorWritable(point)));
+ writer.append(new IntWritable(clusterId), new
WeightedVectorWritable(clusterPdf, point));
}
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansClusterer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansClusterer.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansClusterer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansClusterer.java
Sun Sep 12 18:58:52 2010
@@ -144,7 +144,7 @@ public class KMeansClusterer {
nearestDistance = distance;
}
}
- context.write(new IntWritable(nearestCluster.getId()), new
WeightedVectorWritable(1, new VectorWritable(vector)));
+ context.write(new IntWritable(nearestCluster.getId()), new
WeightedVectorWritable(1, vector));
}
/**
@@ -171,7 +171,7 @@ public class KMeansClusterer {
nearestDistance = distance;
}
}
- writer.append(new IntWritable(nearestCluster.getId()), new
WeightedVectorWritable(1, new VectorWritable(point)));
+ writer.append(new IntWritable(nearestCluster.getId()), new
WeightedVectorWritable(1, point));
}
/**
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java
Sun Sep 12 18:58:52 2010
@@ -48,7 +48,7 @@ public class MeanShiftCanopyClusterMappe
for (int containedId : msc.getBoundPoints().toList()) {
if (vectorId == containedId) {
context.write(new IntWritable(msc.getId()),
- new WeightedVectorWritable(1, new
VectorWritable(canopy.getCenter())));
+ new WeightedVectorWritable(1, canopy.getCenter()));
}
}
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
Sun Sep 12 18:58:52 2010
@@ -499,7 +499,7 @@ public class MeanShiftCanopyDriver exten
while (reader.next(key, canopy)) {
MeanShiftCanopy closest =
MeanShiftCanopyClusterer.findCoveringCanopy(canopy, clusters);
writer.append(new IntWritable(closest.getId()),
- new WeightedVectorWritable(1, new
VectorWritable(canopy.getCenter())));
+ new WeightedVectorWritable(1, canopy.getCenter()));
canopy =
reader.getValueClass().asSubclass(MeanShiftCanopy.class).newInstance();
}
} finally {
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java
(original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java
Sun Sep 12 18:58:52 2010
@@ -33,7 +33,7 @@ public class VectorWritable extends Conf
public static final int FLAG_LAX_PRECISION = 0x08;
public static final int NUM_FLAGS = 4;
- private Vector vector;
+ protected Vector vector;
private boolean writesLaxPrecision;
public VectorWritable() {
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
Sun Sep 12 18:58:52 2010
@@ -380,7 +380,7 @@ public final class TestCanopyCreation ex
Canopy canopy = findCanopy(key.get(), canopies);
List<WeightedVectorWritable> pts = stringListEntry.getValue();
for (WeightedVectorWritable ptDef : pts) {
- assertTrue("Point not in canopy", mapper.canopyCovers(canopy,
ptDef.getVector().get()));
+ assertTrue("Point not in canopy", mapper.canopyCovers(canopy,
ptDef.getVector()));
}
}
}
@@ -416,7 +416,7 @@ public final class TestCanopyCreation ex
Canopy canopy = findCanopy(key.get(), canopies);
List<WeightedVectorWritable> pts = stringListEntry.getValue();
for (WeightedVectorWritable ptDef : pts) {
- assertTrue("Point not in canopy", mapper.canopyCovers(canopy,
ptDef.getVector().get()));
+ assertTrue("Point not in canopy", mapper.canopyCovers(canopy,
ptDef.getVector()));
}
}
}
@@ -450,7 +450,7 @@ public final class TestCanopyCreation ex
WeightedVectorWritable vector = new WeightedVectorWritable();
while (reader.next(clusterId, vector)) {
count++;
- System.out.println("Txt: " + clusterId + " Vec: " +
AbstractCluster.formatVector(vector.getVector().get(), null));
+ System.out.println("Txt: " + clusterId + " Vec: " +
AbstractCluster.formatVector(vector.getVector(), null));
}
assertEquals("number of points", points.size(), count);
reader.close();
@@ -491,7 +491,7 @@ public final class TestCanopyCreation ex
WeightedVectorWritable vector = new WeightedVectorWritable();
while (reader.next(clusterId, vector)) {
count++;
- System.out.println("Txt: " + clusterId + " Vec: " +
AbstractCluster.formatVector(vector.getVector().get(), null));
+ System.out.println("Txt: " + clusterId + " Vec: " +
AbstractCluster.formatVector(vector.getVector(), null));
}
assertEquals("number of points", points.size(), count);
reader.close();
@@ -517,7 +517,7 @@ public final class TestCanopyCreation ex
WeightedVectorWritable vector = new WeightedVectorWritable();
while (reader.next(clusterId, vector)) {
count++;
- System.out.println("Txt: " + clusterId + " Vec: " +
AbstractCluster.formatVector(vector.getVector().get(), null));
+ System.out.println("Txt: " + clusterId + " Vec: " +
AbstractCluster.formatVector(vector.getVector(), null));
}
assertEquals("number of points", points.size(), count);
reader.close();
@@ -550,7 +550,7 @@ public final class TestCanopyCreation ex
while (reader.next(canopyId, vw)) {
count++;
System.out.println("Txt: " + canopyId.toString() + " Vec: "
- + AbstractCluster.formatVector(vw.getVector().get(), null));
+ + AbstractCluster.formatVector(vw.getVector(), null));
}
assertEquals("number of points", points.size(), count);
reader.close();
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
Sun Sep 12 18:58:52 2010
@@ -116,7 +116,7 @@ public final class TestFuzzyKmeansCluste
list = new ArrayList<WeightedVectorWritable>();
pointClusterInfo.put(clusterId, list);
}
- list.add(new WeightedVectorWritable(clusterPdf, new
VectorWritable(point)));
+ list.add(new WeightedVectorWritable(clusterPdf, point));
double totalProb = 0;
for (int i = 0; i < clusterList.size(); i++) {
//SoftCluster cluster = clusterList.get(i);
Modified:
mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwMapper.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwMapper.java
(original)
+++
mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwMapper.java
Sun Sep 12 18:58:52 2010
@@ -60,10 +60,10 @@ public class CDbwMapper extends Mapper<I
List<VectorWritable> refPoints = representativePoints.get(key);
double totalDistance = 0.0;
for (VectorWritable refPoint : refPoints) {
- totalDistance += measure.distance(refPoint.get(),
point.getVector().get());
+ totalDistance += measure.distance(refPoint.get(), point.getVector());
}
if (currentMDP == null || currentMDP.getWeight() < totalDistance) {
- mostDistantPoints.put(key, new WeightedVectorWritable(totalDistance, new
VectorWritable(point.getVector().get().clone())));
+ mostDistantPoints.put(key, new WeightedVectorWritable(totalDistance,
point.getVector().clone()));
}
}
Modified:
mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwReducer.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwReducer.java
(original)
+++
mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwReducer.java
Sun Sep 12 18:58:52 2010
@@ -52,7 +52,7 @@ public class CDbwReducer extends Reducer
mdp = new WeightedVectorWritable(dpw.getWeight(), dpw.getVector());
}
}
- context.write(new IntWritable(key.get()), mdp.getVector());
+ context.write(new IntWritable(key.get()), new
VectorWritable(mdp.getVector()));
}
@Override
Modified:
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
(original)
+++
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
Sun Sep 12 18:58:52 2010
@@ -192,7 +192,7 @@ public final class ClusterDumper extends
WeightedVectorWritable point = iterator.next();
writer.write(String.valueOf(point.getWeight()));
writer.write(": ");
-
writer.write(AbstractCluster.formatVector(point.getVector().get(), dictionary));
+ writer.write(AbstractCluster.formatVector(point.getVector(),
dictionary));
if (iterator.hasNext()) {
writer.write("\n\t");
}
Modified:
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java?rev=996363&r1=996362&r2=996363&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
(original)
+++
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
Sun Sep 12 18:58:52 2010
@@ -196,7 +196,7 @@ public class ClusterLabels {
Set<String> idSet = new HashSet<String>();
for (WeightedVectorWritable wvw : wvws) {
- Vector vector = wvw.getVector().get();
+ Vector vector = wvw.getVector();
if (vector instanceof NamedVector) {
idSet.add(((NamedVector) vector).getName());
}
