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 2010/05/07 19:12:28 UTC
svn commit: r942151 - in /lucene/mahout/trunk/core/src:
main/java/org/apache/mahout/cf/taste/hadoop/similarity/
main/java/org/apache/mahout/classifier/
main/java/org/apache/mahout/clustering/
main/java/org/apache/mahout/clustering/canopy/ main/java/org...
Author: srowen
Date: Fri May 7 17:12:27 2010
New Revision: 942151
URL: http://svn.apache.org/viewvc?rev=942151&view=rev
Log:
Style bits?
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/DistributedUncenteredZeroAssumingCosineSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/WeightedVectorWritable.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierSelfTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.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/lda/TestMapReduce.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/df/mapreduce/inmem/InMemInputFormatTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthTest.java
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/DistributedUncenteredZeroAssumingCosineSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/DistributedUncenteredZeroAssumingCosineSimilarity.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/DistributedUncenteredZeroAssumingCosineSimilarity.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/DistributedUncenteredZeroAssumingCosineSimilarity.java Fri May 7 17:12:27 2010
@@ -42,7 +42,7 @@ public final class DistributedUncentered
double length = 0.0;
while (prefValues.hasNext()) {
float prefValue = prefValues.next();
- if (!((Float)prefValue).isNaN()) {
+ if (!Float.isNaN(prefValue)) {
length += prefValue * prefValue;
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java Fri May 7 17:12:27 2010
@@ -258,10 +258,7 @@ public final class BayesFileFormatter {
* @throws IOException
* if the files can't be dealt with properly
*/
- public static void main(String[] args) throws ClassNotFoundException,
- IllegalAccessException,
- InstantiationException,
- IOException {
+ public static void main(String[] args) throws Exception {
DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
ArgumentBuilder abuilder = new ArgumentBuilder();
GroupBuilder gbuilder = new GroupBuilder();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/WeightedVectorWritable.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/WeightedVectorWritable.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/WeightedVectorWritable.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/WeightedVectorWritable.java Fri May 7 17:12:27 2010
@@ -68,7 +68,7 @@ public class WeightedVectorWritable impl
}
public String toString() {
- return String.valueOf(weight) + ": " + (vector == null ? "null" : ClusterBase.formatVector(vector.get(), null));
+ return weight + ": " + (vector == null ? "null" : ClusterBase.formatVector(vector.get(), null));
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java Fri May 7 17:12:27 2010
@@ -23,7 +23,6 @@ import java.util.Iterator;
import java.util.List;
import org.apache.hadoop.io.IntWritable;
-import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reporter;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java Fri May 7 17:12:27 2010
@@ -28,7 +28,6 @@ import org.apache.commons.cli2.builder.D
import org.apache.commons.cli2.builder.GroupBuilder;
import org.apache.commons.cli2.commandline.Parser;
import org.apache.hadoop.conf.Configurable;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
@@ -156,7 +155,7 @@ public final class CanopyDriver {
FileInputFormat.setInputPaths(conf, input);
- Path canopyOutputDir = new Path(output, Cluster.CLUSTERS_DIR + "0");
+ Path canopyOutputDir = new Path(output, Cluster.CLUSTERS_DIR + '0');
FileOutputFormat.setOutputPath(conf, canopyOutputDir);
conf.setMapperClass(CanopyMapper.class);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java Fri May 7 17:12:27 2010
@@ -241,7 +241,7 @@ public class DirichletClusterer<O> {
* @param output
* @throws IOException
*/
- void emitMostLikelyCluster(VectorWritable point, List<DirichletCluster> clusters, Vector pi,
+ static void emitMostLikelyCluster(VectorWritable point, List<DirichletCluster> clusters, Vector pi,
OutputCollector<IntWritable, WeightedVectorWritable> output) throws IOException {
int clusterId = -1;
double clusterPdf = 0;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java Fri May 7 17:12:27 2010
@@ -185,7 +185,7 @@ public class FuzzyKMeansClusterer {
* @param output
* @throws IOException
*/
- void emitMostLikelyCluster(Vector point, List<SoftCluster> clusters, Vector clusterPdfList,
+ static void emitMostLikelyCluster(Vector point, List<SoftCluster> clusters, Vector clusterPdfList,
OutputCollector<IntWritable, WeightedVectorWritable> output) throws IOException {
int clusterId = -1;
double clusterPdf = 0;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java Fri May 7 17:12:27 2010
@@ -26,7 +26,6 @@ import org.apache.mahout.clustering.Clus
import org.apache.mahout.math.CardinalityException;
import org.apache.mahout.math.JsonVectorAdapter;
import org.apache.mahout.math.RandomAccessSparseVector;
-import org.apache.mahout.math.SequentialAccessSparseVector;
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
import org.apache.mahout.math.list.IntArrayList;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java Fri May 7 17:12:27 2010
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapred.JobConf;
@@ -29,7 +28,6 @@ import org.apache.hadoop.mapred.OutputCo
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
import org.apache.mahout.math.Vector;
-import org.apache.mahout.math.VectorWritable;
public class MeanShiftCanopyClusterer {
@@ -185,7 +183,7 @@ public class MeanShiftCanopyClusterer {
* Story: User can exercise the reference implementation to verify that the test datapoints are clustered in
* a reasonable manner.
*/
- public void testReferenceImplementation() {
+ public static void testReferenceImplementation() {
MeanShiftCanopyClusterer clusterer = new MeanShiftCanopyClusterer(new EuclideanDistanceMeasure(), 4.0, 1.0, 0.5);
List<MeanShiftCanopy> canopies = new ArrayList<MeanShiftCanopy>();
// add all points to the canopies
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java Fri May 7 17:12:27 2010
@@ -53,7 +53,7 @@ public final class MeanShiftCanopyDriver
public static final String STATE_IN_KEY = "org.apache.mahout.clustering.meanshift.stateInKey";
- protected static final String CONTROL_CONVERGED = "control/converged";
+ private static final String CONTROL_CONVERGED = "control/converged";
private MeanShiftCanopyDriver() {
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java Fri May 7 17:12:27 2010
@@ -88,92 +88,87 @@ public class MahoutDriver {
}
public static void main(String[] args) throws Throwable {
- try {
- ProgramDriver programDriver = new ProgramDriver();
- Properties mainClasses = new Properties();
- InputStream propsStream = Thread.currentThread()
- .getContextClassLoader()
- .getResourceAsStream("driver.classes.props");
-
- mainClasses.load(propsStream);
-
- boolean foundShortName = false;
- for(Object key : mainClasses.keySet()) {
- String keyString = (String) key;
- if(args.length > 0 && shortName(mainClasses.getProperty(keyString)).equals(args[0])) {
- foundShortName = true;
- }
- addClass(programDriver, keyString, mainClasses.getProperty(keyString));
- }
- if(args.length < 1 || args[0] == null || args[0].equals("-h") || args[0].equals("--help")) {
- programDriver.driver(args);
+ ProgramDriver programDriver = new ProgramDriver();
+ Properties mainClasses = new Properties();
+ InputStream propsStream = Thread.currentThread()
+ .getContextClassLoader()
+ .getResourceAsStream("driver.classes.props");
+
+ mainClasses.load(propsStream);
+
+ boolean foundShortName = false;
+ for(Object key : mainClasses.keySet()) {
+ String keyString = (String) key;
+ if(args.length > 0 && shortName(mainClasses.getProperty(keyString)).equals(args[0])) {
+ foundShortName = true;
}
- String progName = args[0];
- if(!foundShortName) {
- addClass(programDriver, progName, progName);
- }
- shift(args);
+ addClass(programDriver, keyString, mainClasses.getProperty(keyString));
+ }
+ if(args.length < 1 || args[0] == null || args[0].equals("-h") || args[0].equals("--help")) {
+ programDriver.driver(args);
+ }
+ String progName = args[0];
+ if(!foundShortName) {
+ addClass(programDriver, progName, progName);
+ }
+ shift(args);
- InputStream defaultsStream = Thread.currentThread()
- .getContextClassLoader()
- .getResourceAsStream(progName + ".props");
-
- Properties mainProps = new Properties();
- if (defaultsStream != null) { // can't find props file, use empty props.
- mainProps.load(defaultsStream);
- } else {
- log.warn("No " + progName + ".props found on classpath, will use command-line arguments only");
- }
- Map<String,String[]> argMap = new HashMap<String,String[]>();
- int i=0;
- while(i<args.length && args[i] != null) {
- List<String> argValues = new ArrayList<String>();
- String arg = args[i];
- i++;
- if(arg.length() > 2 && arg.charAt(1) == 'D') { // '-Dkey=value' or '-Dkey=value1,value2,etc' case
- String[] argSplit = arg.split("=");
- arg = argSplit[0];
- if(argSplit.length == 2) {
- argValues.add(argSplit[1]);
- }
- } else { // '-key [values]' or '--key [values]' case.
- while(i<args.length && args[i] != null) {
- if(args[i].length() > 0 && args[i].charAt(0) != '-') {
- argValues.add(args[i]);
- i++;
- } else {
- break;
- }
+ InputStream defaultsStream = Thread.currentThread()
+ .getContextClassLoader()
+ .getResourceAsStream(progName + ".props");
+
+ Properties mainProps = new Properties();
+ if (defaultsStream != null) { // can't find props file, use empty props.
+ mainProps.load(defaultsStream);
+ } else {
+ log.warn("No " + progName + ".props found on classpath, will use command-line arguments only");
+ }
+ Map<String,String[]> argMap = new HashMap<String,String[]>();
+ int i=0;
+ while(i<args.length && args[i] != null) {
+ List<String> argValues = new ArrayList<String>();
+ String arg = args[i];
+ i++;
+ if(arg.length() > 2 && arg.charAt(1) == 'D') { // '-Dkey=value' or '-Dkey=value1,value2,etc' case
+ String[] argSplit = arg.split("=");
+ arg = argSplit[0];
+ if(argSplit.length == 2) {
+ argValues.add(argSplit[1]);
+ }
+ } else { // '-key [values]' or '--key [values]' case.
+ while(i<args.length && args[i] != null) {
+ if(args[i].length() > 0 && args[i].charAt(0) != '-') {
+ argValues.add(args[i]);
+ i++;
+ } else {
+ break;
}
}
- argMap.put(arg, argValues.toArray(new String[argValues.size()]));
}
- for (String key : mainProps.stringPropertyNames()) {
- String[] argNamePair = key.split("\\|");
- String shortArg = '-' + argNamePair[0].trim();
- String longArg = argNamePair.length < 2 ? null : "--" + argNamePair[1].trim();
- if(!argMap.containsKey(shortArg) && (longArg == null || !argMap.containsKey(longArg))) {
- argMap.put(longArg, new String[] { mainProps.getProperty(key) } );
- }
+ argMap.put(arg, argValues.toArray(new String[argValues.size()]));
+ }
+ for (String key : mainProps.stringPropertyNames()) {
+ String[] argNamePair = key.split("\\|");
+ String shortArg = '-' + argNamePair[0].trim();
+ String longArg = argNamePair.length < 2 ? null : "--" + argNamePair[1].trim();
+ if(!argMap.containsKey(shortArg) && (longArg == null || !argMap.containsKey(longArg))) {
+ argMap.put(longArg, new String[] { mainProps.getProperty(key) } );
}
- List<String> argsList = new ArrayList<String>();
- argsList.add(progName);
- for(String arg : argMap.keySet()) {
- if(arg.startsWith("-D")) { // arg is -Dkey - if value for this !isEmpty(), then arg -> -Dkey + "=" + value
- if(argMap.get(arg).length > 0 && !argMap.get(arg)[0].trim().isEmpty()) {
- arg += '=' + argMap.get(arg)[0].trim();
- }
- }
- argsList.add(arg);
- if(!arg.startsWith("-D")) {
- argsList.addAll(Arrays.asList(argMap.get(arg)));
+ }
+ List<String> argsList = new ArrayList<String>();
+ argsList.add(progName);
+ for(String arg : argMap.keySet()) {
+ if(arg.startsWith("-D")) { // arg is -Dkey - if value for this !isEmpty(), then arg -> -Dkey + "=" + value
+ if(argMap.get(arg).length > 0 && !argMap.get(arg)[0].trim().isEmpty()) {
+ arg += '=' + argMap.get(arg)[0].trim();
}
}
- programDriver.driver(argsList.toArray(new String[argsList.size()]));
- } catch (Throwable e) {
- log.error("MahoutDriver failed with args: " + Arrays.toString(args) + '\n' + e.getMessage());
- throw e;
+ argsList.add(arg);
+ if(!arg.startsWith("-D")) {
+ argsList.addAll(Arrays.asList(argMap.get(arg)));
+ }
}
+ programDriver.driver(argsList.toArray(new String[argsList.size()]));
}
private static String[] shift(String[] args) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java Fri May 7 17:12:27 2010
@@ -133,7 +133,7 @@ public class EigenVerificationJob extend
return 0;
}
- public Map<String,String> handleArgs(String[] args) {
+ public static Map<String,String> handleArgs(String[] args) {
Option eigenInputOpt = buildOption("eigenInput", "ei",
"The Path for purported eigenVector input files (SequenceFile<WritableComparable,VectorWritable>.", null);
Option corpusInputOpt = buildOption("corpusInput", "ci",
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java Fri May 7 17:12:27 2010
@@ -33,7 +33,6 @@ import org.apache.mahout.cf.taste.simila
import java.io.File;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.nio.charset.Charset;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierSelfTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierSelfTest.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierSelfTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierSelfTest.java Fri May 7 17:12:27 2010
@@ -20,18 +20,14 @@ package org.apache.mahout.classifier.bay
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.nio.charset.Charset;
import java.util.List;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.SequenceFile;
-import org.apache.hadoop.io.Text;
import org.apache.mahout.classifier.ClassifierData;
import org.apache.mahout.classifier.ClassifierResult;
import org.apache.mahout.classifier.ResultAnalyzer;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java Fri May 7 17:12:27 2010
@@ -131,10 +131,11 @@ public class TestFuzzyKmeansClustering e
for (SoftCluster cluster : clusterList) {
System.out.println(cluster.asFormatString(null));
List<WeightedVectorWritable> list = pointClusterInfo.get(cluster.getId());
- if (list != null)
+ if (list != null) {
for (WeightedVectorWritable vector : list) {
System.out.println("\t" + vector);
}
+ }
}
}
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=942151&r1=942150&r2=942151&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 Fri May 7 17:12:27 2010
@@ -83,8 +83,7 @@ public class TestKmeansClustering extend
public static List<VectorWritable> getPointsWritable(double[][] raw) {
List<VectorWritable> points = new ArrayList<VectorWritable>();
- for (int i = 0; i < raw.length; i++) {
- double[] fr = raw[i];
+ for (double[] fr : raw) {
Vector vec = new RandomAccessSparseVector(fr.length);
vec.assign(fr);
points.add(new VectorWritable(vec));
@@ -94,8 +93,7 @@ public class TestKmeansClustering extend
public static List<Vector> getPoints(double[][] raw) {
List<Vector> points = new ArrayList<Vector>();
- for (int i = 0; i < raw.length; i++) {
- double[] fr = raw[i];
+ for (double[] fr : raw) {
Vector vec = new SequentialAccessSparseVector(fr.length);
vec.assign(fr);
points.add(vec);
@@ -313,8 +311,7 @@ public class TestKmeansClustering extend
// now verify that all clusters have correct centers
converged = true;
- for (int i = 0; i < reference.size(); i++) {
- Cluster ref = reference.get(i);
+ for (Cluster ref : reference) {
String key = ref.getIdentifier();
List<Cluster> values = collector3.getValue(new Text(key));
Cluster cluster = values.get(0);
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java Fri May 7 17:12:27 2010
@@ -16,11 +16,7 @@
*/
package org.apache.mahout.clustering.lda;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.verify;
+import org.easymock.classextension.EasyMock;
import java.io.File;
import java.util.Iterator;
@@ -86,8 +82,6 @@ public class TestMapReduce extends Mahou
protected void setUp() throws Exception {
super.setUp();
random = RandomUtils.getRandom();
- File f = new File("input");
- f.mkdir();
}
/**
@@ -102,14 +96,14 @@ public class TestMapReduce extends Mahou
for(int i = 0; i < NUM_TESTS; ++i) {
RandomAccessSparseVector v = generateRandomDoc(100,0.3);
int myNumWords = numNonZero(v);
- LDAMapper.Context mock = createMock(LDAMapper.Context.class);
+ LDAMapper.Context mock = EasyMock.createMock(LDAMapper.Context.class);
- mock.write(isA(IntPairWritable.class),isA(DoubleWritable.class));
- expectLastCall().times(myNumWords * NUM_TOPICS + NUM_TOPICS + 1);
- replay(mock);
+ mock.write(EasyMock.isA(IntPairWritable.class), EasyMock.isA(DoubleWritable.class));
+ EasyMock.expectLastCall().times(myNumWords * NUM_TOPICS + NUM_TOPICS + 1);
+ EasyMock.replay(mock);
VectorWritable vw = new VectorWritable(v);
mapper.map(new Text("tstMapper"), vw, mock);
- verify(mock);
+ EasyMock.verify(mock);
}
}
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=942151&r1=942150&r2=942151&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 Fri May 7 17:12:27 2010
@@ -17,7 +17,6 @@
package org.apache.mahout.clustering.meanshift;
-import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormatTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormatTest.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormatTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormatTest.java Fri May 7 17:12:27 2010
@@ -60,10 +60,11 @@ public class InMemInputFormatTest extend
assertEquals(expectedId, split.getFirstId());
- if (index < numSplits - 1)
+ if (index < numSplits - 1) {
assertEquals(nbTreesPerSplit, split.getNbTrees());
- else
+ } else {
assertEquals(nbTrees - totalTrees, split.getNbTrees());
+ }
totalTrees += split.getNbTrees();
expectedId += split.getNbTrees();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java Fri May 7 17:12:27 2010
@@ -24,7 +24,6 @@ import java.util.Locale;
import java.util.Random;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.common.MahoutTestCase;
@@ -133,7 +132,6 @@ public class PartitionBugTest extends Ma
@Override
public long maxDepth() {
- // TODO Auto-generated method stub
return 0;
}
@@ -144,7 +142,6 @@ public class PartitionBugTest extends Ma
@Override
public long nbNodes() {
- // TODO Auto-generated method stub
return 0;
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthTest.java?rev=942151&r1=942150&r2=942151&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthTest.java Fri May 7 17:12:27 2010
@@ -17,7 +17,6 @@
package org.apache.mahout.fpm.pfpgrowth;
-import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;