Author: srowen
Date: Tue Apr 21 10:39:50 2009
New Revision: 767107
URL: http://svn.apache.org/viewvc?rev=767107&view=rev
Log:
Go ahead and remove some old 'Boolean' classes, plus first pass at code
inspection changes on some new clustering code
Removed:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserGenericDataModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/BooleanPrefUserFileDataModel.java
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayDirichlet.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayDirichlet.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayDirichlet.java?rev=767107&r1=767106&r2=767107&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayDirichlet.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayDirichlet.java
Tue Apr 21 10:39:50 2009
@@ -24,19 +24,19 @@
protected int res; //screen resolution
- protected int ds = 72; //default scale = 72 pixels per inch
+ protected final int ds = 72; //default scale = 72 pixels per inch
- protected int size = 8; // screen size in inches
+ protected final int size = 8; // screen size in inches
- public static List<Vector> sampleData = new ArrayList<Vector>();
+ public static final List<Vector> sampleData = new ArrayList<Vector>();
protected static List<Model<Vector>[]> result;
- protected static double significance = 0.05;
+ protected static final double significance = 0.05;
- static List<Vector> sampleParams = new ArrayList<Vector>();
+ private static final List<Vector> sampleParams = new ArrayList<Vector>();
- protected static Color[] colors = { Color.red, Color.orange, Color.yellow,
Color.green,
+ protected static final Color[] colors = { Color.red, Color.orange,
Color.yellow, Color.green,
Color.blue, Color.magenta, Color.lightGray };
/**
@@ -71,6 +71,7 @@
//Window listener to terminate program.
this.addWindowListener(new WindowAdapter() {
+ @Override
public void windowClosing(WindowEvent e) {
System.exit(0);
}
@@ -84,6 +85,7 @@
}
// Override the paint() method
+ @Override
public void paint(Graphics g) {
Graphics2D g2 = (Graphics2D) g;
plotSampleData(g);
@@ -186,7 +188,7 @@
* @param my double y-value of the sample mean
* @param sd double standard deviation of the samples
*/
- public static void generateSamples(int num, double mx, double my, double sd)
{
+ private static void generateSamples(int num, double mx, double my, double
sd) {
double[] params = { mx, my, sd, sd };
sampleParams.add(new DenseVector(params));
System.out.println("Generating " + num + " samples m=[" + mx + ", " + my
@@ -205,12 +207,12 @@
* @param sdx double x-value standard deviation of the samples
* @param sdy double y-value standard deviation of the samples
*/
- public static void generate2dSamples(int num, double mx, double my,
+ private static void generate2dSamples(int num, double mx, double my,
double sdx, double sdy) {
double[] params = { mx, my, sdx, sdy };
sampleParams.add(new DenseVector(params));
System.out.println("Generating " + num + " samples m=[" + mx + ", " + my
- + "] sd=[" + sdx + ", " + sdy + "]");
+ + "] sd=[" + sdx + ", " + sdy + ']');
for (int i = 0; i < num; i++)
sampleData.add(new DenseVector(new double[] {
UncommonDistributions.rNorm(mx, sdx),
@@ -224,7 +226,7 @@
printModels(result, 5);
}
- public static boolean isSignificant(Model<Vector> model) {
+ public static boolean isSignificant(Model<Vector> model) {
return (((double) model.count() / sampleData.size()) > significance);
}
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java?rev=767107&r1=767106&r2=767107&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java
Tue Apr 21 10:39:50 2009
@@ -34,7 +34,7 @@
import org.apache.mahout.utils.ManhattanDistanceMeasure;
class DisplayFuzzyKMeans extends DisplayDirichlet {
- public DisplayFuzzyKMeans() {
+ DisplayFuzzyKMeans() {
initialize();
this.setTitle("Fuzzy K-Means Clusters (> 5% of population)");
}
@@ -49,8 +49,9 @@
static double t2 = 1.5;
+ @Override
public void paint(Graphics g) {
- super.plotSampleData(g);
+ plotSampleData(g);
Graphics2D g2 = (Graphics2D) g;
Vector dv = new DenseVector(2);
int i = clusters.size() - 1;
@@ -85,7 +86,7 @@
* to clusters and returning if the iterations are completed.
*
* @param points the List<Vector> having the input points
- * @param clusters the List<Cluster> clusters
+ * @param clusterList the List<Cluster> clusters
* @param measure a DistanceMeasure to use
* @return
*/
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java?rev=767107&r1=767106&r2=767107&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java
Tue Apr 21 10:39:50 2009
@@ -32,7 +32,7 @@
import org.apache.mahout.utils.EuclideanDistanceMeasure;
class DisplayMeanShift extends DisplayDirichlet {
- public DisplayMeanShift() {
+ private DisplayMeanShift() {
initialize();
this.setTitle("Canopy Clusters (> 1.5% of population)");
}
@@ -41,8 +41,9 @@
private static List<MeanShiftCanopy> canopies = new
ArrayList<MeanShiftCanopy>();
- private static List<List<Vector>> iterationCenters = new
ArrayList<List<Vector>>();
+ private static final List<List<Vector>> iterationCenters = new
ArrayList<List<Vector>>();
+ @Override
public void paint(Graphics g) {
Graphics2D g2 = (Graphics2D) g;
double sx = (double) res / ds;
@@ -72,7 +73,7 @@
}
}
- public static void testReferenceImplementation() {
+ private static void testReferenceImplementation() {
MeanShiftCanopy.config(new EuclideanDistanceMeasure(), 1.0, 0.05, 0.5);
// add all points to the canopies
for (Vector aRaw : sampleData) {
