You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2008/07/21 22:47:06 UTC
svn commit: r678557 - in /lucene/mahout/trunk/core/src:
main/examples/org/apache/mahout/clustering/syntheticcontrol/kmeans/
main/java/org/apache/mahout/cf/taste/impl/model/file/
main/java/org/apache/mahout/cf/taste/impl/recommender/ main/java/org/apach...
Author: srowen
Date: Mon Jul 21 13:47:05 2008
New Revision: 678557
URL: http://svn.apache.org/viewvc?rev=678557&view=rev
Log:
Small tweaks suggested by IntelliJ code inspections
Modified:
lucene/mahout/trunk/core/src/main/examples/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractVector.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseMatrix.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/MatrixView.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseMatrix.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/VectorView.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parametered.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/MatrixTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestDenseVector.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestMatrixView.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestSparseVector.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestVectorView.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DefaultDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DefaultWeightedDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DummyOutputCollector.java
Modified: lucene/mahout/trunk/core/src/main/examples/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/examples/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/examples/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java (original)
+++ lucene/mahout/trunk/core/src/main/examples/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java Mon Jul 21 13:47:05 2008
@@ -56,7 +56,7 @@
*
* @param input the String denoting the input directory path
* @param output the String denoting the output directory path
- * @param measureClassName the String class name of the DistanceMeasure to use
+ * @param measureClass the String class name of the DistanceMeasure to use
* @param t1 the canopy T1 threshold
* @param t2 the canopy T2 threshold
* @param convergenceDelta the double convergence criteria for iterations
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java Mon Jul 21 13:47:05 2008
@@ -110,7 +110,7 @@
}
}
- private void processFile(Map<String, List<Preference>> data) throws IOException {
+ private void processFile(Map<String, List<Preference>> data) {
log.info("Reading file info...");
for (String line : new FileLineIterable(dataFile)) {
if (line.length() > 0) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java Mon Jul 21 13:47:05 2008
@@ -265,43 +265,7 @@
newCluster.add(user);
newClusters.add(newCluster);
}
- if (clusteringByThreshold) {
- Pair<Collection<User>, Collection<User>> nearestPair = findNearestClusters(newClusters);
- if (nearestPair != null) {
- Collection<User> cluster1 = nearestPair.getFirst();
- Collection<User> cluster2 = nearestPair.getSecond();
- while (clusterSimilarity.getSimilarity(cluster1, cluster2) >= clusteringThreshold) {
- newClusters.remove(cluster1);
- newClusters.remove(cluster2);
- Collection<User> merged = new HashSet<User>(cluster1.size() + cluster2.size());
- merged.addAll(cluster1);
- merged.addAll(cluster2);
- newClusters.add(merged);
- nearestPair = findNearestClusters(newClusters);
- if (nearestPair == null) {
- break;
- }
- cluster1 = nearestPair.getFirst();
- cluster2 = nearestPair.getSecond();
- }
- }
- } else {
- while (newClusters.size() > numClusters) {
- Pair<Collection<User>, Collection<User>> nearestPair =
- findNearestClusters(newClusters);
- if (nearestPair == null) {
- break;
- }
- Collection<User> cluster1 = nearestPair.getFirst();
- Collection<User> cluster2 = nearestPair.getSecond();
- newClusters.remove(cluster1);
- newClusters.remove(cluster2);
- Collection<User> merged = new HashSet<User>(cluster1.size() + cluster2.size());
- merged.addAll(cluster1);
- merged.addAll(cluster2);
- newClusters.add(merged);
- }
- }
+ findClusters(newClusters);
}
topRecsByUserID = computeTopRecsPerUserID(newClusters);
clustersByUserID = computeClustersPerUserID(newClusters);
@@ -317,6 +281,46 @@
}
}
+ private void findClusters(List<Collection<User>> newClusters) throws TasteException {
+ if (clusteringByThreshold) {
+ Pair<Collection<User>, Collection<User>> nearestPair = findNearestClusters(newClusters);
+ if (nearestPair != null) {
+ Collection<User> cluster1 = nearestPair.getFirst();
+ Collection<User> cluster2 = nearestPair.getSecond();
+ while (clusterSimilarity.getSimilarity(cluster1, cluster2) >= clusteringThreshold) {
+ newClusters.remove(cluster1);
+ newClusters.remove(cluster2);
+ Collection<User> merged = new HashSet<User>(cluster1.size() + cluster2.size());
+ merged.addAll(cluster1);
+ merged.addAll(cluster2);
+ newClusters.add(merged);
+ nearestPair = findNearestClusters(newClusters);
+ if (nearestPair == null) {
+ break;
+ }
+ cluster1 = nearestPair.getFirst();
+ cluster2 = nearestPair.getSecond();
+ }
+ }
+ } else {
+ while (newClusters.size() > numClusters) {
+ Pair<Collection<User>, Collection<User>> nearestPair =
+ findNearestClusters(newClusters);
+ if (nearestPair == null) {
+ break;
+ }
+ Collection<User> cluster1 = nearestPair.getFirst();
+ Collection<User> cluster2 = nearestPair.getSecond();
+ newClusters.remove(cluster1);
+ newClusters.remove(cluster2);
+ Collection<User> merged = new HashSet<User>(cluster1.size() + cluster2.size());
+ merged.addAll(cluster1);
+ merged.addAll(cluster2);
+ newClusters.add(merged);
+ }
+ }
+ }
+
private Pair<Collection<User>, Collection<User>> findNearestClusters(List<Collection<User>> clusters)
throws TasteException {
int size = clusters.size();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java Mon Jul 21 13:47:05 2008
@@ -57,7 +57,7 @@
private static DistanceMeasure measure;
// this canopy's canopyId
- private int canopyId;
+ private final int canopyId;
// the current center
private Vector center = new SparseVector(0);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyMapper.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyMapper.java Mon Jul 21 13:47:05 2008
@@ -33,7 +33,7 @@
public class CanopyMapper extends MapReduceBase implements
Mapper<WritableComparable, Text, Text, Text> {
- private List<Canopy> canopies = new ArrayList<Canopy>();
+ private final List<Canopy> canopies = new ArrayList<Canopy>();
/*
* (non-Javadoc)
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyReducer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyReducer.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyReducer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyReducer.java Mon Jul 21 13:47:05 2008
@@ -33,7 +33,7 @@
public class CanopyReducer extends MapReduceBase implements
Reducer<Text, Text, Text, Text> {
- private List<Canopy> canopies = new ArrayList<Canopy>();
+ private final List<Canopy> canopies = new ArrayList<Canopy>();
/*
* (non-Javadoc)
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java Mon Jul 21 13:47:05 2008
@@ -38,7 +38,7 @@
private static int nextClusterId = 0;
// this cluster's clusterId
- private int clusterId;
+ private final int clusterId;
// the current center
private Vector center = new SparseVector(0);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyMapper.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyMapper.java Mon Jul 21 13:47:05 2008
@@ -32,7 +32,7 @@
public class MeanShiftCanopyMapper extends MapReduceBase implements
Mapper<WritableComparable, Text, Text, WritableComparable> {
- private List<MeanShiftCanopy> canopies = new ArrayList<MeanShiftCanopy>();
+ private final List<MeanShiftCanopy> canopies = new ArrayList<MeanShiftCanopy>();
/*
* (non-Javadoc)
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyReducer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyReducer.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyReducer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyReducer.java Mon Jul 21 13:47:05 2008
@@ -33,9 +33,7 @@
public class MeanShiftCanopyReducer extends MapReduceBase implements
Reducer<Text, WritableComparable, Text, WritableComparable> {
- private List<MeanShiftCanopy> canopies = new ArrayList<MeanShiftCanopy>();
-
- private OutputCollector<Text, WritableComparable> collector;
+ private final List<MeanShiftCanopy> canopies = new ArrayList<MeanShiftCanopy>();
/*
* (non-Javadoc)
@@ -47,7 +45,6 @@
public void reduce(Text key, Iterator<WritableComparable> values,
OutputCollector<Text, WritableComparable> output, Reporter reporter)
throws IOException {
- collector = output;
try {
while (values.hasNext()) {
Text value = (Text) values.next();
@@ -57,7 +54,7 @@
for (MeanShiftCanopy canopy : canopies) {
canopy.shiftToMean();
- collector.collect(new Text(canopy.getIdentifier()), new Text(
+ output.collect(new Text(canopy.getIdentifier()), new Text(
MeanShiftCanopy.formatCanopy(canopy)));
}
} catch (CardinalityException e) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractVector.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractVector.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractVector.java Mon Jul 21 13:47:05 2008
@@ -130,7 +130,7 @@
}
public class Element implements Vector.Element {
- private int ind;
+ private final int ind;
public Element(int ind) {
this.ind = ind;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseMatrix.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseMatrix.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseMatrix.java Mon Jul 21 13:47:05 2008
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.mahout.matrix;
import org.apache.hadoop.io.Text;
@@ -25,7 +26,7 @@
*/
public class DenseMatrix extends AbstractMatrix {
- private double[][] values;
+ private final double[][] values;
private int columnSize() {
return values[0].length;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/MatrixView.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/MatrixView.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/MatrixView.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/MatrixView.java Mon Jul 21 13:47:05 2008
@@ -24,13 +24,13 @@
*/
public class MatrixView extends AbstractMatrix {
- private Matrix matrix;
+ private final Matrix matrix;
// the offset into the Matrix
- private int[] offset;
+ private final int[] offset;
// the cardinality of the view
- private int[] cardinality;
+ private final int[] cardinality;
/**
* Construct a view of the matrix with given offset and cardinality
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java Mon Jul 21 13:47:05 2008
@@ -25,9 +25,9 @@
*/
public class SparseColumnMatrix extends AbstractMatrix {
- private int[] cardinality;
+ private final int[] cardinality;
- private Vector[] columns;
+ private final Vector[] columns;
/**
* Construct a matrix of the given cardinality with the given data columns
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseMatrix.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseMatrix.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseMatrix.java Mon Jul 21 13:47:05 2008
@@ -30,9 +30,9 @@
*/
public class SparseMatrix extends AbstractMatrix {
- private int[] cardinality;
+ private final int[] cardinality;
- private Map<Integer, Vector> rows;
+ private final Map<Integer, Vector> rows;
/**
* Construct a matrix of the given cardinality with the given row map
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java Mon Jul 21 13:47:05 2008
@@ -25,9 +25,9 @@
*/
public class SparseRowMatrix extends AbstractMatrix {
- private int[] cardinality;
+ private final int[] cardinality;
- private Vector[] rows;
+ private final Vector[] rows;
/**
* Construct a matrix of the given cardinality with the given rows
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java Mon Jul 21 13:47:05 2008
@@ -27,7 +27,6 @@
/**
* Implements vector that only stores non-zero doubles
- *
*/
public class SparseVector extends AbstractVector {
@@ -187,10 +186,7 @@
SparseVector that = (SparseVector) o;
- if (cardinality != that.cardinality) return false;
- if (values != null ? !values.equals(that.values) : that.values != null) return false;
-
- return true;
+ return cardinality == that.cardinality && (values == null ? that.values == null : values.equals(that.values));
}
public int hashCode() {
@@ -201,7 +197,7 @@
}
private class Iterator implements java.util.Iterator<Vector.Element> {
- private java.util.Iterator<Map.Entry<Integer, Double>> it;
+ private final java.util.Iterator<Map.Entry<Integer, Double>> it;
public Iterator() {
it = values.entrySet().iterator();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/VectorView.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/VectorView.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/VectorView.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/VectorView.java Mon Jul 21 13:47:05 2008
@@ -144,7 +144,7 @@
}
public class ViewIterator implements Iterator<Vector.Element> {
- private Iterator<Vector.Element> it;
+ private final Iterator<Vector.Element> it;
private Vector.Element el;
public ViewIterator() {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parametered.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parametered.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parametered.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parametered.java Mon Jul 21 13:47:05 2008
@@ -103,7 +103,7 @@
}
private static class Help {
- private StringBuilder sb;
+ private final StringBuilder sb;
public String toString() {
return sb.toString();
@@ -112,7 +112,7 @@
private int longestName = 0;
private int numChars = 100; // a few extra just to be sure
- int distanceBetweenNameAndDescription = 8; // todo: hmmm in the end this is 5 letters less that it says.. not sure why
+ final int distanceBetweenNameAndDescription = 8; // todo: hmmm in the end this is 5 letters less that it says.. not sure why
private void recurseCount(Parametered parametered) {
for (Parameter parameter : parametered.getParameters()) {
@@ -158,7 +158,7 @@
private static class Conf {
- private StringBuilder sb;
+ private final StringBuilder sb;
public String toString() {
return sb.toString();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java Mon Jul 21 13:47:05 2008
@@ -53,13 +53,13 @@
List<Canopy> referenceManhattan;
- DistanceMeasure manhattanDistanceMeasure = new ManhattanDistanceMeasure();
+ final DistanceMeasure manhattanDistanceMeasure = new ManhattanDistanceMeasure();
List<Vector> manhattanCentroids;
List<Canopy> referenceEuclidean;
- DistanceMeasure euclideanDistanceMeasure = new EuclideanDistanceMeasure();
+ final DistanceMeasure euclideanDistanceMeasure = new EuclideanDistanceMeasure();
List<Vector> euclideanCentroids;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java Mon Jul 21 13:47:05 2008
@@ -27,7 +27,8 @@
* for production use since it holds onto all its points.
*/
public class VisibleCanopy extends Canopy {
- private List<Vector> points = new ArrayList<Vector>();
+
+ private final List<Vector> points = new ArrayList<Vector>();
public VisibleCanopy(Vector point) {
super(point);
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java Mon Jul 21 13:47:05 2008
@@ -49,7 +49,7 @@
static final double[][] reference = { { 1, 1 }, { 2, 1 }, { 1, 2 }, { 2, 2 },
{ 3, 3 }, { 4, 4 }, { 5, 4 }, { 4, 5 }, { 5, 5 } };
- static int[][] expectedNumPoints = { { 9 }, { 4, 5 }, { 4, 5, 0 },
+ static final int[][] expectedNumPoints = { { 9 }, { 4, 5 }, { 4, 5, 0 },
{ 1, 2, 1, 5 }, { 1, 1, 1, 2, 4 }, { 1, 1, 1, 1, 1, 4 },
{ 1, 1, 1, 1, 1, 2, 2 }, { 1, 1, 1, 1, 1, 1, 2, 1 },
{ 1, 1, 1, 1, 1, 1, 1, 1, 1 } };
@@ -485,9 +485,8 @@
}
/**
- * Split pattern for {@link #decodePoint(String)}.
+ * Split pattern for <code>decodePoint(String)</code>
*/
-
public static void writePointsToFile(List<Vector> points, String fileName)
throws IOException {
writePointsToFileWithPayload(points, fileName, "");
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java Mon Jul 21 13:47:05 2008
@@ -47,7 +47,7 @@
DistanceMeasure manhattanDistanceMeasure = new ManhattanDistanceMeasure();
- DistanceMeasure euclideanDistanceMeasure = new EuclideanDistanceMeasure();
+ final DistanceMeasure euclideanDistanceMeasure = new EuclideanDistanceMeasure();
public TestMeanShift(String name) {
super(name);
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/MatrixTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/MatrixTest.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/MatrixTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/MatrixTest.java Mon Jul 21 13:47:05 2008
@@ -20,11 +20,12 @@
import junit.framework.TestCase;
public abstract class MatrixTest extends TestCase {
- protected static int ROW = AbstractMatrix.ROW;
- protected static int COL = AbstractMatrix.COL;
+ protected static final int ROW = AbstractMatrix.ROW;
- protected double[][] values = {{1.1, 2.2}, {3.3, 4.4}, {5.5, 6.6}};
+ protected static final int COL = AbstractMatrix.COL;
+
+ protected final double[][] values = {{1.1, 2.2}, {3.3, 4.4}, {5.5, 6.6}};
protected Matrix test;
@@ -107,7 +108,7 @@
array[row][col]);
}
- public void testViewPart() throws Exception {
+ public void testViewPart() {
int[] offset = {1, 1};
int[] size = {2, 1};
Matrix view = test.viewPart(offset, size);
@@ -166,7 +167,7 @@
row, col));
}
- public void testAssignDoubleArrayArray() throws Exception {
+ public void testAssignDoubleArrayArray() {
int[] c = test.cardinality();
test.assign(new double[3][2]);
for (int row = 0; row < c[ROW]; row++)
@@ -185,7 +186,7 @@
}
}
- public void testAssignMatrixBinaryFunction() throws Exception {
+ public void testAssignMatrixBinaryFunction() {
int[] c = test.cardinality();
test.assign(test, new PlusFunction());
for (int row = 0; row < c[ROW]; row++)
@@ -203,7 +204,7 @@
}
}
- public void testAssignMatrix() throws Exception {
+ public void testAssignMatrix() {
int[] c = test.cardinality();
Matrix value = test.like();
value.assign(test);
@@ -240,7 +241,7 @@
values[row][col] / 4.53, value.getQuick(row, col));
}
- public void testGet() throws Exception {
+ public void testGet() {
int[] c = test.cardinality();
for (int row = 0; row < c[ROW]; row++)
for (int col = 0; col < c[COL]; col++)
@@ -272,7 +273,7 @@
}
}
- public void testMinus() throws Exception {
+ public void testMinus() {
int[] c = test.cardinality();
Matrix value = test.minus(test);
for (int row = 0; row < c[ROW]; row++)
@@ -299,7 +300,7 @@
values[row][col] + 4.53, value.getQuick(row, col));
}
- public void testPlusMatrix() throws Exception {
+ public void testPlusMatrix() {
int[] c = test.cardinality();
Matrix value = test.plus(test);
for (int row = 0; row < c[ROW]; row++)
@@ -352,7 +353,7 @@
values[row][col] * 4.53, value.getQuick(row, col));
}
- public void testTimesMatrix() throws Exception {
+ public void testTimesMatrix() {
int[] c = test.cardinality();
Matrix transpose = test.transpose();
Matrix value = test.times(transpose);
@@ -392,7 +393,7 @@
assertEquals("zsum", 23.1, sum);
}
- public void testAssignRow() throws Exception {
+ public void testAssignRow() {
double[] data = {2.1, 3.2};
test.assignRow(1, new DenseVector(data));
assertEquals("test[1][0]", 2.1, test.getQuick(1, 0));
@@ -409,7 +410,7 @@
}
}
- public void testAssignColumn() throws Exception {
+ public void testAssignColumn() {
double[] data = {2.1, 3.2, 4.3};
test.assignColumn(1, new DenseVector(data));
assertEquals("test[0][1]", 2.1, test.getQuick(0, 1));
@@ -427,7 +428,7 @@
}
}
- public void testGetRow() throws Exception {
+ public void testGetRow() {
Vector row = test.getRow(1);
assertEquals("row size", 2, row.size());
}
@@ -450,7 +451,7 @@
}
}
- public void testGetColumn() throws Exception {
+ public void testGetColumn() {
Vector column = test.getColumn(1);
assertEquals("row size", 3, column.size());
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestDenseVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestDenseVector.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestDenseVector.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestDenseVector.java Mon Jul 21 13:47:05 2008
@@ -23,9 +23,9 @@
public class TestDenseVector extends TestCase {
- double[] values = {1.1, 2.2, 3.3};
+ final double[] values = {1.1, 2.2, 3.3};
- Vector test = new DenseVector(values);
+ final Vector test = new DenseVector(values);
public TestDenseVector(String name) {
super(name);
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestMatrixView.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestMatrixView.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestMatrixView.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestMatrixView.java Mon Jul 21 13:47:05 2008
@@ -20,11 +20,12 @@
import junit.framework.TestCase;
public class TestMatrixView extends TestCase {
- private static int ROW = AbstractMatrix.ROW;
- private static int COL = AbstractMatrix.COL;
+ private static final int ROW = AbstractMatrix.ROW;
- private double[][] values = { { 0.0, 1.1, 2.2 }, { 1.1, 2.2, 3.3 },
+ private static final int COL = AbstractMatrix.COL;
+
+ private final double[][] values = { { 0.0, 1.1, 2.2 }, { 1.1, 2.2, 3.3 },
{ 3.3, 4.4, 5.5 }, { 5.5, 6.6, 7.7 }, { 7.7, 8.8, 9.9 } };
private Matrix test;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestSparseVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestSparseVector.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestSparseVector.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestSparseVector.java Mon Jul 21 13:47:05 2008
@@ -20,9 +20,9 @@
public class TestSparseVector extends TestCase {
- double[] values = {1.1, 2.2, 3.3};
+ final double[] values = {1.1, 2.2, 3.3};
- Vector test = new SparseVector(values.length + 2);
+ final Vector test = new SparseVector(values.length + 2);
public TestSparseVector(String name) {
super(name);
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestVectorView.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestVectorView.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestVectorView.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestVectorView.java Mon Jul 21 13:47:05 2008
@@ -24,9 +24,9 @@
private static final int offset = 1;
- double[] values = {0.0, 1.1, 2.2, 3.3, 4.4, 5.5};
+ final double[] values = {0.0, 1.1, 2.2, 3.3, 4.4, 5.5};
- Vector test = new VectorView(new DenseVector(values), offset, cardinality);
+ final Vector test = new VectorView(new DenseVector(values), offset, cardinality);
public TestVectorView(String name) {
super(name);
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DefaultDistanceMeasureTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DefaultDistanceMeasureTest.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DefaultDistanceMeasureTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DefaultDistanceMeasureTest.java Mon Jul 21 13:47:05 2008
@@ -26,7 +26,7 @@
public abstract DistanceMeasure distanceMeasureFactory();
- public void testMeasure() throws Exception {
+ public void testMeasure() {
DistanceMeasure distanceMeasure = distanceMeasureFactory();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DefaultWeightedDistanceMeasureTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DefaultWeightedDistanceMeasureTest.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DefaultWeightedDistanceMeasureTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DefaultWeightedDistanceMeasureTest.java Mon Jul 21 13:47:05 2008
@@ -25,7 +25,7 @@
public abstract WeightedDistanceMeasure distanceMeasureFactory();
- public void testMeasureWeighted() throws Exception {
+ public void testMeasureWeighted() {
WeightedDistanceMeasure distanceMeasure = distanceMeasureFactory();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DummyOutputCollector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DummyOutputCollector.java?rev=678557&r1=678556&r2=678557&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DummyOutputCollector.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DummyOutputCollector.java Mon Jul 21 13:47:05 2008
@@ -29,7 +29,7 @@
public class DummyOutputCollector<K extends WritableComparable, V extends Writable> implements OutputCollector<K, V> {
- Map<String, List<V>> data = new TreeMap<String, List<V>>();
+ final Map<String, List<V>> data = new TreeMap<String, List<V>>();
public void collect(K key, V values)
throws IOException {