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/01/21 20:51:51 UTC
svn commit: r901839 [1/3] - in /lucene/mahout/trunk:
collections-codegen-plugin/src/main/java/org/apache/mahout/collection_codegen/
core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/
core/src/main/java/org/apache/mahout/cf/taste/impl/eval/ core...
Author: srowen
Date: Thu Jan 21 19:51:44 2010
New Revision: 901839
URL: http://svn.apache.org/viewvc?rev=901839&view=rev
Log:
More style stuff; use \n line separator always, unify use of log placeholders, fix unit tests that weren't cleaning up files (MAHOUT-217), remove dead code, redundancies, etc.
Removed:
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/Algebraic.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/Complex.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/Elliptic.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/Exponential.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/ExponentialIntegral.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/NumericalIntegration.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/strings/
Modified:
lucene/mahout/trunk/collections-codegen-plugin/src/main/java/org/apache/mahout/collection_codegen/CodeGenerator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ToUserVectorReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/UserVectorToCooccurrenceReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/file/FileDiffStorage.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/PerceptronTrainer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/TrainingException.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/WinnowTrainer.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/DirichletCluster.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/AsymmetricSampledNormalModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/L1Model.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterMapper.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/fuzzykmeans/FuzzyKMeansDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansClusterMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansCombiner.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/RandomSeedGenerator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.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/common/HadoopUtil.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/builder/DefaultTreeBuilder.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step1Mapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step2Mapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step1Mapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step2Mapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Describe.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Frequencies.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/FrequenciesJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/math/DenseMatrixWritable.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/math/MatrixWritable.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/BayesFileFormatterTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialSequentialBuilder.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialSequentialBuilder.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorMapper.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/df/BreimanExample.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/df/mapred/BuildForest.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/df/mapreduce/BuildForest.java
lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/list/AbstractValueTypeList.java.t
lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/list/ValueTypeArrayList.java.t
lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/AbstractObjectValueTypeMap.java.t
lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenKeyTypeValueTypeHashMap.java.t
lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/OpenObjectValueTypeHashMap.java.t
lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/set/OpenKeyTypeHashSet.java.t
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseVector.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/MatrixView.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/Partitioning.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/RandomAccessSparseVector.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SequentialAccessSparseVector.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/Sorting.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/Timer.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/VectorView.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/bitvector/BitVector.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/bitvector/QuickBitVector.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/buffer/ObjectBuffer.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/buffer/ObjectBufferConsumer.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/HebbianSolver.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/HebbianUpdater.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/MultiThreadedEigenVerifier.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/SimpleEigenVerifier.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/Functions.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/IntFunctions.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/AbstractDiscreteDistribution.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Beta.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Distributions.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Fun.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Gamma.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Hyperbolic.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Logarithmic.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Poisson.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/sampling/RandomSampler.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/sampling/WeightedRandomSampler.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/Descriptive.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/DoubleBufferSet.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/DoubleQuantileEstimator.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/KnownDoubleQuantileEstimator.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/QuantileCalc.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/UnknownDoubleQuantileEstimator.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/list/AbstractList.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/list/AbstractObjectList.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/map/OpenHashMap.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/map/PrimeFinder.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/map/QuickOpenIntIntHashMap.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/DoubleFactory2D.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Formatter.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/AbstractFormatter.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/DelegateDoubleMatrix1D.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/DenseDoubleMatrix2D.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/DenseDoubleMatrix3D.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/RCDoubleMatrix2D.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix2D.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix3D.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/TridiagonalDoubleMatrix2D.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/WrapperDoubleMatrix1D.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/WrapperDoubleMatrix2D.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Property.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Smp.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SmpBlas.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/set/AbstractSet.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/set/OpenHashSet.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/LogLikelihood.java
lucene/mahout/trunk/math/src/test/java-templates/org/apache/mahout/math/map/OpenKeyTypeObjectHashMapTest.java.t
lucene/mahout/trunk/math/src/test/java-templates/org/apache/mahout/math/map/OpenObjectValueTypeHashMapTest.java.t
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/SortingTest.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/map/OpenHashMapTest.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/arff/Driver.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/Driver.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizer.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/PartialVectorGenerator.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/PartialVectorMerger.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/TermCountMapper.java
lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/SequenceFileVectorIterableTest.java
lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java
lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java
Modified: lucene/mahout/trunk/collections-codegen-plugin/src/main/java/org/apache/mahout/collection_codegen/CodeGenerator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/collections-codegen-plugin/src/main/java/org/apache/mahout/collection_codegen/CodeGenerator.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/collections-codegen-plugin/src/main/java/org/apache/mahout/collection_codegen/CodeGenerator.java (original)
+++ lucene/mahout/trunk/collections-codegen-plugin/src/main/java/org/apache/mahout/collection_codegen/CodeGenerator.java Thu Jan 21 19:51:44 2010
@@ -27,6 +27,7 @@
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.context.Context;
import org.codehaus.plexus.util.SelectorUtils;
import java.io.File;
@@ -46,7 +47,7 @@
*/
public class CodeGenerator extends AbstractMojo {
- private static final String[] NO_STRINGS = new String[] {null};
+ private static final String[] NO_STRINGS = {null};
private static final Charset UTF8 = Charset.forName("utf-8");
private Map<String,String> typeToObjectTypeMap;
@@ -248,10 +249,9 @@
String packageDirectory, String key, String value) throws MojoExecutionException {
String outputName = templateName.replaceFirst("\\.java\\.t$",
".java");
- String keyCap = null;
- VelocityContext vc = new VelocityContext();
+ Context vc = new VelocityContext();
if (key != null) {
- keyCap = key.toUpperCase().charAt(0) + key.substring(1);
+ String keyCap = key.toUpperCase().charAt(0) + key.substring(1);
outputName = outputName.replaceAll("KeyType", keyCap);
vc.put("keyType", key);
vc.put("keyTypeCap", keyCap);
@@ -259,9 +259,8 @@
boolean floating = "float".equals(key) || "double".equals(key);
vc.put("keyTypeFloating", floating ? "true" : "false");
}
- String valueCap = null;
if (value != null) {
- valueCap = value.toUpperCase().charAt(0) + value.substring(1);
+ String valueCap = value.toUpperCase().charAt(0) + value.substring(1);
outputName = outputName.replaceAll("ValueType", valueCap);
vc.put("valueType", value);
vc.put("valueTypeCap", valueCap);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ToUserVectorReducer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ToUserVectorReducer.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ToUserVectorReducer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ToUserVectorReducer.java Thu Jan 21 19:51:44 2010
@@ -55,7 +55,9 @@
implements Reducer<LongWritable, ItemPrefWritable, LongWritable, VectorWritable> {
public static final int MAX_PREFS_CONSIDERED = 20;
- private VectorWritable vectorWritable = new VectorWritable();
+
+ private final VectorWritable vectorWritable = new VectorWritable();
+
@Override
public void reduce(LongWritable userID,
Iterator<ItemPrefWritable> itemPrefs,
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/UserVectorToCooccurrenceReducer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/UserVectorToCooccurrenceReducer.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/UserVectorToCooccurrenceReducer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/UserVectorToCooccurrenceReducer.java Thu Jan 21 19:51:44 2010
@@ -32,7 +32,9 @@
public final class UserVectorToCooccurrenceReducer
extends MapReduceBase
implements Reducer<IntWritable, IntWritable, IntWritable, VectorWritable> {
- private VectorWritable vectorWritable = new VectorWritable();
+
+ private final VectorWritable vectorWritable = new VectorWritable();
+
@Override
public void reduce(IntWritable index1,
Iterator<IntWritable> index2s,
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java Thu Jan 21 19:51:44 2010
@@ -106,7 +106,7 @@
throw new IllegalArgumentException("Invalid evaluationPercentage: " + evaluationPercentage);
}
- log.info("Beginning evaluation using " + trainingPercentage + " of " + dataModel);
+ log.info("Beginning evaluation using {} of {}", trainingPercentage, dataModel);
int numUsers = dataModel.getNumUsers();
FastByIDMap<PreferenceArray> trainingUsers =
@@ -129,7 +129,7 @@
Recommender recommender = recommenderBuilder.buildRecommender(trainingModel);
double result = getEvaluation(testUserPrefs, recommender);
- log.info("Evaluation result: " + result);
+ log.info("Evaluation result: {}", result);
return result;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java Thu Jan 21 19:51:44 2010
@@ -156,7 +156,7 @@
}
long end = System.currentTimeMillis();
- log.info("Evaluated with user " + userID + " in " + (end - start) + "ms");
+ log.info("Evaluated with user {} in {}ms", userID, (end-start));
log.info("Precision/recall/fall-out: {} / {} / {}", new Object[]{
precision.getAverage(), recall.getAverage(), fallOut.getAverage()
});
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java Thu Jan 21 19:51:44 2010
@@ -111,7 +111,7 @@
throw new FileNotFoundException(dataFile.toString());
}
- log.info("Creating FileDataModel for file " + dataFile);
+ log.info("Creating FileDataModel for file {}", dataFile);
this.dataFile = dataFile.getAbsoluteFile();
this.lastModified = dataFile.lastModified();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java Thu Jan 21 19:51:44 2010
@@ -517,7 +517,7 @@
rs.next();
return rs.getInt(1);
} catch (SQLException sqle) {
- log.warn("Exception while retrieving number of " + name, sqle);
+ log.warn("Exception while retrieving number of {}", name, sqle);
throw new TasteException(sqle);
} finally {
IOUtils.quietClose(rs, stmt, conn);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/file/FileDiffStorage.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/file/FileDiffStorage.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/file/FileDiffStorage.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/file/FileDiffStorage.java Thu Jan 21 19:51:44 2010
@@ -81,7 +81,7 @@
throw new IllegalArgumentException("maxEntries must be positive");
}
- log.info("Creating FileDataModel for file " + dataFile);
+ log.info("Creating FileDataModel for file {}", dataFile);
this.dataFile = dataFile.getAbsoluteFile();
this.lastModified = dataFile.lastModified();
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=901839&r1=901838&r2=901839&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 Thu Jan 21 19:51:44 2010
@@ -55,11 +55,8 @@
*/
public final class BayesFileFormatter {
- private static final Logger log = LoggerFactory
- .getLogger(BayesFileFormatter.class);
-
- private static final String LINE_SEP = System.getProperty("line.separator");
-
+ private static final Logger log = LoggerFactory.getLogger(BayesFileFormatter.class);
+
private BayesFileFormatter() { }
/**
@@ -179,7 +176,7 @@
writeFile(label, analyzer, file, charset, theWriter);
if (writer != null) {
// just write a new line
- theWriter.write(LINE_SEP);
+ theWriter.write('\n');
}
} catch (IOException e) {
// TODO: report failed files instead of throwing exception
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java Thu Jan 21 19:51:44 2010
@@ -144,15 +144,12 @@
@Override
public String summarize() {
- String lineSep = System.getProperty("line.separator");
StringBuilder returnString = new StringBuilder();
returnString.append(
- "=======================================================").append(
- lineSep);
+ "=======================================================").append('\n');
returnString.append("Confusion Matrix\n");
returnString.append(
- "-------------------------------------------------------").append(
- lineSep);
+ "-------------------------------------------------------").append('\n');
for (String correctLabel : this.labels) {
returnString.append(
@@ -160,7 +157,7 @@
.append('\t');
}
- returnString.append("<--Classified as").append(lineSep);
+ returnString.append("<--Classified as").append('\n');
for (String correctLabel : this.labels) {
int labelTotal = 0;
@@ -175,11 +172,11 @@
.append(
StringUtils
.rightPad(getSmallLabel(labelMap.get(correctLabel)), 5))
- .append(" = ").append(correctLabel).append(lineSep);
+ .append(" = ").append(correctLabel).append('\n');
}
returnString.append("Default Category: ").append(defaultLabel).append(": ")
- .append(labelMap.get(defaultLabel)).append(lineSep);
- returnString.append(lineSep);
+ .append(labelMap.get(defaultLabel)).append('\n');
+ returnString.append('\n');
return returnString.toString();
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java Thu Jan 21 19:51:44 2010
@@ -101,7 +101,7 @@
@Override
public void configure(JobConf job) {
try {
- log.info("Bayes Parameter" + job.get("bayes.parameters"));
+ log.info("Bayes Parameter {}", job.get("bayes.parameters"));
Parameters params = Parameters
.fromString(job.get("bayes.parameters", ""));
log.info("{}", params.print());
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfDriver.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfDriver.java Thu Jan 21 19:51:44 2010
@@ -126,9 +126,9 @@
hcd.setBlockCacheEnabled(true);
ht.addFamily(hcd);
- log.info("{}", "Connecting to hbase...");
+ log.info("Connecting to hbase...");
HBaseAdmin hba = new HBaseAdmin(hc);
- log.info("{}", "Creating Table " + output);
+ log.info("Creating Table {}", output);
if (hba.tableExists(output)) {
hba.disableTable(output);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearModel.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearModel.java Thu Jan 21 19:51:44 2010
@@ -33,12 +33,12 @@
/** Displacement of hyperplane from origin.*/
private double bias;
/** Classification threshold. */
- private double threshold;
+ private final double threshold;
/**
* Init a linear model with a hyperplane, distance and displacement.
* */
- public LinearModel(final Vector hyperplane, final double displacement, final double threshold) {
+ public LinearModel(Vector hyperplane, double displacement, double threshold) {
this.hyperplane = hyperplane;
this.bias = displacement;
this.threshold = threshold;
@@ -47,7 +47,7 @@
/**
* Init a linear model with zero displacement and a threshold of 0.5.
* */
- public LinearModel(final Vector hyperplane) {
+ public LinearModel(Vector hyperplane) {
this(hyperplane, 0, 0.5);
}
@@ -56,7 +56,7 @@
* @param dataPoint the data point to classify.
* @return returns true if data point should be classified as belonging to this model.
* */
- public boolean classify(final Vector dataPoint) throws CardinalityException, IndexException {
+ public boolean classify(Vector dataPoint) throws CardinalityException, IndexException {
double product = this.hyperplane.dot(dataPoint);
if (LOG.isDebugEnabled()) {
LOG.debug("model: " + this + " product: " + product + " Bias: " + this.bias + " threshold: " + this.threshold);
@@ -68,7 +68,7 @@
* Update the hyperplane by adding delta.
* @param delta the delta to add to the hyperplane vector.
* */
- public void addDelta(final Vector delta) {
+ public void addDelta(Vector delta) {
this.hyperplane = this.hyperplane.plus(delta);
}
@@ -87,7 +87,7 @@
* @param factor factor to multiply the bias by.
* */
public synchronized void shiftBias(double factor) {
- this.bias = this.bias + factor;
+ this.bias += factor;
}
/**
@@ -97,7 +97,7 @@
* */
public void timesDelta(int index, double delta) {
double element = this.hyperplane.get(index);
- element = element * delta;
+ element *= delta;
this.hyperplane.setQuick(index, element);
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java Thu Jan 21 19:51:44 2010
@@ -35,10 +35,9 @@
public abstract class LinearTrainer {
/** Logger for this class. */
- private static final Logger LOG = LoggerFactory
- .getLogger(LinearTrainer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LinearTrainer.class);
/** The model to train. */
- private LinearModel model;
+ private final LinearModel model;
/**
* Initialize the trainer. Distance is initialized to cosine distance, all
@@ -54,8 +53,8 @@
* @param initBias
* initial classification bias.
* */
- public LinearTrainer(final int dimension, final double threshold,
- final double init, final double initBias) throws CardinalityException {
+ protected LinearTrainer(int dimension, double threshold,
+ double init, double initBias) throws CardinalityException {
DenseVector initialWeights = new DenseVector(dimension);
initialWeights.assign(init);
this.model = new LinearModel(initialWeights, initBias, threshold);
@@ -74,7 +73,7 @@
* of data- and labelset do not match, a CardinalityException is
* thrown
* */
- public void train(final Vector labelset, final Matrix dataset)
+ public void train(Vector labelset, Matrix dataset)
throws IndexException, CardinalityException, TrainingException {
if (labelset.size() != dataset.size()[1]) {
throw new CardinalityException();
@@ -83,9 +82,10 @@
boolean converged = false;
int iteration = 0;
while (!converged) {
- if (iteration > 1000)
+ if (iteration > 1000) {
throw new TrainingException(
"Too many iterations needed to find hyperplane.");
+ }
converged = true;
int columnCount = dataset.size()[1];
@@ -123,7 +123,7 @@
* @param dataPoint
* the data point that was classified incorrectly.
* */
- protected abstract void update(final double label, final Vector dataPoint,
+ protected abstract void update(double label, Vector dataPoint,
LinearModel model);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/PerceptronTrainer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/PerceptronTrainer.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/PerceptronTrainer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/PerceptronTrainer.java Thu Jan 21 19:51:44 2010
@@ -54,11 +54,12 @@
* vector (multiplied by the learning rate) is subtracted from the weight vector.
* */
@Override
- protected void update(final double label, final Vector dataPoint,
- final LinearModel model) {
+ protected void update(double label, Vector dataPoint,
+ LinearModel model) {
double factor = 1.0;
- if (label == 0.0)
+ if (label == 0.0) {
factor = -1.0;
+ }
Vector updateVector = dataPoint.times(factor).times(this.learningRate);
LOG.debug("Updatevec: " + updateVector);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/TrainingException.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/TrainingException.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/TrainingException.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/TrainingException.java Thu Jan 21 19:51:44 2010
@@ -12,7 +12,7 @@
/**
* Init with message string describing the cause of the exception.
* */
- public TrainingException(final String message) {
+ public TrainingException(String message) {
super(message);
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/WinnowTrainer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/WinnowTrainer.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/WinnowTrainer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/WinnowTrainer.java Thu Jan 21 19:51:44 2010
@@ -21,23 +21,26 @@
import org.apache.mahout.math.CardinalityException;
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.Vector.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class implements training according to the winnow update algorithm.
*/
public class WinnowTrainer extends LinearTrainer {
+ private static final Logger log = LoggerFactory.getLogger(WinnowTrainer.class);
+
/** Promotion step to multiply weights with on update. */
private final double promotionStep;
- public WinnowTrainer(final int dimension, final double promotionStep,
- final double threshold, final double init, final double initBias) {
+ public WinnowTrainer(int dimension, double promotionStep,
+ double threshold, double init, double initBias) {
super(dimension, threshold, init, initBias);
this.promotionStep = promotionStep;
}
- /** {@inheritDoc} */
- public WinnowTrainer(final int dimension, final double promotionStep)
+ public WinnowTrainer(int dimension, double promotionStep)
throws CardinalityException {
this(dimension, promotionStep, 0.5, 1, 0);
}
@@ -48,7 +51,7 @@
* @param dimension
* number of features.
* */
- public WinnowTrainer(final int dimension) {
+ public WinnowTrainer(int dimension) {
this(dimension, 2);
}
@@ -64,12 +67,11 @@
* example are halfed.
* */
@Override
- protected void update(final double label, final Vector dataPoint,
- LinearModel model) {
+ protected void update(double label, Vector dataPoint, LinearModel model) {
if (label > 0) {
// case one
Vector updateVector = dataPoint.times(1 / this.promotionStep);
- System.out.println("Winnow update positive: " + updateVector);
+ log.info("Winnow update positive: {}", updateVector);
Iterator<Element> iter = updateVector.iterateNonZero();
while (iter.hasNext()) {
Element element = iter.next();
@@ -78,13 +80,13 @@
} else {
// case two
Vector updateVector = dataPoint.times(1 / this.promotionStep);
- System.out.println("Winnow update negative: " + updateVector);
+ log.info("Winnow update negative: {}", updateVector);
Iterator<Element> iter = updateVector.iterateNonZero();
while (iter.hasNext()) {
Element element = iter.next();
model.timesDelta(element.index(), element.get());
}
}
- System.out.println(model);
+ log.info(model.toString());
}
}
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=901839&r1=901838&r2=901839&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 Thu Jan 21 19:51:44 2010
@@ -130,8 +130,7 @@
*/
public static void runJob(String input, String output,
String measureClassName, double t1, double t2) throws IOException {
- log.info("Input: " + input + " Out: " + output + " Measure: " + measureClassName + " t1: " + t1
- + " t2: " + t2);
+ log.info("Input: {} Out: {} Measure: {} t1: {} t2: {}", new Object[] {input, output, measureClassName, t1, t2});
Configurable client = new JobClient();
JobConf conf = new JobConf(CanopyDriver.class);
conf.set(CanopyConfigKeys.DISTANCE_MEASURE_KEY, measureClassName);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletCluster.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletCluster.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletCluster.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletCluster.java Thu Jan 21 19:51:44 2010
@@ -16,12 +16,9 @@
*/
package org.apache.mahout.clustering.dirichlet;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import org.apache.hadoop.io.Writable;
import org.apache.mahout.clustering.dirichlet.models.Model;
-import org.apache.mahout.math.JsonVectorAdapter;
import org.apache.mahout.math.Vector;
import java.io.DataInput;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java Thu Jan 21 19:51:44 2010
@@ -144,6 +144,7 @@
* @throws SecurityException
* @deprecated since it presumes 2-d, dense vector model prototypes
*/
+ @Deprecated
public static void runJob(String input, String output, String modelFactory, int numClusters, int maxIterations, double alpha_0,
int numReducers) throws ClassNotFoundException, InstantiationException, IllegalAccessException, IOException,
SecurityException, IllegalArgumentException, NoSuchMethodException, InvocationTargetException {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletReducer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletReducer.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletReducer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletReducer.java Thu Jan 21 19:51:44 2010
@@ -24,7 +24,6 @@
import org.apache.hadoop.mapred.Reducer;
import org.apache.hadoop.mapred.Reporter;
import org.apache.mahout.clustering.dirichlet.models.Model;
-import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
import java.io.IOException;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/AsymmetricSampledNormalModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/AsymmetricSampledNormalModel.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/AsymmetricSampledNormalModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/AsymmetricSampledNormalModel.java Thu Jan 21 19:51:44 2010
@@ -121,8 +121,9 @@
// return the product of the component pdfs
// TODO: is this reasonable? correct?
double pdf = pdf(x, stdDev.get(0));
- for (int i = 1; i < x.size(); i++)
- pdf = pdf * pdf(x, stdDev.get(i));
+ for (int i = 1; i < x.size(); i++) {
+ pdf *= pdf(x, stdDev.get(i));
+ }
return pdf;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/L1Model.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/L1Model.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/L1Model.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/L1Model.java Thu Jan 21 19:51:44 2010
@@ -27,7 +27,7 @@
public class L1Model implements Model<VectorWritable> {
- private static DistanceMeasure measure = new ManhattanDistanceMeasure();
+ private static final DistanceMeasure measure = new ManhattanDistanceMeasure();
public L1Model() {
super();
@@ -83,9 +83,9 @@
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append("l1m{n=").append(count).append(" c=[");
- int nextIx = 0;
if (coefficients != null) {
// handle sparse Vectors gracefully, suppressing zero values
+ int nextIx = 0;
for (int i = 0; i < coefficients.size(); i++) {
double elem = coefficients.get(i);
if (elem == 0.0)
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java Thu Jan 21 19:51:44 2010
@@ -20,12 +20,10 @@
import org.apache.mahout.math.SquareRootFunction;
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
-import org.apache.mahout.math.Vector.Element;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.util.Iterator;
public class NormalModel implements Model<VectorWritable> {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterMapper.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterMapper.java Thu Jan 21 19:51:44 2010
@@ -24,7 +24,6 @@
import org.apache.hadoop.mapred.Mapper;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reporter;
-import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
import java.io.IOException;
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=901839&r1=901838&r2=901839&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 Thu Jan 21 19:51:44 2010
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.mahout.clustering.fuzzykmeans;
import java.io.IOException;
@@ -12,7 +29,6 @@
public class FuzzyKMeansClusterer {
-
private static final double MINIMAL_VALUE = 0.0000000001; // using it for
// adding
// exception
@@ -21,7 +37,7 @@
// variable to avoid
// divide by Zero
- private int nextClusterId = 0;
+ //private int nextClusterId = 0;
private DistanceMeasure measure;
@@ -57,7 +73,7 @@
private void config(DistanceMeasure aMeasure, double aConvergenceDelta) {
measure = aMeasure;
convergenceDelta = aConvergenceDelta;
- nextClusterId = 0;
+ //nextClusterId = 0;
}
/**
@@ -72,7 +88,7 @@
measure = (DistanceMeasure) cl.newInstance();
measure.configure(job);
convergenceDelta = Double.parseDouble(job.get(FuzzyKMeansConfigKeys.CLUSTER_CONVERGENCE_KEY));
- nextClusterId = 0;
+ //nextClusterId = 0;
m = Double.parseDouble(job.get(FuzzyKMeansConfigKeys.M_KEY));
} catch (ClassNotFoundException e) {
throw new IllegalStateException(e);
@@ -130,12 +146,8 @@
}
FuzzyKMeansOutput fOutput = new FuzzyKMeansOutput(clusters.size());
for (int i = 0; i < clusters.size(); i++) {
- // System.out.print("cluster:" + i + "\t" + clusterDistanceList.get(i));
-
double probWeight = computeProbWeight(clusterDistanceList.get(i),
clusterDistanceList);
- /*outputValue.append(clusters.get(i).clusterId).append(':').append(
- probWeight).append(' ');*/
fOutput.add(i, clusters.get(i), probWeight);
}
String name = point.getName();
@@ -145,8 +157,7 @@
}
/** Computes the probability of a point belonging to a cluster */
- public double computeProbWeight(double clusterDistance,
- List<Double> clusterDistanceList) {
+ public double computeProbWeight(double clusterDistance, List<Double> clusterDistanceList) {
if (clusterDistance == 0) {
clusterDistance = MINIMAL_VALUE;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java Thu Jan 21 19:51:44 2010
@@ -217,7 +217,7 @@
// iterate until the clusters converge
while (!converged && iteration < maxIterations) {
- log.info("Iteration {" + iteration + '}');
+ log.info("Iteration {}", iteration);
// point the output to a new directory per iteration
String clustersOut = output + File.separator + "clusters-" + iteration;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansMapper.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansMapper.java Thu Jan 21 19:51:44 2010
@@ -24,7 +24,6 @@
import org.apache.hadoop.mapred.Mapper;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reporter;
-import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansClusterMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansClusterMapper.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansClusterMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansClusterMapper.java Thu Jan 21 19:51:44 2010
@@ -25,7 +25,6 @@
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reporter;
import org.apache.mahout.common.distance.DistanceMeasure;
-import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
import java.io.IOException;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansCombiner.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansCombiner.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansCombiner.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansCombiner.java Thu Jan 21 19:51:44 2010
@@ -17,7 +17,6 @@
package org.apache.mahout.clustering.kmeans;
import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.MapReduceBase;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reducer;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java Thu Jan 21 19:51:44 2010
@@ -182,9 +182,9 @@
// iterate until the clusters converge
String delta = Double.toString(convergenceDelta);
if (log.isInfoEnabled()) {
- log.info("Input: " + input + " Clusters In: " + clustersIn + " Out: " + output + " Distance: " + measureClass);
- log.info("convergence: " + convergenceDelta + " max Iterations: " + maxIterations + " num Reduce Tasks: "
- + numReduceTasks + " Input Vectors: " + VectorWritable.class.getName());
+ log.info("Input: {} Clusters In: {} Out: {} Distance: {}", new Object[] {input, clustersIn, output, measureClass});
+ log.info("convergence: {} max Iterations: {} num Reduce Tasks: {} Input Vectors: {}",
+ new Object[] {convergenceDelta, maxIterations, numReduceTasks, VectorWritable.class.getName()});
}
boolean converged = false;
int iteration = 0;
@@ -259,8 +259,9 @@
String convergenceDelta) {
if (log.isInfoEnabled()) {
log.info("Running Clustering");
- log.info("Input: " + input + " Clusters In: " + clustersIn + " Out: " + output + " Distance: " + measureClass);
- log.info("convergence: " + convergenceDelta + " Input Vectors: " + VectorWritable.class.getName());
+ log.info("Input: {} Clusters In: {} Out: {} Distance: {}",
+ new Object[] {input, clustersIn, output, measureClass});
+ log.info("convergence: {} Input Vectors: {}", convergenceDelta, VectorWritable.class.getName());
}
JobConf conf = new JobConf(KMeansDriver.class);
conf.setInputFormat(SequenceFileInputFormat.class);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansMapper.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansMapper.java Thu Jan 21 19:51:44 2010
@@ -24,7 +24,6 @@
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reporter;
import org.apache.mahout.common.distance.DistanceMeasure;
-import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
import java.io.IOException;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/RandomSeedGenerator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/RandomSeedGenerator.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/RandomSeedGenerator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/RandomSeedGenerator.java Thu Jan 21 19:51:44 2010
@@ -23,7 +23,6 @@
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapred.JobConf;
-import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.math.VectorWritable;
import org.slf4j.Logger;
@@ -61,7 +60,7 @@
fs.mkdirs(outPath);
Path outFile = new Path(outPath, "part-randomSeed");
if (fs.exists(outFile)) {
- log.warn("Deleting " + outFile);
+ log.warn("Deleting {}", outFile);
fs.delete(outFile, false);
}
boolean newFile = fs.createNewFile(outFile);
@@ -94,7 +93,7 @@
for (int i = 0; i < k; i++) {
writer.append(chosenTexts.get(i), chosenClusters.get(i));
}
- log.info("Wrote " + k + " vectors to " + outFile);
+ log.info("Wrote {} vectors to {}", k, outFile);
reader.close();
writer.close();
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java Thu Jan 21 19:51:44 2010
@@ -332,7 +332,6 @@
} else if (topic == LOG_LIKELIHOOD_KEY) {
ll = value.get();
} else {
- //System.out.println(topic + " " + word);
if (!(topic >= 0 && word >= 0)) {
throw new IllegalArgumentException(topic + " " + word);
}
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=901839&r1=901838&r2=901839&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 Thu Jan 21 19:51:44 2010
@@ -21,7 +21,12 @@
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import org.apache.mahout.clustering.ClusterBase;
-import org.apache.mahout.math.*;
+import org.apache.mahout.math.CardinalityException;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.JsonVectorAdapter;
+import org.apache.mahout.math.PlusFunction;
+import org.apache.mahout.math.Vector;
+import org.apache.mahout.math.VectorWritable;
import java.io.DataInput;
import java.io.DataOutput;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/HadoopUtil.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/HadoopUtil.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/HadoopUtil.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/HadoopUtil.java Thu Jan 21 19:51:44 2010
@@ -40,7 +40,7 @@
Path outPath = new Path(output);
FileSystem fs = FileSystem.get(outPath.toUri(), conf);
if (fs.exists(outPath)) {
- log.warn("Deleting " + outPath);
+ log.warn("Deleting {}", outPath);
fs.delete(outPath, true);
}
fs.mkdirs(outPath);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java Thu Jan 21 19:51:44 2010
@@ -40,7 +40,7 @@
try {
closeable.close();
} catch (IOException ioe) {
- log.warn("Unexpected exception while closing " + closeable + "; continuing", ioe);
+ log.warn("Unexpected exception while closing; continuing", ioe);
}
}
}
@@ -52,7 +52,7 @@
try {
closeable.close();
} catch (SQLException sqle) {
- log.warn("Unexpected exception while closing " + closeable + "; continuing", sqle);
+ log.warn("Unexpected exception while closing; continuing", sqle);
}
}
}
@@ -62,7 +62,7 @@
try {
closeable.close();
} catch (SQLException sqle) {
- log.warn("Unexpected exception while closing " + closeable + "; continuing", sqle);
+ log.warn("Unexpected exception while closing; continuing", sqle);
}
}
}
@@ -72,7 +72,7 @@
try {
closeable.close();
} catch (SQLException sqle) {
- log.warn("Unexpected exception while closing " + closeable + "; continuing", sqle);
+ log.warn("Unexpected exception while closing; continuing", sqle);
}
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java Thu Jan 21 19:51:44 2010
@@ -29,7 +29,6 @@
private static final XStream xstream = new XStream();
private static final Pattern NEWLINE_PATTERN = Pattern.compile("\n");
- public static final String LINE_SEP = System.getProperty("line.separator");
private StringUtils() {
// do nothing
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java Thu Jan 21 19:51:44 2010
@@ -82,7 +82,7 @@
private static void configureParametersRecusivly(Parametered parametered, String prefix, JobConf jobConf) {
for (Parameter<?> parameter : parametered.getParameters()) {
if (log.isDebugEnabled()) {
- log.debug("Configuring " + prefix + parameter.name());
+ log.debug("Configuring {}{}", prefix, parameter.name());
}
String name = prefix + parameter.name() + '.';
parameter.createParameters(name, jobConf);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/builder/DefaultTreeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/builder/DefaultTreeBuilder.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/builder/DefaultTreeBuilder.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/builder/DefaultTreeBuilder.java Thu Jan 21 19:51:44 2010
@@ -17,12 +17,9 @@
package org.apache.mahout.df.builder;
-import java.util.Arrays;
import java.util.Random;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.mahout.df.data.Data;
-import org.apache.mahout.df.data.Dataset;
import org.apache.mahout.df.data.Instance;
import org.apache.mahout.df.data.conditions.Condition;
import org.apache.mahout.df.node.CategoricalNode;
@@ -92,13 +89,13 @@
}
boolean alreadySelected = selected[best.attr];
- Node childNode = null;
if (alreadySelected) {
// attribute already selected
- log.warn("attribute " + best.attr + " already selected in a parent node");
+ log.warn("attribute {} already selected in a parent node", best.attr);
}
-
+
+ Node childNode = null;
if (data.getDataset().isNumerical(best.attr)) {
Data loSubset = data.subset(Condition.lesser(best.attr, best.split));
Node loChild = build(rng, loSubset);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java Thu Jan 21 19:51:44 2010
@@ -63,7 +63,7 @@
List<String>[] values, String string) {
StringTokenizer tokenizer = new StringTokenizer(string, ", ");
if (tokenizer.countTokens() != attrs.length) {
- log.error(id + ": " + string);
+ log.error("{}: {}", id, string);
throw new IllegalArgumentException("Wrong number of attributes in the string");
}
@@ -137,14 +137,14 @@
while (scanner.hasNextLine()) {
String line = scanner.nextLine();
if (line.isEmpty()) {
- log.warn(instances.size() + ": empty string");
+ log.warn("{}: empty string", instances.size());
continue;
}
Instance instance = converter.convert(instances.size(), line);
if (instance == null) {
// missing values found
- log.warn(instances.size() + ": missing values");
+ log.warn("{}: missing values", instances.size());
continue;
}
@@ -166,14 +166,14 @@
for (String line : data) {
if (line.isEmpty()) {
- log.warn(instances.size() + ": empty string");
+ log.warn("{}: empty string", instances.size());
continue;
}
Instance instance = converter.convert(instances.size(), line);
if (instance == null) {
// missing values found
- log.warn(instances.size() + ": missing values");
+ log.warn("{}: missing values", instances.size());
continue;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemMapper.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemMapper.java Thu Jan 21 19:51:44 2010
@@ -83,7 +83,7 @@
throw new IllegalStateException("Exception caught while loading the data: "
+ StringUtils.stringifyException(e));
}
- log.info("Data loaded : " + data.size() + " instances");
+ log.info("Data loaded : {} instances", data.size());
bagging = new Bagging(getTreeBuilder(), data);
}
@@ -123,7 +123,7 @@
protected void initRandom(InMemInputSplit split) {
if (rng == null) { // first execution of this mapper
Long seed = split.getSeed();
- log.debug("Initialising rng with seed : " + seed);
+ log.debug("Initialising rng with seed {}: ", seed);
if (seed == null)
rng = RandomUtils.getRandom();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step1Mapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step1Mapper.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step1Mapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step1Mapper.java Thu Jan 21 19:51:44 2010
@@ -97,7 +97,7 @@
converter = new DataConverter(getDataset());
// prepare random-numders generator
- log.debug("seed : " + seed);
+ log.debug("seed : {}", seed);
if (seed == null)
rng = RandomUtils.getRandom();
else
@@ -118,9 +118,9 @@
firstTreeId += nbTrees(numMapTasks, numTrees, p);
}
- log.debug("partition : " + partition);
- log.debug("nbTrees : " + nbTrees);
- log.debug("firstTreeId : " + firstTreeId);
+ log.debug("partition : {}", partition);
+ log.debug("nbTrees : {}", nbTrees);
+ log.debug("firstTreeId : {}", firstTreeId);
}
/**
@@ -155,18 +155,18 @@
@Override
public void close() throws IOException {
// prepare the data
- log.debug("partition: " + partition + "numInstances: " + instances.size());
+ log.debug("partition: {} numInstances: {}", partition, instances.size());
Data data = new Data(getDataset(), instances);
Bagging bagging = new Bagging(getTreeBuilder(), data);
TreeID key = new TreeID();
- log.debug("Building " + nbTrees + " trees");
+ log.debug("Building {} trees", nbTrees);
SingleTreePredictions callback = null;
int[] predictions = null;
for (int treeId = 0; treeId < nbTrees; treeId++) {
- log.debug("Building tree N° : " + treeId);
+ log.debug("Building tree number: {}", treeId);
if (isOobEstimate() && !isNoOutput()) {
callback = new SingleTreePredictions(data.size());
predictions = callback.getPredictions();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step2Mapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step2Mapper.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step2Mapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step2Mapper.java Thu Jan 21 19:51:44 2010
@@ -111,7 +111,7 @@
numInstances = InterResults.load(fs, forestPath, numMaps, numTrees,
p, keys, trees);
- log.debug("partition: " + p + "numInstances: " + numInstances);
+ log.debug("partition: {} numInstances: {}", p, numInstances);
} catch (IOException e) {
throw new IllegalStateException("Exception while loading the forest : ", e);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java Thu Jan 21 19:51:44 2010
@@ -77,7 +77,7 @@
log.info("Loading the data...");
data = loadData(conf, getDataset());
- log.info("Data loaded : " + data.size() + " instances");
+ log.info("Data loaded : {} instances", data.size());
bagging = new Bagging(getTreeBuilder(), data);
}
@@ -114,7 +114,7 @@
protected void initRandom(InMemInputSplit split) {
if (rng == null) { // first execution of this mapper
Long seed = split.getSeed();
- log.debug("Initialising rng with seed : " + seed);
+ log.debug("Initialising rng with seed : {}", seed);
if (seed == null)
rng = RandomUtils.getRandom();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java Thu Jan 21 19:51:44 2010
@@ -121,7 +121,7 @@
protected Step0Output[] parseOutput(JobContext job) throws IOException {
Configuration conf = job.getConfiguration();
- log.info("mapred.map.tasks = " + conf.getInt("mapred.map.tasks", -1));
+ log.info("mapred.map.tasks = {}", conf.getInt("mapred.map.tasks", -1));
FileSystem fs = outputPath.getFileSystem(conf);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step1Mapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step1Mapper.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step1Mapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step1Mapper.java Thu Jan 21 19:51:44 2010
@@ -92,7 +92,7 @@
converter = new DataConverter(getDataset());
// prepare random-numders generator
- log.debug("seed : " + seed);
+ log.debug("seed : {}", seed);
if (seed == null)
rng = RandomUtils.getRandom();
else
@@ -113,9 +113,9 @@
firstTreeId += nbTrees(numMapTasks, numTrees, p);
}
- log.debug("partition : " + partition);
- log.debug("nbTrees : " + nbTrees);
- log.debug("firstTreeId : " + firstTreeId);
+ log.debug("partition : {}", partition);
+ log.debug("nbTrees : {}", nbTrees);
+ log.debug("firstTreeId : {}", firstTreeId);
}
/**
@@ -146,18 +146,18 @@
@Override
protected void cleanup(Context context) throws IOException, InterruptedException {
// prepare the data
- log.debug("partition: " + partition + "numInstances: " + instances.size());
+ log.debug("partition: {} numInstances: {}", partition, instances.size());
Data data = new Data(getDataset(), instances);
Bagging bagging = new Bagging(getTreeBuilder(), data);
TreeID key = new TreeID();
- log.debug("Building " + nbTrees + " trees");
+ log.debug("Building {} trees", nbTrees);
SingleTreePredictions callback = null;
int[] predictions = null;
for (int treeId = 0; treeId < nbTrees; treeId++) {
- log.debug("Building tree N° : " + treeId);
+ log.debug("Building tree number : {}", treeId);
if (isOobEstimate() && !isNoOutput()) {
callback = new SingleTreePredictions(data.size());
predictions = callback.getPredictions();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step2Mapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step2Mapper.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step2Mapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step2Mapper.java Thu Jan 21 19:51:44 2010
@@ -68,7 +68,7 @@
// get the cached files' paths
URI[] files = DistributedCache.getCacheFiles(conf);
- log.info("DistributedCache.getCacheFiles(): " + ArrayUtils.toString(files));
+ log.info("DistributedCache.getCacheFiles(): {}", ArrayUtils.toString(files));
if (files == null || files.length < 2) {
throw new IllegalArgumentException("missing paths from the DistributedCache");
@@ -95,7 +95,7 @@
int numInstances = InterResults.load(fs, forestPath, numMaps, numTrees,
p, keys, trees);
- log.debug("partition: " + p + "numInstances: " + numInstances);
+ log.debug("partition: {} numInstances: {}", p, numInstances);
configure(p, dataset, keys, trees, numInstances);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Describe.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Describe.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Describe.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Describe.java Thu Jan 21 19:51:44 2010
@@ -93,9 +93,9 @@
String descPath = cmdLine.getValue(descPathOpt).toString();
List<String> descriptor = convert(cmdLine.getValues(descriptorOpt));
- log.debug("Data path : " + dataPath);
- log.debug("Descriptor path : " + descPath);
- log.debug("Descriptor : " + descriptor);
+ log.debug("Data path : {}", dataPath);
+ log.debug("Descriptor path : {}", descPath);
+ log.debug("Descriptor : {}", descriptor);
runTool(dataPath, descriptor, descPath);
} catch (OptionException e) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Frequencies.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Frequencies.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Frequencies.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Frequencies.java Thu Jan 21 19:51:44 2010
@@ -32,7 +32,6 @@
import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
import org.apache.mahout.common.CommandLineUtil;
-import org.apache.mahout.df.data.DataUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -85,8 +84,8 @@
String dataPath = cmdLine.getValue(dataOpt).toString();
String datasetPath = cmdLine.getValue(datasetOpt).toString();
- log.debug("Data path : " + dataPath);
- log.debug("Dataset path : " + datasetPath);
+ log.debug("Data path : {}", dataPath);
+ log.debug("Dataset path : {}", datasetPath);
runTool(dataPath, datasetPath);
} catch (OptionException e) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/FrequenciesJob.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/FrequenciesJob.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/FrequenciesJob.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/FrequenciesJob.java Thu Jan 21 19:51:44 2010
@@ -130,7 +130,7 @@
Configuration conf = job.getConfiguration();
int numMaps = conf.getInt("mapred.map.tasks", -1);
- log.info("mapred.map.tasks = " + numMaps);
+ log.info("mapred.map.tasks = {}", numMaps);
FileSystem fs = outputPath.getFileSystem(conf);
@@ -188,7 +188,7 @@
*/
protected void setup(Dataset dataset) {
converter = new DataConverter(dataset);
- // log.info("labels: " + Arrays.toString(dataset.labels()));
+ // log.info("labels: {}", Arrays.toString(dataset.labels()));
}
@Override
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java Thu Jan 21 19:51:44 2010
@@ -9,7 +9,11 @@
import org.apache.commons.cli2.builder.GroupBuilder;
import org.apache.commons.cli2.commandline.Parser;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.*;
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.fs.Path;
import org.apache.mahout.common.CommandLineUtil;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.data.DataConverter;
@@ -183,7 +187,7 @@
/*
FSDataOutputStream joined = fs.create(new Path(outputPath, "uniform.data"));
for (int p = 0; p < numPartitions; p++) {
- log.info("Joining part : " + p);
+ log.info("Joining part : {}", p);
FSDataInputStream partStream = fs.open(partPaths[p]);
IOUtils.copyBytes(partStream, joined, conf, false);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java Thu Jan 21 19:51:44 2010
@@ -177,9 +177,9 @@
int temp = ROOTNODEID;
int ret = 0;
boolean addCountMode = true;
- int child;
for (int attributeValue : myList) {
+ int child;
if (addCountMode) {
child = childWithAttribute(temp, attributeValue);
if (child == -1) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java?rev=901839&r1=901838&r2=901839&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java Thu Jan 21 19:51:44 2010
@@ -482,7 +482,7 @@
return frequentPatterns;
}
- private void traverseAndBuildConditionalFPTreeData(int firstConditionalNode,
+ private static void traverseAndBuildConditionalFPTreeData(int firstConditionalNode,
MutableLong minSupportMutable, FPTree conditionalTree, FPTree tree) {
// Build Subtable