Author: gsingers
Date: Wed Nov 2 15:30:40 2011
New Revision: 1196631
URL: http://svn.apache.org/viewvc?rev=1196631&view=rev
Log:
MAHOUT-864: fix DisplayCanopy
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayCanopy.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayCanopy.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayCanopy.java?rev=1196631&r1=1196630&r2=1196631&view=diff
==============================================================================
---
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayCanopy.java
(original)
+++
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayCanopy.java
Wed Nov 2 15:30:40 2011
@@ -17,14 +17,9 @@
package org.apache.mahout.clustering.display;
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.util.List;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.PathFilter;
import org.apache.mahout.clustering.Cluster;
import org.apache.mahout.clustering.canopy.CanopyDriver;
import org.apache.mahout.common.HadoopUtil;
@@ -32,6 +27,9 @@ import org.apache.mahout.common.RandomUt
import org.apache.mahout.common.distance.ManhattanDistanceMeasure;
import org.apache.mahout.math.DenseVector;
+import java.awt.*;
+import java.util.List;
+
/**
* Java desktop graphics class that runs canopy clustering and displays the
results.
* This class generates random data and clusters it.
@@ -81,7 +79,13 @@ public class DisplayCanopy extends Displ
//boolean b = true;
//if (b) {
CanopyDriver.buildClusters(conf, samples, output, new
ManhattanDistanceMeasure(), T1, T2, 0, true);
- loadClusters(output);
+ loadClusters(output, new PathFilter() {
+ @Override
+ public boolean accept(Path path) {
+ String pathString = path.toString();
+ return pathString.contains("/clusters-");
+ }
+ });
//} else {
// List<Vector> points = new ArrayList<Vector>();
// for (VectorWritable sample : SAMPLE_DATA) {
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java?rev=1196631&r1=1196630&r2=1196631&view=diff
==============================================================================
---
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java
(original)
+++
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java
Wed Nov 2 15:30:40 2011
@@ -38,6 +38,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.PathFilter;
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
@@ -273,6 +274,15 @@ public class DisplayClustering extends F
}
}
+ protected static void loadClusters(Path output, PathFilter filter) throws
IOException {
+ Configuration conf = new Configuration();
+ FileSystem fs = FileSystem.get(output.toUri(), conf);
+ for (FileStatus s : fs.listStatus(output, filter)) {
+ List<Cluster> clusters = readClusters(s.getPath());
+ CLUSTERS.add(clusters);
+ }
+ }
+
/**
* Generate random samples and add them to the sampleData
*
