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 2011/10/15 16:08:39 UTC
svn commit: r1183642 [1/3] - in /mahout/trunk:
core/src/main/java/org/apache/mahout/cf/taste/hadoop/
core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/
core/src/main/java/org/apache/mahout/classifier/
core/src/main/java/org/apache/mahout/cl...
Author: srowen
Date: Sat Oct 15 14:08:33 2011
New Revision: 1183642
URL: http://svn.apache.org/viewvc?rev=1183642&view=rev
Log:
Style changes (dead code, license, moving vars, privatizing, finalizing, more)
Removed:
mahout/trunk/examples/src/test/java/org/apache/mahout/cf/
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ToEntityPrefsMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileIDMigrator.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/FeatureLabelComparator.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/BayesUtils.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/BayesTestMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/TestNaiveBayesDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/ModelDissector.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansClusterer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/IntPairWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/Bagging.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Data.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataConverter.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Dataset.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Instance.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/Builder.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/MapredOutput.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/PartialBuilder.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/node/CategoricalNode.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/node/Leaf.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/node/NumericalNode.java
mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/ep/State.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
mahout/trunk/core/src/main/java/org/apache/mahout/graph/common/LocalClusteringCoefficientJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/graph/linkanalysis/RandomWalk.java
mahout/trunk/core/src/main/java/org/apache/mahout/graph/linkanalysis/RandomWalkWithRestartJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/graph/model/Triangle.java
mahout/trunk/core/src/main/java/org/apache/mahout/graph/preprocessing/AdjacencyMatrixJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/MatrixWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/VarIntWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/VarLongWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/HdfsBackedLanczosState.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/SplitPartitionedWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/YtYJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/GivensThinSolver.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/QRLastStep.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJobTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorageTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/naivebayes/NaiveBayesTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/naivebayes/training/IndexInstancesMapperTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sequencelearning/hmm/HMMUtilsTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialSequentialBuilder.java
mahout/trunk/core/src/test/java/org/apache/mahout/graph/GraphTestCase.java
mahout/trunk/core/src/test/java/org/apache/mahout/graph/common/EnumerateTrianglesJobTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/graph/preprocessing/AdjacencyMatrixJobTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverDenseTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverSparseSequentialTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDPrototypeTest.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/EmailUtility.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/FromEmailToDictionaryMapper.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToDictionaryReducer.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToPrefsDriver.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToRecMapper.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MsgIdToDictionaryMapper.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorMapper.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/email/PrepEmailMapper.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/email/PrepEmailReducer.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sequencelearning/hmm/PosTagger.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticModelParameters.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java
mahout/trunk/examples/src/main/java/org/apache/mahout/df/mapreduce/BuildForest.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EuropeanDistanceLookup.java
mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaMapper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/mongodb/MongoDBDataModel.java
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/conversion/InputDriver.java
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/conversion/InputMapper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/conversion/meanshift/InputDriver.java
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/conversion/meanshift/InputMapper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/evaluation/ClusterEvaluator.java
mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromDirectory.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SplitInput.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/GraphMLClusterWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/email/MailOptions.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/email/MailProcessor.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/io/ChunkedWrapper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/io/IOWriterWrapper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/io/WrappedWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterable.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/MapBackedARFFModel.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/AbstractClusterWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/CSVClusterWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/ClusterDumperWriter.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/email/MailProcessorTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/ConstantVector.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/PermutedVectorView.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/RandomAccessSparseVector.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/HebbianSolver.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/AbstractDistribution.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Exponential.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Gamma.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Normal.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Poisson.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Uniform.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/Gamma.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/DenseDoubleMatrix1D.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/DenseDoubleMatrix2D.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SelectedDenseDoubleMatrix1D.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SelectedDenseDoubleMatrix2D.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SelectedSparseDoubleMatrix1D.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SelectedSparseDoubleMatrix2D.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix1D.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix2D.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/MatrixTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/PermutedVectorViewTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/TestVectorView.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/als/AlternateLeastSquaresSolverTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/decomposer/SolverTest.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/decomposer/lanczos/TestLanczosSolver.java
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ToEntityPrefsMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ToEntityPrefsMapper.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ToEntityPrefsMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ToEntityPrefsMapper.java Sat Oct 15 14:08:33 2011
@@ -56,7 +56,7 @@ public abstract class ToEntityPrefsMappe
public void map(LongWritable key,
Text value,
Context context) throws IOException, InterruptedException {
- String[] tokens = ToEntityPrefsMapper.DELIMITER.split(value.toString());
+ String[] tokens = DELIMITER.split(value.toString());
long userID = Long.parseLong(tokens[0]);
long itemID = Long.parseLong(tokens[1]);
if (itemKey ^ transpose) {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileIDMigrator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileIDMigrator.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileIDMigrator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileIDMigrator.java Sat Oct 15 14:08:33 2011
@@ -52,7 +52,7 @@ public class FileIDMigrator extends Abst
private final ReentrantLock reloadLock;
private long lastModified;
- private long minReloadIntervalMS;
+ private final long minReloadIntervalMS;
private static final Logger log = LoggerFactory.getLogger(FileIDMigrator.class);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java Sat Oct 15 14:08:33 2011
@@ -17,10 +17,8 @@
package org.apache.mahout.classifier;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/FeatureLabelComparator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/FeatureLabelComparator.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/FeatureLabelComparator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/FeatureLabelComparator.java Sat Oct 15 14:08:33 2011
@@ -52,11 +52,14 @@ public class FeatureLabelComparator exte
if (cmp != 0) {
if (ta.stringAt(0).equals(BayesConstants.FEATURE_TF)) {
return -1;
- } else if (tb.stringAt(0).equals(BayesConstants.FEATURE_TF)) {
+ }
+ if (tb.stringAt(0).equals(BayesConstants.FEATURE_TF)) {
return 1;
- } else if (ta.stringAt(0).equals(BayesConstants.FEATURE_COUNT)) {
+ }
+ if (ta.stringAt(0).equals(BayesConstants.FEATURE_COUNT)) {
return -1;
- } else if (tb.stringAt(0).equals(BayesConstants.FEATURE_COUNT)) {
+ }
+ if (tb.stringAt(0).equals(BayesConstants.FEATURE_COUNT)) {
return 1;
}
return cmp;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java Sat Oct 15 14:08:33 2011
@@ -88,7 +88,7 @@ public abstract class LinearTrainer {
int columnCount = dataset.columnSize();
for (int i = 0; i < columnCount; i++) {
Vector dataPoint = dataset.viewColumn(i);
- log.debug("Training point: " + dataPoint);
+ log.debug("Training point: {}", dataPoint);
synchronized (this.model) {
boolean prediction = model.classify(dataPoint);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/BayesUtils.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/BayesUtils.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/BayesUtils.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/BayesUtils.java Sat Oct 15 14:08:33 2011
@@ -27,7 +27,6 @@ import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
-import org.apache.mahout.classifier.naivebayes.NaiveBayesModel;
import org.apache.mahout.classifier.naivebayes.training.ThetaMapper;
import org.apache.mahout.classifier.naivebayes.training.TrainNaiveBayesJob;
import org.apache.mahout.common.HadoopUtil;
@@ -43,16 +42,15 @@ import org.apache.mahout.math.VectorWrit
import org.apache.mahout.math.map.OpenObjectIntHashMap;
import java.io.IOException;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
-public class BayesUtils {
+public final class BayesUtils {
private BayesUtils() {}
-
public static NaiveBayesModel readModelFromDir(Path base, Configuration conf) {
float alphaI = conf.getFloat(ThetaMapper.ALPHA_I, 1.0f);
@@ -110,15 +108,16 @@ public class BayesUtils {
return i;
}
- public static int writeLabelIndex(Configuration conf, Path indexPath, SequenceFileDirIterable labels) throws IOException {
+ public static int writeLabelIndex(Configuration conf, Path indexPath,
+ SequenceFileDirIterable<Text, IntWritable> labels) throws IOException {
FileSystem fs = FileSystem.get(indexPath.toUri(), conf);
SequenceFile.Writer writer = new SequenceFile.Writer(fs, conf, indexPath, Text.class, IntWritable.class);
- Set<String> seen = new HashSet<String>();
+ Collection<String> seen = new HashSet<String>();
int i = 0;
try {
for (Object label : labels) {
- String theLabel = ((Pair) label).getFirst().toString();
- if (seen.contains(theLabel) == false){
+ String theLabel = ((Pair<?,?>) label).getFirst().toString();
+ if (!seen.contains(theLabel)){
writer.append(new Text(theLabel), new IntWritable(i++));
seen.add(theLabel);
}
@@ -129,9 +128,10 @@ public class BayesUtils {
return i;
}
- public static Map<Integer, String> readLabelIndex(Configuration conf, Path indexPath) throws IOException {
+ public static Map<Integer, String> readLabelIndex(Configuration conf, Path indexPath) {
Map<Integer, String> labelMap = new HashMap<Integer, String>();
- SequenceFileIterable<Text, IntWritable> fileIterable = new SequenceFileIterable<Text, IntWritable>(indexPath, true, conf);
+ SequenceFileIterable<Text, IntWritable> fileIterable =
+ new SequenceFileIterable<Text, IntWritable>(indexPath, true, conf);
for (Pair<Text, IntWritable> pair : fileIterable) {
labelMap.put(pair.getSecond().get(), pair.getFirst().toString());
}
@@ -140,7 +140,8 @@ public class BayesUtils {
public static OpenObjectIntHashMap<String> readIndexFromCache(Configuration conf) throws IOException {
OpenObjectIntHashMap<String> index = new OpenObjectIntHashMap<String>();
- for (Pair<Writable,IntWritable> entry : new SequenceFileIterable<Writable,IntWritable>(HadoopUtil.cachedFile(conf), conf)) {
+ for (Pair<Writable,IntWritable> entry :
+ new SequenceFileIterable<Writable,IntWritable>(HadoopUtil.cachedFile(conf), conf)) {
index.put(entry.getFirst().toString(), entry.getSecond().get());
}
return index;
@@ -148,7 +149,8 @@ public class BayesUtils {
public static Map<String,Vector> readScoresFromCache(Configuration conf) throws IOException {
Map<String,Vector> sumVectors = Maps.newHashMap();
- for (Pair<Text,VectorWritable> entry : new SequenceFileDirIterable<Text,VectorWritable>(HadoopUtil.cachedFile(conf),
+ for (Pair<Text,VectorWritable> entry :
+ new SequenceFileDirIterable<Text,VectorWritable>(HadoopUtil.cachedFile(conf),
PathType.LIST, PathFilters.partFilter(), conf)) {
sumVectors.put(entry.getFirst().toString(), entry.getSecond().get());
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/BayesTestMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/BayesTestMapper.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/BayesTestMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/BayesTestMapper.java Sat Oct 15 14:08:33 2011
@@ -1,4 +1,3 @@
-package org.apache.mahout.classifier.naivebayes.test;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,6 +15,7 @@ package org.apache.mahout.classifier.nai
* limitations under the License.
*/
+package org.apache.mahout.classifier.naivebayes.test;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
@@ -37,7 +37,8 @@ import java.io.IOException;
* The output value is the generated label, the Pair is the expected label and true if they match:
*/
public class BayesTestMapper extends Mapper<Text, VectorWritable, Text, VectorWritable> {
- AbstractNaiveBayesClassifier classifier;
+
+ private AbstractNaiveBayesClassifier classifier;
@Override
protected void setup(Context context) throws IOException, InterruptedException {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/TestNaiveBayesDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/TestNaiveBayesDriver.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/TestNaiveBayesDriver.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/TestNaiveBayesDriver.java Sat Oct 15 14:08:33 2011
@@ -1,4 +1,3 @@
-package org.apache.mahout.classifier.naivebayes.test;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,6 +15,7 @@ package org.apache.mahout.classifier.nai
* limitations under the License.
*/
+package org.apache.mahout.classifier.naivebayes.test;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
@@ -46,7 +46,9 @@ import java.util.Map;
* by running the iterating the test set and comparing it to the model
*/
public class TestNaiveBayesDriver extends AbstractJob {
- private transient static Logger log = LoggerFactory.getLogger(TestNaiveBayesDriver.class);
+
+ private static final Logger log = LoggerFactory.getLogger(TestNaiveBayesDriver.class);
+
public static final String LABEL_KEY = "labels";
public static final String COMPLEMENTARY = "class"; //b for bayes, c for complementary
@@ -56,7 +58,6 @@ public class TestNaiveBayesDriver extend
@Override
public int run(String[] args) throws Exception {
- int result = 0;
addInputOption();
addOutputOption();
addOption(addOption(DefaultOptionCreator.overwriteOption().create()));
@@ -83,48 +84,34 @@ public class TestNaiveBayesDriver extend
Map<Integer, String> labelMap = BayesUtils.readLabelIndex(getConf(), new Path(parsedArgs.get("--labelIndex")));
//loop over the results and create the confusion matrix
- SequenceFileDirIterable<Text, VectorWritable> dirIterable = new SequenceFileDirIterable<Text, VectorWritable>(getOutputPath(), PathType.LIST, PathFilters.partFilter(), getConf());
+ SequenceFileDirIterable<Text, VectorWritable> dirIterable =
+ new SequenceFileDirIterable<Text, VectorWritable>(getOutputPath(),
+ PathType.LIST,
+ PathFilters.partFilter(),
+ getConf());
ResultAnalyzer analyzer = new ResultAnalyzer(labelMap.values(), "DEFAULT");
- analyzeResults(labelMap, dirIterable, analyzer, complementary);
+ analyzeResults(labelMap, dirIterable, analyzer);
- log.info((complementary ? "Complementary" : "Standard NB") + " Results: {}", analyzer);
- return result;
+ log.info("{} Results: {}", complementary ? "Complementary" : "Standard NB", analyzer);
+ return 0;
}
- private void analyzeResults(Map<Integer, String> labelMap, SequenceFileDirIterable<Text, VectorWritable> dirIterable, ResultAnalyzer analyzer, boolean complementary) {
- double bestScore;
- int bestIdx;
- if (complementary){
- for (Pair<Text, VectorWritable> pair : dirIterable) {
- bestIdx = Integer.MIN_VALUE;
- bestScore = Long.MIN_VALUE;
- for (Vector.Element element : pair.getSecond().get()) {
- if (element.get() > bestScore) {
- bestScore = element.get();
- bestIdx = element.index();
- }
- }
- if (bestIdx != Integer.MIN_VALUE) {
- ClassifierResult classifierResult = new ClassifierResult(labelMap.get(bestIdx), bestScore);
- analyzer.addInstance(pair.getFirst().toString(), classifierResult);
+ private static void analyzeResults(Map<Integer, String> labelMap,
+ SequenceFileDirIterable<Text, VectorWritable> dirIterable,
+ ResultAnalyzer analyzer) {
+ for (Pair<Text, VectorWritable> pair : dirIterable) {
+ int bestIdx = Integer.MIN_VALUE;
+ double bestScore = Long.MIN_VALUE;
+ for (Vector.Element element : pair.getSecond().get()) {
+ if (element.get() > bestScore) {
+ bestScore = element.get();
+ bestIdx = element.index();
}
}
- } else {
- for (Pair<Text, VectorWritable> pair : dirIterable) {
- bestIdx = Integer.MIN_VALUE;
- bestScore = Long.MIN_VALUE;
- for (Vector.Element element : pair.getSecond().get()) {
- if (element.get() > bestScore) {
- bestScore = element.get();
- bestIdx = element.index();
- }
- }
- if (bestIdx != Integer.MIN_VALUE) {
- ClassifierResult classifierResult = new ClassifierResult(labelMap.get(bestIdx), bestScore);
- analyzer.addInstance(pair.getFirst().toString(), classifierResult);
- }
+ if (bestIdx != Integer.MIN_VALUE) {
+ ClassifierResult classifierResult = new ClassifierResult(labelMap.get(bestIdx), bestScore);
+ analyzer.addInstance(pair.getFirst().toString(), classifierResult);
}
}
-
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java Sat Oct 15 14:08:33 2011
@@ -123,11 +123,11 @@ public final class TrainNaiveBayesJob ex
private long createLabelIndex(Map<String, String> parsedArgs, Path labPath) throws IOException {
long labelSize = 0;
if (parsedArgs.containsKey("--labels")){
- Iterable<String> labels;
- labels = Splitter.on(",").split(parsedArgs.get("--labels"));
+ Iterable<String> labels = Splitter.on(",").split(parsedArgs.get("--labels"));
labelSize = BayesUtils.writeLabelIndex(getConf(), labels, labPath);
} else if (parsedArgs.containsKey("--extractLabels")){
- SequenceFileDirIterable iterable = new SequenceFileDirIterable(getInputPath(), PathType.LIST, PathFilters.logsCRCFilter(), getConf());
+ SequenceFileDirIterable<Text, IntWritable> iterable =
+ new SequenceFileDirIterable<Text, IntWritable>(getInputPath(), PathType.LIST, PathFilters.logsCRCFilter(), getConf());
labelSize = BayesUtils.writeLabelIndex(getConf(), labPath, iterable);
}
return labelSize;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/ModelDissector.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/ModelDissector.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/ModelDissector.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/ModelDissector.java Sat Oct 15 14:08:33 2011
@@ -132,7 +132,8 @@ public class ModelDissector {
if (r == 0) {
if (o.index < index) {
return -1;
- } else if (o.index > index) {
+ }
+ if (o.index > index) {
return 1;
}
return 0;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java Sat Oct 15 14:08:33 2011
@@ -49,8 +49,8 @@ public final class UncommonDistributions
double cheng = 1.0 + Math.log(4.5);
double x;
do {
- double u = UncommonDistributions.RANDOM.nextDouble();
- double v = UncommonDistributions.RANDOM.nextDouble();
+ double u = RANDOM.nextDouble();
+ double v = RANDOM.nextDouble();
double y = 1.0 / lam * Math.log(v / (1.0 - v));
x = k * Math.exp(y);
double z = u * v * v;
@@ -66,8 +66,8 @@ public final class UncommonDistributions
double d = (1.0 - k) * Math.pow(k, k / (1.0 - k));
double x;
do {
- double u = UncommonDistributions.RANDOM.nextDouble();
- double v = UncommonDistributions.RANDOM.nextDouble();
+ double u = RANDOM.nextDouble();
+ double v = RANDOM.nextDouble();
double z = -Math.log(u);
double e = -Math.log(v);
x = Math.pow(z, c);
@@ -171,7 +171,7 @@ public final class UncommonDistributions
public static int rMultinom(Vector probabilities) {
// our probability argument are not normalized.
double total = probabilities.zSum();
- double nextDouble = UncommonDistributions.RANDOM.nextDouble();
+ double nextDouble = RANDOM.nextDouble();
double p = nextDouble * total;
for (int i = 0; i < probabilities.size(); i++) {
double pi = probabilities.get(i);
@@ -228,7 +228,7 @@ public final class UncommonDistributions
double sum = 0.0;
int x = 0;
while (sum <= q) {
- double u = UncommonDistributions.RANDOM.nextDouble();
+ double u = RANDOM.nextDouble();
double e = -Math.log(u);
sum += e / (n - x);
x++;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java Sat Oct 15 14:08:33 2011
@@ -364,7 +364,7 @@ public class FuzzyKMeansDriver extends A
int iteration = 1;
Configuration conf = new Configuration();
while (!converged && iteration <= maxIterations) {
- log.info("Fuzzy k-Means Iteration: " + iteration);
+ log.info("Fuzzy k-Means Iteration: {}", iteration);
FileSystem fs = FileSystem.get(input.toUri(), conf);
for (VectorWritable value
: new SequenceFileDirValueIterable<VectorWritable>(input,
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=1183642&r1=1183641&r2=1183642&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 Sat Oct 15 14:08:33 2011
@@ -75,7 +75,7 @@ public class KMeansClusterer {
for (Cluster cluster : clusters) {
Vector clusterCenter = cluster.getCenter();
double distance = this.measure.distance(clusterCenter.getLengthSquared(), clusterCenter, point);
- if (KMeansClusterer.log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("{} Cluster: {}", distance, cluster.getId());
}
if (distance < nearestDistance || nearestCluster == null) {
@@ -188,7 +188,7 @@ public class KMeansClusterer {
boolean converged = false;
int iteration = 0;
while (!converged && iteration < maxIter) {
- log.info("Reference Iteration: " + iteration);
+ log.info("Reference Iteration: {}", iteration);
List<Cluster> next = Lists.newArrayList();
for (Cluster c : clustersList.get(iteration)) {
next.add(new Cluster(c.getCenter(), c.getId(), measure));
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java Sat Oct 15 14:08:33 2011
@@ -259,7 +259,7 @@ public class KMeansDriver extends Abstra
boolean converged = false;
int iteration = 1;
while (!converged && iteration <= maxIterations) {
- log.info("K-Means Iteration: " + iteration);
+ log.info("K-Means Iteration: {}", iteration);
FileSystem fs = FileSystem.get(input.toUri(), conf);
for (VectorWritable value
: new SequenceFileDirValueIterable<VectorWritable>(input,
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java Sat Oct 15 14:08:33 2011
@@ -56,9 +56,11 @@ public class AffinityMatrixInputMapper
// enforce well-formed textual representation of the graph
if (elements.length != 3) {
throw new IOException("Expected input of length 3, received "
- + elements.length + ". Please make sure you adhere to "
- + "the structure of (i,j,value) for representing a graph in text. Input line was: '"+value+"'.");
- } else if (elements[0].length() == 0 || elements[1].length() == 0 || elements[2].length() == 0) {
+ + elements.length + ". Please make sure you adhere to "
+ + "the structure of (i,j,value) for representing a graph in text. "
+ + "Input line was: '" + value + "'.");
+ }
+ if (elements[0].length() == 0 || elements[1].length() == 0 || elements[2].length() == 0) {
throw new IOException("Found an element of 0 length. Please be sure you adhere to the structure of "
+ "(i,j,value) for representing a graph in text.");
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/common/IntPairWritable.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/common/IntPairWritable.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/common/IntPairWritable.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/common/IntPairWritable.java Sat Oct 15 14:08:33 2011
@@ -210,7 +210,8 @@ public final class IntPairWritable
int firstb2 = ((IntPairWritable) o2).getFirst();
if (firstb1 < firstb2) {
return -1;
- } else if (firstb1 > firstb2) {
+ }
+ if (firstb1 > firstb2) {
return 1;
}
return 0;
@@ -255,7 +256,8 @@ public final class IntPairWritable
public int compareTo(Frequency that) {
if (frequency < that.frequency) {
return -1;
- } else if (frequency > that.frequency) {
+ }
+ if (frequency > that.frequency) {
return 1;
}
return 0;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java Sat Oct 15 14:08:33 2011
@@ -42,7 +42,7 @@ public final class StringUtils {
* @return the string representation of the object
*/
public static String toString(Object obj) {
- return StringUtils.NEWLINE_PATTERN.matcher(StringUtils.XSTREAM.toXML(obj)).replaceAll("");
+ return NEWLINE_PATTERN.matcher(XSTREAM.toXML(obj)).replaceAll("");
}
/**
@@ -53,6 +53,6 @@ public final class StringUtils {
* @return restored object
*/
public static <T> T fromString(String str) {
- return (T) StringUtils.XSTREAM.fromXML(str);
+ return (T) XSTREAM.fromXML(str);
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/Bagging.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/Bagging.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/Bagging.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/Bagging.java Sat Oct 15 14:08:33 2011
@@ -22,7 +22,6 @@ import java.util.Random;
import org.apache.mahout.df.builder.TreeBuilder;
import org.apache.mahout.df.data.Data;
-import org.apache.mahout.df.data.Instance;
import org.apache.mahout.df.node.Node;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java Sat Oct 15 14:08:33 2011
@@ -68,9 +68,7 @@ public class DecisionForest implements W
return; // nothing to classify
}
- for (int treeId = 0; treeId < trees.size(); treeId++) {
- Node tree = trees.get(treeId);
-
+ for (Node tree : trees) {
for (int index = 0; index < data.size(); index++) {
predictions[index] = tree.classify(data.get(index));
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Data.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Data.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Data.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Data.java Sat Oct 15 14:08:33 2011
@@ -257,7 +257,7 @@ public class Data implements Cloneable {
if (this == obj) {
return true;
}
- if (obj == null || !(obj instanceof Data)) {
+ if (!(obj instanceof Data)) {
return false;
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataConverter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataConverter.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataConverter.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataConverter.java Sat Oct 15 14:08:33 2011
@@ -18,6 +18,7 @@
package org.apache.mahout.df.data;
import java.util.Arrays;
+import java.util.regex.Pattern;
import org.apache.commons.lang.ArrayUtils;
import org.apache.mahout.math.DenseVector;
@@ -32,18 +33,20 @@ import com.google.common.base.Preconditi
public class DataConverter {
private static final Logger log = LoggerFactory.getLogger(DataConverter.class);
-
+
+ private static final Pattern COMMA_SPACE = Pattern.compile("[, ]");
+
private final Dataset dataset;
public DataConverter(Dataset dataset) {
this.dataset = dataset;
}
- public Instance convert(int id, String string) {
+ public Instance convert(int id, CharSequence string) {
// all attributes (categorical, numerical), ignored, label
int nball = dataset.nbAttributes() + dataset.getIgnored().length + 1;
- String[] tokens = string.split("[, ]");
+ String[] tokens = COMMA_SPACE.split(string);
Preconditions.checkArgument(tokens.length == nball, "Wrong number of attributes in the string");
int nbattrs = dataset.nbAttributes();
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java Sat Oct 15 14:08:33 2011
@@ -20,6 +20,7 @@ package org.apache.mahout.df.data;
import java.io.IOException;
import java.util.List;
import java.util.Scanner;
+import java.util.regex.Pattern;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
@@ -45,7 +46,9 @@ import org.slf4j.LoggerFactory;
public final class DataLoader {
private static final Logger log = LoggerFactory.getLogger(DataLoader.class);
-
+
+ private static final Pattern COMMA_SPACE = Pattern.compile("[, ]");
+
private DataLoader() { }
/**
@@ -59,8 +62,8 @@ public final class DataLoader {
* used to convert CATEGORICAL attribute values to Integer
* @return null if there are missing values '?'
*/
- private static Instance parseString(int id, Attribute[] attrs, List<String>[] values, String string) {
- String[] tokens = string.split("[, ]");
+ private static Instance parseString(int id, Attribute[] attrs, List<String>[] values, CharSequence string) {
+ String[] tokens = COMMA_SPACE.split(string);
Preconditions.checkArgument(tokens.length == attrs.length, "Wrong number of attributes in the string");
// extract tokens and check is there is any missing value
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Dataset.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Dataset.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Dataset.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Dataset.java Sat Oct 15 14:08:33 2011
@@ -236,7 +236,7 @@ public class Dataset implements Writable
if (this == obj) {
return true;
}
- if (obj == null || !(obj instanceof Dataset)) {
+ if (!(obj instanceof Dataset)) {
return false;
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Instance.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Instance.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Instance.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Instance.java Sat Oct 15 14:08:33 2011
@@ -64,7 +64,7 @@ public class Instance {
if (this == obj) {
return true;
}
- if (obj == null || !(obj instanceof Instance)) {
+ if (!(obj instanceof Instance)) {
return false;
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/Builder.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/Builder.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/Builder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/Builder.java Sat Oct 15 14:08:33 2011
@@ -270,8 +270,7 @@ public abstract class Builder {
* @throws IOException
* if anything goes wrong while parsing the output
*/
- protected abstract DecisionForest parseOutput(Job job)
- throws IOException, ClassNotFoundException, InterruptedException;
+ protected abstract DecisionForest parseOutput(Job job) throws IOException;
public DecisionForest build(int nbTrees)
throws IOException, ClassNotFoundException, InterruptedException {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/MapredOutput.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/MapredOutput.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/MapredOutput.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/MapredOutput.java Sat Oct 15 14:08:33 2011
@@ -101,7 +101,7 @@ public class MapredOutput implements Wri
if (this == obj) {
return true;
}
- if (obj == null || !(obj instanceof MapredOutput)) {
+ if (!(obj instanceof MapredOutput)) {
return false;
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java Sat Oct 15 14:08:33 2011
@@ -49,9 +49,7 @@ public class InMemMapper extends MapredM
private Bagging bagging;
private Random rng;
-
- private Data data;
-
+
/**
* Load the training data
*/
@@ -68,7 +66,7 @@ public class InMemMapper extends MapredM
Configuration conf = context.getConfiguration();
log.info("Loading the data...");
- data = loadData(conf, getDataset());
+ Data data = loadData(conf, getDataset());
log.info("Data loaded : {} instances", data.size());
bagging = new Bagging(getTreeBuilder(), data);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/PartialBuilder.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/PartialBuilder.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/PartialBuilder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/PartialBuilder.java Sat Oct 15 14:08:33 2011
@@ -92,8 +92,7 @@ public class PartialBuilder extends Buil
}
@Override
- protected DecisionForest parseOutput(Job job)
- throws IOException, ClassNotFoundException, InterruptedException {
+ protected DecisionForest parseOutput(Job job) throws IOException {
Configuration conf = job.getConfiguration();
int numTrees = Builder.getNbTrees(conf);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/node/CategoricalNode.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/node/CategoricalNode.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/node/CategoricalNode.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/node/CategoricalNode.java Sat Oct 15 14:08:33 2011
@@ -86,7 +86,7 @@ public class CategoricalNode extends Nod
if (this == obj) {
return true;
}
- if (obj == null || !(obj instanceof CategoricalNode)) {
+ if (!(obj instanceof CategoricalNode)) {
return false;
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/node/Leaf.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/node/Leaf.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/node/Leaf.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/node/Leaf.java Sat Oct 15 14:08:33 2011
@@ -60,7 +60,7 @@ public class Leaf extends Node {
if (this == obj) {
return true;
}
- if (obj == null || !(obj instanceof Leaf)) {
+ if (!(obj instanceof Leaf)) {
return false;
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/node/NumericalNode.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/node/NumericalNode.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/node/NumericalNode.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/node/NumericalNode.java Sat Oct 15 14:08:33 2011
@@ -77,7 +77,7 @@ public class NumericalNode extends Node
if (this == obj) {
return true;
}
- if (obj == null || !(obj instanceof NumericalNode)) {
+ if (!(obj instanceof NumericalNode)) {
return false;
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java Sat Oct 15 14:08:33 2011
@@ -124,7 +124,7 @@ public final class MahoutDriver {
Properties mainProps = loadProperties(progName + ".props");
if (mainProps == null) {
- log.warn("No " + progName + ".props found on classpath, will use command-line arguments only");
+ log.warn("No {}.props found on classpath, will use command-line arguments only", progName);
mainProps = new Properties();
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/ep/State.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/ep/State.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/ep/State.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/ep/State.java Sat Oct 15 14:08:33 2011
@@ -242,7 +242,8 @@ public class State<T extends Payload<U>,
}
if (this.id < other.id) {
return -1;
- } else if (this.id > other.id) {
+ }
+ if (this.id > other.id) {
return 1;
}
return 0;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java Sat Oct 15 14:08:33 2011
@@ -208,12 +208,10 @@ public final class TransactionTree imple
}
log.debug("Nodes in UnCompressed Tree: {} ", nodes);
- log.debug("UnCompressed Tree Size: {}", (this.nodes * 4 * 4 + this.childCount() * 4)
- / (double) 1000000);
+ log.debug("UnCompressed Tree Size: {}", (this.nodes * 4 * 4 + this.childCount() * 4) / 1000000.0);
log.debug("Nodes in Compressed Tree: {} ", node);
- log.debug("Compressed Tree Size: {}", (node * 4 * 4 + ctree.childCount() * 4)
- / (double) 1000000);
- log.debug("TransactionSet Size: {}", size * 4 / (double) 1000000);
+ log.debug("Compressed Tree Size: {}", (node * 4 * 4 + ctree.childCount() * 4) / 1000000.0);
+ log.debug("TransactionSet Size: {}", size * 4 / 1000000.0);
if (node * 4 * 4 + ctree.childCount() * 4 <= size * 4) {
return ctree;
} else {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/graph/common/LocalClusteringCoefficientJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/graph/common/LocalClusteringCoefficientJob.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/graph/common/LocalClusteringCoefficientJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/graph/common/LocalClusteringCoefficientJob.java Sat Oct 15 14:08:33 2011
@@ -40,12 +40,16 @@ import java.io.IOException;
import java.util.Map;
/**
- * <p>Distributed computation of the local clustering coefficient of the vertices of an undirected graph. The local clustering coefficient is a
- * measure for the "connectedness" of a vertex in its neighborhood and is computed by dividing the number of closed triangles with a vertex'
+ * <p>Distributed computation of the local clustering coefficient of the vertices of an undirected graph.
+ * The local clustering coefficient is a
+ * measure for the "connectedness" of a vertex in its neighborhood and is computed by dividing the number
+ * of closed triangles with a vertex'
* neighbors by the number of possible triangles of this vertex with it's neighbours.</p>
*
- * <p>The input files needs to be {@link org.apache.hadoop.io.SequenceFile}s, one with {@link UndirectedEdge}s as keys and
- * any Writable as values, as it is already produced by {@link SimplifyGraphJob}, the other with {@link Triangle}s as keys and any Writable as
+ * <p>The input files needs to be {@link org.apache.hadoop.io.SequenceFile}s, one with {@link UndirectedEdge}s
+ * as keys and any Writable as values, as it is already produced by
+ * {@link org.apache.mahout.graph.preprocessing.SimplifyGraphJob}, the other with {@link Triangle}s
+ * as keys and any Writable as
* values, as it is already produced by {@link EnumerateTrianglesJob}</p>
*
* <p>This job outputs text files with a vertex id and it local clustering coefficient per line.</p>
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/graph/linkanalysis/RandomWalk.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/graph/linkanalysis/RandomWalk.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/graph/linkanalysis/RandomWalk.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/graph/linkanalysis/RandomWalk.java Sat Oct 15 14:08:33 2011
@@ -127,6 +127,7 @@ public abstract class RandomWalk extends
}
}
+ @Override
protected void map(IntWritable index, Vertex vertex, Mapper.Context ctx) throws IOException, InterruptedException {
ctx.write(new LongWritable(vertex.id()), new DoubleWritable(ranks.get(index.get())));
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/graph/linkanalysis/RandomWalkWithRestartJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/graph/linkanalysis/RandomWalkWithRestartJob.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/graph/linkanalysis/RandomWalkWithRestartJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/graph/linkanalysis/RandomWalkWithRestartJob.java Sat Oct 15 14:08:33 2011
@@ -65,10 +65,12 @@ public class RandomWalkWithRestartJob ex
return dampingVector;
}
+ @Override
protected void addSpecificOptions() {
addOption("sourceVertexIndex", "svi", "index of source vertex", true);
}
+ @Override
protected void evaluateSpecificOptions(Map<String, String> parsedArgs) {
sourceVertexIndex = Integer.parseInt(parsedArgs.get("--sourceVertexIndex"));
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/graph/model/Triangle.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/graph/model/Triangle.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/graph/model/Triangle.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/graph/model/Triangle.java Sat Oct 15 14:08:33 2011
@@ -92,6 +92,6 @@ public class Triangle implements Writabl
@Override
public String toString() {
- return first.id() + "," + second.id() + "," + third.id();
+ return first.id() + "," + second.id() + ',' + third.id();
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/graph/preprocessing/AdjacencyMatrixJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/graph/preprocessing/AdjacencyMatrixJob.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/graph/preprocessing/AdjacencyMatrixJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/graph/preprocessing/AdjacencyMatrixJob.java Sat Oct 15 14:08:33 2011
@@ -72,7 +72,7 @@ public class AdjacencyMatrixJob extends
static final String VERTEX_INDEX_PARAM = AdjacencyMatrixJob.class.getName() + ".vertexIndex";
static final String STOCHASTIFY_PARAM = AdjacencyMatrixJob.class.getName() + ".normalize";
- private final String TRANSPOSED_ADJACENCY_MATRIX = "transposedAdjacencyMatrix";
+ private static final String TRANSPOSED_ADJACENCY_MATRIX = "transposedAdjacencyMatrix";
@Override
public int run(String[] args) throws Exception {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/MatrixWritable.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/MatrixWritable.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/MatrixWritable.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/MatrixWritable.java Sat Oct 15 14:08:33 2011
@@ -24,7 +24,6 @@ import org.apache.hadoop.io.Writable;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.util.HashMap;
import java.util.Map;
public class MatrixWritable implements Writable {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/VarIntWritable.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/VarIntWritable.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/VarIntWritable.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/VarIntWritable.java Sat Oct 15 14:08:33 2011
@@ -66,7 +66,8 @@ public class VarIntWritable implements W
public int compareTo(VarIntWritable other) {
if (value < other.value) {
return -1;
- } else if (value > other.value) {
+ }
+ if (value > other.value) {
return 1;
}
return 0;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/VarLongWritable.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/VarLongWritable.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/VarLongWritable.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/VarLongWritable.java Sat Oct 15 14:08:33 2011
@@ -65,10 +65,12 @@ public class VarLongWritable implements
@Override
public int compareTo(VarLongWritable other) {
- if (value < other.value) {
+ if (value >= other.value) {
+ if (value > other.value) {
+ return 1;
+ }
+ } else {
return -1;
- } else if (value > other.value) {
- return 1;
}
return 0;
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java Sat Oct 15 14:08:33 2011
@@ -102,7 +102,8 @@ public class EigenVerificationJob extend
Map<String, String> argMap = handleArgs(args);
if (argMap == null) {
return -1;
- } else if (argMap.isEmpty()) {
+ }
+ if (argMap.isEmpty()) {
return 0;
}
// parse out the arguments
@@ -236,7 +237,8 @@ public class EigenVerificationJob extend
int index2 = e2.getKey().index();
if (index1 < index2) {
return -1;
- } else if (index1 > index2) {
+ }
+ if (index1 > index2) {
return 1;
}
return 0;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/HdfsBackedLanczosState.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/HdfsBackedLanczosState.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/HdfsBackedLanczosState.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/HdfsBackedLanczosState.java Sat Oct 15 14:08:33 2011
@@ -144,7 +144,7 @@ public class HdfsBackedLanczosState exte
SequenceFile.Writer writer = null;
try {
if(fs.exists(p)) {
- log.warn(p + " exists, will overwrite");
+ log.warn("{} exists, will overwrite", p);
fs.delete(p, true);
}
writer = new SequenceFile.Writer(fs, conf, p,
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtJob.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtJob.java Sat Oct 15 14:08:33 2011
@@ -64,6 +64,9 @@ public class ABtJob {
public static final String PROP_BT_PATH = "ssvd.Bt.path";
+ private ABtJob() {
+ }
+
/**
* So, here, i preload A block into memory.
* <P>
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/SplitPartitionedWritable.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/SplitPartitionedWritable.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/SplitPartitionedWritable.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/SplitPartitionedWritable.java Sat Oct 15 14:08:33 2011
@@ -105,22 +105,21 @@ public class SplitPartitionedWritable im
return false;
}
SplitPartitionedWritable other = (SplitPartitionedWritable) obj;
- if (taskId != other.taskId) {
- return false;
- }
- return true;
+ return taskId == other.taskId;
}
@Override
public int compareTo(SplitPartitionedWritable o) {
if (taskId < o.taskId) {
return -1;
- } else if (taskId > o.taskId) {
+ }
+ if (taskId > o.taskId) {
return 1;
}
if (taskItemOrdinal < o.taskItemOrdinal) {
return -1;
- } else if (taskItemOrdinal > o.taskItemOrdinal) {
+ }
+ if (taskItemOrdinal > o.taskItemOrdinal) {
return 1;
}
return 0;
@@ -139,7 +138,8 @@ public class SplitPartitionedWritable im
if (o1.taskId < o2.taskId) {
return -1;
- } else if (o1.taskId > o2.taskId) {
+ }
+ if (o1.taskId > o2.taskId) {
return 1;
}
return 0;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/YtYJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/YtYJob.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/YtYJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/YtYJob.java Sat Oct 15 14:08:33 2011
@@ -49,6 +49,9 @@ public class YtYJob {
// we have single output, so we use standard output
public static final String OUTPUT_YtY = "part-";
+ private YtYJob() {
+ }
+
public static class YtYMapper extends
Mapper<Writable, VectorWritable, IntWritable, VectorWritable> {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/GivensThinSolver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/GivensThinSolver.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/GivensThinSolver.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/GivensThinSolver.java Sat Oct 15 14:08:33 2011
@@ -31,8 +31,6 @@ import org.apache.mahout.math.hadoop.sto
/**
* Givens Thin solver. Standard Givens operations are reordered in a way that
* helps us to push them thru MapReduce operations in a block fashion.
- *
- *
*/
public class GivensThinSolver {
@@ -44,8 +42,8 @@ public class GivensThinSolver {
private double[] vQtRow;
// private UpperTriangular m_rTilde;
// private TriangularRowView m_rTildeRowView, m_rTildeRowView2;
- private double[][] mQt;
- private double[][] mR;
+ private final double[][] mQt;
+ private final double[][] mR;
private int qtStartRow;
private int rStartRow;
private int m;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/QRLastStep.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/QRLastStep.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/QRLastStep.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/QRLastStep.java Sat Oct 15 14:08:33 2011
@@ -21,6 +21,7 @@ import java.io.Closeable;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+import java.util.NoSuchElementException;
import org.apache.commons.lang.Validate;
import org.apache.mahout.common.iterator.CopyConstructorIterator;
@@ -114,6 +115,9 @@ public class QRLastStep implements Close
@Override
public Vector next() {
+ if (!hasNext()) {
+ throw new NoSuchElementException();
+ }
Validate.isTrue(hasNext(), "Q input overrun");
int qRowIndex = r - cnt - 1; // because QHats are initially stored in
for (int j = 0; j < kp; j++) {
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java Sat Oct 15 14:08:33 2011
@@ -234,7 +234,7 @@ public class ParallelALSFactorizationJob
}
}
}
- log.info("Input matrix:\n" + prefsAsText);
+ log.info("Input matrix:\n{}", prefsAsText);
writeLines(inputFile, prefsAsText.toString());
ParallelALSFactorizationJob alsFactorization = new ParallelALSFactorizationJob();
@@ -268,13 +268,13 @@ public class ParallelALSFactorizationJob
double estimate = u.viewRow(slice.index()).dot(m.viewRow(e.index()));
double err = pref - estimate;
avg.addDatum(err * err);
- log.info("Comparing preference of user [" + slice.index() + "] towards item [" + e.index() + "], " +
- "was [" + pref + "] estimate is [" + estimate + ']');
+ log.info("Comparing preference of user [{}] towards item [{}], was [{}] estimate is [{}]",
+ new Object[] {slice.index(), e.index(), pref, estimate});
}
}
}
double rmse = Math.sqrt(avg.getAverage());
- log.info("RMSE: " + rmse);
+ log.info("RMSE: {}", rmse);
assertTrue(rmse < 0.2);
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJobTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJobTest.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJobTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJobTest.java Sat Oct 15 14:08:33 2011
@@ -21,6 +21,7 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FilenameFilter;
import java.util.Arrays;
+import java.util.regex.Pattern;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
@@ -46,6 +47,8 @@ import org.junit.Test;
*/
public final class ItemSimilarityJobTest extends TasteTestCase {
+ private static final Pattern TAB = Pattern.compile("\t");
+
/**
* Tests {@link ItemSimilarityJob.MostSimilarItemPairsMapper}
*/
@@ -146,7 +149,7 @@ public final class ItemSimilarityJobTest
int currentLine = 1;
while ( (line = reader.readLine()) != null) {
- String[] tokens = line.split("\t");
+ String[] tokens = TAB.split(line);
long itemAID = Long.parseLong(tokens[0]);
long itemBID = Long.parseLong(tokens[1]);
@@ -242,7 +245,7 @@ public final class ItemSimilarityJobTest
int currentLine = 1;
while ((line = reader.readLine()) != null) {
- String[] tokens = line.split("\t");
+ String[] tokens = TAB.split(line);
long itemAID = Long.parseLong(tokens[0]);
long itemBID = Long.parseLong(tokens[1]);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java Sat Oct 15 14:08:33 2011
@@ -184,7 +184,7 @@ public final class FileDataModelTest ext
@Test(expected = IllegalArgumentException.class)
public void testEmptyFile() throws Exception {
File file = getTestTempFile("empty");
- writeLines(file, new String[0]); //required to create file.
+ writeLines(file); //required to create file.
new FileDataModel(file);
}
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorageTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorageTest.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorageTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorageTest.java Sat Oct 15 14:08:33 2011
@@ -174,7 +174,7 @@ public final class MemoryDiffStorageTest
assertEquals(2, average.getCount());
}
- protected static DataModel getDataModelVaried() {
+ static DataModel getDataModelVaried() {
return getDataModel(
new long[] {1, 2, 3, 4, 5},
new Double[][] {
@@ -186,7 +186,7 @@ public final class MemoryDiffStorageTest
});
}
- protected static DataModel getDataModelPocked() {
+ static DataModel getDataModelPocked() {
return getDataModel(
new long[] {1, 2, 3, 4},
new Double[][] {
@@ -197,17 +197,17 @@ public final class MemoryDiffStorageTest
});
}
- protected static DataModel getDataModelLarge() {
+ static DataModel getDataModelLarge() {
return getDataModel(
new long[] {1, 2, 3, 4, 5, 6, 7},
new Double[][] {
- {0.2, .2, .2, .2, .2, .2, .2},
- {0.4, 0.5, .3, .3, .3, .3, .3},
- {0.7, 0.1, 0.5, .2, .7, .8, .9},
- {0.7, 0.3, 0.8, 0.1, .6, .6, .6},
- {0.2, 0.3, 0.6, 0.1, 0.3, .4, .4},
- {0.2, 0.3, 0.6, 0.1, 0.3, .4, .4},
- {0.2, 0.3, 0.6, 0.1, 0.3, .5, .5},
+ {0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2},
+ {0.4, 0.5, 0.3, 0.3, 0.3, 0.3, 0.3},
+ {0.7, 0.1, 0.5, 0.2, 0.7, 0.8, 0.9},
+ {0.7, 0.3, 0.8, 0.1, 0.6, 0.6, 0.6},
+ {0.2, 0.3, 0.6, 0.1, 0.3, 0.4, 0.4},
+ {0.2, 0.3, 0.6, 0.1, 0.3, 0.4, 0.4},
+ {0.2, 0.3, 0.6, 0.1, 0.3, 0.5, 0.5},
});
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/classifier/naivebayes/NaiveBayesTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/naivebayes/NaiveBayesTest.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/classifier/naivebayes/NaiveBayesTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/classifier/naivebayes/NaiveBayesTest.java Sat Oct 15 14:08:33 2011
@@ -37,10 +37,10 @@ import java.io.File;
public class NaiveBayesTest extends MahoutTestCase {
- Configuration conf;
- File inputFile;
- File outputDir;
- File tempDir;
+ private Configuration conf;
+ private File inputFile;
+ private File outputDir;
+ private File tempDir;
static final Text LABEL_STOLEN = new Text("stolen");
static final Text LABEL_NOT_STOLEN = new Text("not_stolen");
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/classifier/naivebayes/training/IndexInstancesMapperTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/naivebayes/training/IndexInstancesMapperTest.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/classifier/naivebayes/training/IndexInstancesMapperTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/classifier/naivebayes/training/IndexInstancesMapperTest.java Sat Oct 15 14:08:33 2011
@@ -31,9 +31,9 @@ import org.junit.Test;
public class IndexInstancesMapperTest extends MahoutTestCase {
- Mapper.Context ctx;
- OpenObjectIntHashMap<String> labelIndex;
- VectorWritable instance;
+ private Mapper.Context ctx;
+ private OpenObjectIntHashMap<String> labelIndex;
+ private VectorWritable instance;
@Override
@Before
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sequencelearning/hmm/HMMUtilsTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sequencelearning/hmm/HMMUtilsTest.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sequencelearning/hmm/HMMUtilsTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sequencelearning/hmm/HMMUtilsTest.java Sat Oct 15 14:08:33 2011
@@ -145,11 +145,7 @@ public class HMMUtilsTest extends HMMTes
Matrix sparse_tr = sparseModel.getTransitionMatrix();
Matrix sparse_em = sparseModel.getEmissionMatrix();
for (int i = 0; i < sparseModel.getNrOfHiddenStates(); ++i) {
- if (i == 2) {
- assertEquals(1.0, sparse_ip.getQuick(i), EPSILON);
- } else {
- assertEquals(0.0, sparse_ip.getQuick(i), EPSILON);
- }
+ assertEquals(i == 2 ? 1.0 : 0.0, sparse_ip.getQuick(i), EPSILON);
for (int j = 0; j < sparseModel.getNrOfHiddenStates(); ++j) {
if (i == j) {
assertEquals(1.0, sparse_tr.getQuick(i, j), EPSILON);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java Sat Oct 15 14:08:33 2011
@@ -24,7 +24,6 @@ import java.util.Random;
import com.google.common.collect.Lists;
import com.google.common.io.Closeables;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialSequentialBuilder.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialSequentialBuilder.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialSequentialBuilder.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialSequentialBuilder.java Sat Oct 15 14:08:33 2011
@@ -55,12 +55,6 @@ public class PartialSequentialBuilder ex
private final Dataset dataset;
- /** first instance id in hadoop's order */
- private int[] firstIds;
-
- /** partitions' sizes in hadoop order */
- private int[] sizes;
-
public PartialSequentialBuilder(TreeBuilder treeBuilder, Path dataPath,
Dataset dataset, long seed, Configuration conf) {
super(treeBuilder, dataPath, new Path("notUsed"), seed, conf);
@@ -106,8 +100,10 @@ public class PartialSequentialBuilder ex
firstOutput = new MockContext(new Step1Mapper(), conf, task.getTaskAttemptID(), numTrees);
- firstIds = new int[nbSplits];
- sizes = new int[nbSplits];
+ /* first instance id in hadoop's order */
+ int[] firstIds = new int[nbSplits];
+ /* partitions' sizes in hadoop order */
+ int[] sizes = new int[nbSplits];
// to compute firstIds, process the splits in file order
long slowest = 0; // duration of slowest map
@@ -146,7 +142,7 @@ public class PartialSequentialBuilder ex
}
@Override
- protected DecisionForest parseOutput(Job job) throws IOException, InterruptedException {
+ protected DecisionForest parseOutput(Job job) throws IOException {
return processOutput(firstOutput.getKeys(), firstOutput.getValues());
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/graph/GraphTestCase.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/graph/GraphTestCase.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/graph/GraphTestCase.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/graph/GraphTestCase.java Sat Oct 15 14:08:33 2011
@@ -49,12 +49,12 @@ public abstract class GraphTestCase exte
}
}
- protected void assertMatrixEquals(Matrix expected, Matrix actual) {
+ protected static void assertMatrixEquals(Matrix expected, Matrix actual) {
assertEquals(expected.numRows(), actual.numRows());
assertEquals(actual.numCols(), actual.numCols());
for (int row = 0; row < expected.numRows(); row++) {
for (int col = 0; col < expected.numCols(); col ++) {
- assertEquals("Non-matching values in [" + row + "," + col + "]",
+ assertEquals("Non-matching values in [" + row + ',' + col + ']',
expected.get(row, col), actual.get(row, col), EPSILON);
}
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/graph/common/EnumerateTrianglesJobTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/graph/common/EnumerateTrianglesJobTest.java?rev=1183642&r1=1183641&r2=1183642&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/graph/common/EnumerateTrianglesJobTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/graph/common/EnumerateTrianglesJobTest.java Sat Oct 15 14:08:33 2011
@@ -158,7 +158,7 @@ public class EnumerateTrianglesJobTest e
Configuration conf = new Configuration();
FileSystem fs = FileSystem.get(conf);
- SequenceFile.Writer writer = new SequenceFile.Writer(fs, conf, new Path(inputFile.getAbsolutePath().toString()),
+ SequenceFile.Writer writer = new SequenceFile.Writer(fs, conf, new Path(inputFile.getAbsolutePath()),
UndirectedEdge.class, NullWritable.class);
try {