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/05/02 20:14:25 UTC
svn commit: r1098706 [1/5] - in /mahout/trunk: core/src/main/java/
core/src/main/java/org/apache/mahout/
core/src/main/java/org/apache/mahout/cf/taste/eval/
core/src/main/java/org/apache/mahout/cf/taste/hadoop/
core/src/main/java/org/apache/mahout/cf/t...
Author: srowen
Date: Mon May 2 18:14:18 2011
New Revision: 1098706
URL: http://svn.apache.org/viewvc?rev=1098706&view=rev
Log:
Style, mostly javadoc. Move package.html files to newer package-info.java equivalent. Remove unused and deprecated VectorModelClassifier
Added:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/package-info.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/package-info.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/package-info.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/package-info.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/package-info.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/package-info.java
mahout/trunk/core/src/main/java/org/apache/mahout/ep/package-info.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/package-info.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/function/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/engine/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/sampling/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/package-info.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/package-info.java
Removed:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/package.html
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/package.html
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/VectorModelClassifier.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/package.html
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/package.html
mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/package.html
mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/package.html
mahout/trunk/core/src/main/java/org/apache/mahout/ep/package.html
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/package.html
mahout/trunk/core/src/main/java/org/apache/mahout/package.html
mahout/trunk/core/src/main/java/overview.html
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestVectorModelClassifier.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/package.html
mahout/trunk/examples/src/main/java/overview.html
mahout/trunk/math/src/main/java/org/apache/mahout/math/function/package.html
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/package.html
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/engine/package.html
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/package.html
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/sampling/package.html
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/package.html
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/package.html
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/package.html
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/package.html
mahout/trunk/math/src/main/java/org/apache/mahout/math/package.html
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/eval/RecommenderEvaluator.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/EntityEntityWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ToItemPrefsMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/IndexedVarIntWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/LongPrimitiveIterator.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/RefreshHelper.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/EachRowIterator.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/OrderBasedRecommenderEvaluator.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/MySQLJDBCIDMigrator.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/PlusAnonymousUserDataModel.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/GenericJDBCDataModel.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/MySQLJDBCDataModel.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommender.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/FarthestNeighborClusterSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefUserBasedRecommender.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericRecommendedItem.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NearestNeighborClusterSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/SimilarUser.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TopItems.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/knn/NonNegativeQuadraticOptimizer.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorage.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/SlopeOneRecommender.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/file/FileDiffStorage.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/MySQLJDBCDiffStorage.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizer.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ExpectationMaximizationSVDFactorizer.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommender.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericUserSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/PearsonCorrelationSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/file/FileItemSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/CaseAmplification.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequency.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/recommender/IDRescorer.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/recommender/Rescorer.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/recommender/slopeone/DiffStorage.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/similarity/ItemSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/AbstractVectorClassifier.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/algorithm/BayesAlgorithm.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/algorithm/CBayesAlgorithm.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/interfaces/Algorithm.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/interfaces/Datastore.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfOutputFormat.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesWeightSummerOutputFormat.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/model/ClassifierContext.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/evaluation/Auc.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sequencelearning/hmm/HmmModel.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sequencelearning/hmm/HmmTrainer.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sequencelearning/hmm/HmmUtils.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/AbstractCluster.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.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/FuzzyKMeansClusterMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansCombiner.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansUtil.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansClusterMapper.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/kmeans/KMeansMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansUtil.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAInference.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/UnitVectorizerJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorMatrixMultiplicationJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/eigencuts/EigencutsSensitivityMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/IntTuple.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/CountingIterator.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/builder/DefaultTreeBuilder.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/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/Classifier.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/InMemInputFormat.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/ThreadedEvolutionaryProcess.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/EvalMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java
mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/OutputUtils.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/MultiLabelVectorWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/RowSimilarityJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/GivensThinSolver.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/Omega.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDPrototype.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDSolver.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/Gram.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKey.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/TextValueEncoder.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TFPartialVectorReducer.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/DataFileIterator.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/ToCSV.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Runner.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/ParallelArraysSGDFactorizer.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/Track1SVDRunner.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track2/Track2Runner.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/SplitBayesInput.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/SimpleCsvExamples.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainNewsGroups.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/minhash/LastfmClusterEvaluator.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/minhash/LastfmDataConverter.java
mahout/trunk/examples/src/main/java/org/apache/mahout/df/mapreduce/TestForest.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDRule.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/DataSet.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/FileInfoParser.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/NominalAttr.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombiner.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapper.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/StrategyPanel.java
mahout/trunk/math/src/main/java/org/apache/mahout/common/RandomUtils.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/SingularValueDecomposition.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/Vector.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/als/AlternateLeastSquaresSolver.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/decomposer/hebbian/HebbianUpdater.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/function/Functions.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/Arithmetic.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/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/random/engine/RandomEngine.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/sampling/RandomSampler.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/Probability.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/DoubleMatrix1D.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/DoubleMatrix2D.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/AbstractMatrix.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/AbstractMatrix1D.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/AbstractMatrix2D.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix2D.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/EigenvalueDecomposition.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Property.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/LogLikelihood.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineExponentialAverage.java
mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderServlet.java
mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderSingleton.java
mahout/trunk/utils/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/eval/DatasetSplitter.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/VectorWriter.java
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/eval/RecommenderEvaluator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/eval/RecommenderEvaluator.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/eval/RecommenderEvaluator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/eval/RecommenderEvaluator.java Mon May 2 18:14:18 2011
@@ -37,7 +37,7 @@ public interface RecommenderEvaluator {
* rather a {@link RecommenderBuilder} which can build the
* {@link org.apache.mahout.cf.taste.recommender.Recommender} to test on top of a given {@link DataModel}.
* </p>
- *
+ *
* <p>
* Implementations will take a certain percentage of the preferences supplied by the given {@link DataModel}
* as "training data". This is typically most of the data, like 90%. This data is used to produce
@@ -47,18 +47,18 @@ public interface RecommenderEvaluator {
* recommendatinos, and for each user, the remaining preferences are compared against the user's real
* preferences.
* </p>
- *
+ *
* <p>
* For large datasets, it may be desirable to only evaluate based on a small percentage of the data.
- * <code>evaluationPercentage</code> controls how many of the {@link DataModel}'s users are used in
+ * {@code evaluationPercentage} controls how many of the {@link DataModel}'s users are used in
* evaluation.
* </p>
- *
+ *
* <p>
- * To be clear, <code>trainingPercentage</code> and <code>evaluationPercentage</code> are not related. They
+ * To be clear, {@code trainingPercentage} and {@code evaluationPercentage} are not related. They
* do not need to add up to 1.0, for example.
* </p>
- *
+ *
* @param recommenderBuilder
* object that can build a {@link org.apache.mahout.cf.taste.recommender.Recommender} to test
* @param dataModelBuilder
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/EntityEntityWritable.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/EntityEntityWritable.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/EntityEntityWritable.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/EntityEntityWritable.java Mon May 2 18:14:18 2011
@@ -85,7 +85,7 @@ public final class EntityEntityWritable
public boolean equals(Object o) {
if (o instanceof EntityEntityWritable) {
EntityEntityWritable that = (EntityEntityWritable) o;
- return (aID == that.getAID()) && (bID == that.getBID());
+ return aID == that.getAID() && bID == that.getBID();
}
return false;
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ToItemPrefsMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ToItemPrefsMapper.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ToItemPrefsMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ToItemPrefsMapper.java Mon May 2 18:14:18 2011
@@ -19,20 +19,19 @@ package org.apache.mahout.cf.taste.hadoo
/**
* <h1>Input</h1>
- *
+ *
* <p>
* Intended for use with {@link org.apache.hadoop.mapreduce.lib.input.TextInputFormat};
* accepts line number / line pairs as
* {@link org.apache.hadoop.io.LongWritable}/{@link org.apache.hadoop.io.Text} pairs.
* </p>
- *
+ *
* <p>
- * Each line is assumed to be of the form <code>userID,itemID,preference</code>, or
- * <code>userID,itemID</code>.</p>
+ * Each line is assumed to be of the form {@code userID,itemID,preference}, or {@code userID,itemID}.
* </p>
- *
+ *
* <h1>Output</h1>
- *
+ *
* <p>
* Outputs the user ID as a {@link org.apache.mahout.math.VarLongWritable} mapped to the item ID and preference as a
* {@link EntityPrefWritable}.
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/IndexedVarIntWritable.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/IndexedVarIntWritable.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/IndexedVarIntWritable.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/IndexedVarIntWritable.java Mon May 2 18:14:18 2011
@@ -96,7 +96,7 @@ public class IndexedVarIntWritable imple
}
protected static int compare(int a, int b) {
- return (a == b) ? 0 : (a < b) ? -1 : 1;
+ return a == b ? 0 : a < b ? -1 : 1;
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJob.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJob.java Mon May 2 18:14:18 2011
@@ -58,7 +58,7 @@ import java.util.regex.Pattern;
/**
* <p>Runs a completely distributed recommender job as a series of mapreduces.</p>
*
- * <p>Preferences in the input file should look like <code>userID,itemID[,preferencevalue]</code></p>
+ * <p>Preferences in the input file should look like {@code userID,itemID[,preferencevalue]}</p>
*
* <p>
* Preference value is optional to accommodate applications that have no notion of a preference value (that is, the user
@@ -66,8 +66,8 @@ import java.util.regex.Pattern;
* </p>
*
* <p>
- * The preference value is assumed to be parseable as a <code>double</code>. The user IDs and item IDs are
- * parsed as <code>long</code>s.
+ * The preference value is assumed to be parseable as a {@code double}. The user IDs and item IDs are
+ * parsed as {@code long}s.
* </p>
*
* <p>Command line arguments specific to this class are:</p>
@@ -76,7 +76,7 @@ import java.util.regex.Pattern;
* <li>-Dmapred.input.dir=(path): Directory containing one or more text files with the preference data</li>
* <li>-Dmapred.output.dir=(path): output path where recommender output should go</li>
* <li>--similarityClassname (classname): Name of distributed similarity class to instantiate or a predefined similarity
- * from {@link org.apache.mahout.math.hadoop.similarity.SimilarityType}</li>
+ * from {@link SimilarityType}</li>
* <li>--usersFile (path): only compute recommendations for user IDs contained in this file (optional)</li>
* <li>--itemsFile (path): only include item IDs from this file in the recommendations (optional)</li>
* <li>--filterFile (path): file containing comma-separated userID,itemID pairs. Used to exclude the item from the
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderJob.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderJob.java Mon May 2 18:14:18 2011
@@ -39,11 +39,11 @@ import org.apache.mahout.math.VarLongWri
* {@link org.apache.mahout.cf.taste.recommender.Recommender} instances on Hadoop,
* where each instance is a normal non-distributed implementation.
* </p>
- *
+ *
* <p>This class configures and runs a {@link RecommenderReducer} using Hadoop.</p>
- *
+ *
* <p>Command line arguments specific to this class are:</p>
- *
+ *
* <ol>
* <li>-Dmapred.input.dir=(path): Location of a data model file containing preference data, suitable for use with
* {@link org.apache.mahout.cf.taste.impl.model.file.FileDataModel}</li>
@@ -60,38 +60,38 @@ import org.apache.mahout.math.VarLongWri
*
* <p>Note that because of how Hadoop parses arguments, all "-D" arguments must appear before all other
* arguments.</p>
- *
+ *
* <p>
* For example, to get started trying this out, set up Hadoop in a pseudo-distributed manner:
* http://hadoop.apache.org/common/docs/current/quickstart.html You can stop at the point where it instructs
* you to copy files into HDFS.
* </p>
- *
+ *
* <p>
- * Assume your preference data file is <code>input.csv</code>. You will also need to create a file containing
- * all user IDs to write recommendations for, as something like <code>users.txt</code>. Place this input on
+ * Assume your preference data file is {@code input.csv}. You will also need to create a file containing
+ * all user IDs to write recommendations for, as something like {@code users.txt}. Place this input on
* HDFS like so:
* </p>
- *
+ *
* {@code hadoop fs -put input.csv input/input.csv; hadoop fs -put users.txt input/users.txt * }
- *
+ *
* <p>
- * Build Mahout code with <code>mvn package</code> in the core/ directory. Locate
- * <code>target/mahout-core-X.Y-SNAPSHOT.job</code>. This is a JAR file; copy it out to a convenient location
- * and name it <code>recommender.jar</code>.
+ * Build Mahout code with {@code mvn package} in the core/ directory. Locate
+ * {@code target/mahout-core-X.Y-SNAPSHOT.job}. This is a JAR file; copy it out to a convenient location
+ * and name it {@code recommender.jar}.
* </p>
- *
+ *
* <p>
* Now add your own custom recommender code and dependencies. Your IDE produced compiled .class files
* somewhere and they need to be packaged up as well:
* </p>
- *
+ *
* {@code jar uf recommender.jar -C (your classes directory) . * }
- *
+ *
* <p>
* And launch:
* </p>
- *
+ *
* {@code hadoop jar recommender.jar \
* org.apache.mahout.cf.taste.hadoop.pseudo.RecommenderJob \
* -Dmapred.input.dir=input/users.csv \
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJob.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJob.java Mon May 2 18:14:18 2011
@@ -52,7 +52,7 @@ import org.apache.mahout.math.hadoop.sim
/**
* <p>Distributed precomputation of the item-item-similarities for Itembased Collaborative Filtering</p>
*
- * <p>Preferences in the input file should look like <code>userID,itemID[,preferencevalue]</code></p>
+ * <p>Preferences in the input file should look like {@code userID,itemID[,preferencevalue]}</p>
*
* <p>
* Preference value is optional to accommodate applications that have no notion of a preference value (that is, the user
@@ -60,17 +60,17 @@ import org.apache.mahout.math.hadoop.sim
* </p>
*
* <p>
- * The preference value is assumed to be parseable as a <code>double</code>. The user IDs and item IDs are
- * parsed as <code>long</code>s.
+ * The preference value is assumed to be parseable as a {@code double}. The user IDs and item IDs are
+ * parsed as {@code long}s.
* </p>
- *
+ *
* <p>Command line arguments specific to this class are:</p>
*
* <ol>
* <li>-Dmapred.input.dir=(path): Directory containing one or more text files with the preference data</li>
* <li>-Dmapred.output.dir=(path): output path where similarity data should be written</li>
* <li>--similarityClassname (classname): Name of distributed similarity class to instantiate or a predefined similarity
- * from {@link org.apache.mahout.math.hadoop.similarity.SimilarityType}</li>
+ * from {@link SimilarityType}</li>
* <li>--maxSimilaritiesPerItem (integer): Maximum number of similarities considered per item (100)</li>
* <li>--maxCooccurrencesPerItem (integer): Maximum number of cooccurrences considered per item (100)</li>
* <li>--booleanData (boolean): Treat input data as having no pref values (false)</li>
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java Mon May 2 18:14:18 2011
@@ -28,11 +28,11 @@ import java.util.Iterator;
* instead the caller supplies the instance with an implementation of {@link Retriever} which can load the
* value for a given key.
* </p>
- *
+ *
* <p>
- * The cache does not support <code>null</code> keys.
+ * The cache does not support {@code null} keys.
* </p>
- *
+ *
* <p>
* Thanks to Amila Jayasooriya for helping evaluate performance of the rewrite of this class, as part of a
* Google Summer of Code 2007 project.
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java Mon May 2 18:14:18 2011
@@ -96,7 +96,7 @@ public final class FastByIDMap<V> implem
int jump = 1 + theHashCode % (hashSize - 2);
int index = theHashCode % hashSize;
long currentKey = keys[index];
- while ((currentKey != NULL) && (key != currentKey)) {
+ while (currentKey != NULL && key != currentKey) {
if (index < jump) {
index += hashSize - jump;
} else {
@@ -117,7 +117,7 @@ public final class FastByIDMap<V> implem
int jump = 1 + theHashCode % (hashSize - 2);
int index = theHashCode % hashSize;
long currentKey = keys[index];
- while ((currentKey != NULL) && (currentKey != REMOVED) && (key != currentKey)) { // Different
+ while (currentKey != NULL && currentKey != REMOVED && key != currentKey) { // Different
// here
if (index < jump) {
index += hashSize - jump;
@@ -149,7 +149,7 @@ public final class FastByIDMap<V> implem
}
public boolean containsKey(long key) {
- return (key != NULL) && (key != REMOVED) && (keys[find(key)] != NULL);
+ return key != NULL && key != REMOVED && keys[find(key)] != NULL;
}
public boolean containsValue(Object value) {
@@ -157,7 +157,7 @@ public final class FastByIDMap<V> implem
return false;
}
for (V theValue : values) {
- if ((theValue != null) && value.equals(theValue)) {
+ if (theValue != null && value.equals(theValue)) {
return true;
}
}
@@ -188,7 +188,7 @@ public final class FastByIDMap<V> implem
return oldValue;
} else {
// If size is limited,
- if (countingAccesses && (numEntries >= maxSize)) {
+ if (countingAccesses && numEntries >= maxSize) {
// and we're too large, clear some old-ish entry
clearStaleEntry(index);
}
@@ -212,7 +212,7 @@ public final class FastByIDMap<V> implem
index--;
}
currentKey = keys[index];
- } while ((currentKey == NULL) || (currentKey == REMOVED));
+ } while (currentKey == NULL || currentKey == REMOVED);
if (recentlyAccessed.get(index)) {
recentlyAccessed.clear(index);
} else {
@@ -226,7 +226,7 @@ public final class FastByIDMap<V> implem
}
public V remove(long key) {
- if ((key == NULL) || (key == REMOVED)) {
+ if (key == NULL || key == REMOVED) {
return null;
}
int index = find(key);
@@ -286,7 +286,7 @@ public final class FastByIDMap<V> implem
int length = oldKeys.length;
for (int i = 0; i < length; i++) {
long key = oldKeys[i];
- if ((key != NULL) && (key != REMOVED)) {
+ if (key != NULL && key != REMOVED) {
put(key, oldValues[i]);
}
}
@@ -327,7 +327,7 @@ public final class FastByIDMap<V> implem
result.append('{');
for (int i = 0; i < keys.length; i++) {
long key = keys[i];
- if ((key != NULL) && (key != REMOVED)) {
+ if (key != NULL && key != REMOVED) {
result.append(key).append('=').append(values[i]).append(',');
}
}
@@ -426,7 +426,7 @@ public final class FastByIDMap<V> implem
private void goToNext() {
int length = values.length;
- while ((position < length) && (values[position] == null)) {
+ while (position < length && values[position] == null) {
position++;
}
}
@@ -546,7 +546,7 @@ public final class FastByIDMap<V> implem
private void goToNext() {
int length = values.length;
- while ((position < length) && (values[position] == null)) {
+ while (position < length && values[position] == null) {
position++;
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java Mon May 2 18:14:18 2011
@@ -70,7 +70,7 @@ public final class FastIDSet implements
int jump = 1 + theHashCode % (hashSize - 2);
int index = theHashCode % hashSize;
long currentKey = keys[index];
- while ((currentKey != NULL) && (key != currentKey)) { // note: true when currentKey == REMOVED
+ while (currentKey != NULL && key != currentKey) { // note: true when currentKey == REMOVED
if (index < jump) {
index += hashSize - jump;
} else {
@@ -91,8 +91,7 @@ public final class FastIDSet implements
int jump = 1 + theHashCode % (hashSize - 2);
int index = theHashCode % hashSize;
long currentKey = keys[index];
- while ((currentKey != NULL) && (currentKey != REMOVED) && (key != currentKey)) { // Different
- // here
+ while (currentKey != NULL && currentKey != REMOVED && key != currentKey) { // Different here
if (index < jump) {
index += hashSize - jump;
} else {
@@ -112,7 +111,7 @@ public final class FastIDSet implements
}
public boolean contains(long key) {
- return (key != NULL) && (key != REMOVED) && (keys[find(key)] != NULL);
+ return key != NULL && key != REMOVED && keys[find(key)] != NULL;
}
public boolean add(long key) {
@@ -150,7 +149,7 @@ public final class FastIDSet implements
public long[] toArray() {
long[] result = new long[numEntries];
for (int i = 0, position = 0; i < result.length; i++) {
- while ((keys[position] == NULL) || (keys[position] == REMOVED)) {
+ while (keys[position] == NULL || keys[position] == REMOVED) {
position++;
}
result[i] = keys[position++];
@@ -159,7 +158,7 @@ public final class FastIDSet implements
}
public boolean remove(long key) {
- if ((key == NULL) || (key == REMOVED)) {
+ if (key == NULL || key == REMOVED) {
return false;
}
int index = find(key);
@@ -185,7 +184,7 @@ public final class FastIDSet implements
public boolean addAll(FastIDSet c) {
boolean changed = false;
for (long k : c.keys) {
- if ((k != NULL) && (k != REMOVED) && add(k)) {
+ if (k != NULL && k != REMOVED && add(k)) {
changed = true;
}
}
@@ -205,7 +204,7 @@ public final class FastIDSet implements
public boolean removeAll(FastIDSet c) {
boolean changed = false;
for (long k : c.keys) {
- if ((k != NULL) && (k != REMOVED) && remove(k)) {
+ if (k != NULL && k != REMOVED && remove(k)) {
changed = true;
}
}
@@ -216,7 +215,7 @@ public final class FastIDSet implements
boolean changed = false;
for (int i = 0; i < keys.length; i++) {
long k = keys[i];
- if ((k != NULL) && (k != REMOVED) && !c.contains(k)) {
+ if (k != NULL && k != REMOVED && !c.contains(k)) {
keys[i] = REMOVED;
numEntries--;
changed = true;
@@ -251,7 +250,7 @@ public final class FastIDSet implements
int length = oldKeys.length;
for (int i = 0; i < length; i++) {
long key = oldKeys[i];
- if ((key != NULL) && (key != REMOVED)) {
+ if (key != NULL && key != REMOVED) {
add(key);
}
}
@@ -267,7 +266,7 @@ public final class FastIDSet implements
public int intersectionSize(FastIDSet other) {
int count = 0;
for (long key : other.keys) {
- if ((key != NULL) && (key != REMOVED) && (keys[find(key)] != NULL)) {
+ if (key != NULL && key != REMOVED && keys[find(key)] != NULL) {
count++;
}
}
@@ -351,7 +350,7 @@ public final class FastIDSet implements
StringBuilder result = new StringBuilder();
result.append('[');
for (long key : keys) {
- if ((key != NULL) && (key != REMOVED)) {
+ if (key != NULL && key != REMOVED) {
result.append(key).append(',');
}
}
@@ -391,8 +390,8 @@ public final class FastIDSet implements
private void goToNext() {
int length = keys.length;
- while ((position < length)
- && ((keys[position] == NULL) || (keys[position] == REMOVED))) {
+ while (position < length
+ && (keys[position] == NULL || keys[position] == REMOVED)) {
position++;
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java Mon May 2 18:14:18 2011
@@ -36,19 +36,19 @@ import com.google.common.base.Preconditi
* This is an optimized {@link Map} implementation, based on algorithms described in Knuth's "Art of Computer
* Programming", Vol. 3, p. 529.
* </p>
- *
+ *
* <p>
* It should be faster than {@link java.util.HashMap} in some cases, but not all. Its main feature is a
* "max size" and the ability to transparently, efficiently and semi-intelligently evict old entries when max
* size is exceeded.
* </p>
- *
+ *
* <p>
* This class is not a bit thread-safe.
* </p>
- *
+ *
* <p>
- * This implementation does not allow <code>null</code> as a key or value.
+ * This implementation does not allow {@code null} as a key or value.
* </p>
*/
public final class FastMap<K,V> implements Map<K,V>, Serializable, Cloneable {
@@ -113,7 +113,7 @@ public final class FastMap<K,V> implemen
int jump = 1 + theHashCode % (hashSize - 2);
int index = theHashCode % hashSize;
K currentKey = keys[index];
- while ((currentKey != null) && ((currentKey == REMOVED) || !key.equals(currentKey))) {
+ while (currentKey != null && (currentKey == REMOVED || !key.equals(currentKey))) {
if (index < jump) {
index += hashSize - jump;
} else {
@@ -148,7 +148,7 @@ public final class FastMap<K,V> implemen
@Override
public boolean containsKey(Object key) {
- return (key != null) && (keys[find(key)] != null);
+ return key != null && keys[find(key)] != null;
}
@Override
@@ -157,7 +157,7 @@ public final class FastMap<K,V> implemen
return false;
}
for (V theValue : values) {
- if ((theValue != null) && value.equals(theValue)) {
+ if (theValue != null && value.equals(theValue)) {
return true;
}
}
@@ -170,7 +170,7 @@ public final class FastMap<K,V> implemen
*/
@Override
public V put(K key, V value) {
- if ((key == null) || (value == null)) {
+ if (key == null || value == null) {
throw new NullPointerException();
}
// If less than half the slots are open, let's clear it up
@@ -187,7 +187,7 @@ public final class FastMap<K,V> implemen
int index = find(key);
if (keys[index] == null) {
// If size is limited,
- if (countingAccesses && (numEntries >= maxSize)) {
+ if (countingAccesses && numEntries >= maxSize) {
// and we're too large, clear some old-ish entry
clearStaleEntry(index);
}
@@ -213,7 +213,7 @@ public final class FastMap<K,V> implemen
index--;
}
currentKey = keys[index];
- } while ((currentKey == null) || (currentKey == REMOVED));
+ } while (currentKey == null || currentKey == REMOVED);
if (recentlyAccessed.get(index)) {
recentlyAccessed.clear(index);
} else {
@@ -302,7 +302,7 @@ public final class FastMap<K,V> implemen
int length = oldKeys.length;
for (int i = 0; i < length; i++) {
K key = oldKeys[i];
- if ((key != null) && (key != REMOVED)) {
+ if (key != null && key != REMOVED) {
put(key, oldValues[i]);
}
}
@@ -402,7 +402,7 @@ public final class FastMap<K,V> implemen
result.append('{');
for (int i = 0; i < keys.length; i++) {
K key = keys[i];
- if ((key != null) && (key != REMOVED)) {
+ if (key != null && key != REMOVED) {
result.append(key).append('=').append(values[i]).append(',');
}
}
@@ -512,7 +512,7 @@ public final class FastMap<K,V> implemen
private void goToNext() {
int length = values.length;
- while ((position < length) && (values[position] == null)) {
+ while (position < length && values[position] == null) {
position++;
}
}
@@ -600,7 +600,7 @@ public final class FastMap<K,V> implemen
private void goToNext() {
int length = values.length;
- while ((position < length) && (values[position] == null)) {
+ while (position < length && values[position] == null) {
position++;
}
}
@@ -688,7 +688,7 @@ public final class FastMap<K,V> implemen
private void goToNext() {
int length = values.length;
- while ((position < length) && (values[position] == null)) {
+ while (position < length && values[position] == null) {
position++;
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/LongPrimitiveIterator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/LongPrimitiveIterator.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/LongPrimitiveIterator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/LongPrimitiveIterator.java Mon May 2 18:14:18 2011
@@ -18,21 +18,21 @@
package org.apache.mahout.cf.taste.impl.common;
/**
- * Adds notion of iterating over <code>long</code> primitives in the style of an {@link java.util.Iterator} -- as
+ * Adds notion of iterating over {@code long} primitives in the style of an {@link java.util.Iterator} -- as
* opposed to iterating over {@link Long}. Implementations of this interface however also implement
* {@link java.util.Iterator} and {@link Iterable} over {@link Long} for convenience.
*/
public interface LongPrimitiveIterator extends SkippingIterator<Long> {
/**
- * @return next <code>long</code> in iteration
+ * @return next {@code long} in iteration
* @throws java.util.NoSuchElementException
* if no more elements exist in the iteration
*/
long nextLong();
/**
- * @return next <code>long</code> in iteration without advancing iteration
+ * @return next {@code long} in iteration without advancing iteration
*/
long peek();
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/RefreshHelper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/RefreshHelper.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/RefreshHelper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/RefreshHelper.java Mon May 2 18:14:18 2011
@@ -91,11 +91,11 @@ public final class RefreshHelper impleme
}
/**
- * Creates a new and empty {@link Collection} if the method parameter is <code>null</code>.
- *
+ * Creates a new and empty {@link Collection} if the method parameter is {@code null}.
+ *
* @param currentAlreadyRefreshed
* {@link Refreshable}s to refresh later on
- * @return an empty {@link Collection} if the method param was <code>null</code> or the unmodified method
+ * @return an empty {@link Collection} if the method param was {@code null} or the unmodified method
* param.
*/
public static Collection<Refreshable> buildRefreshed(Collection<Refreshable> currentAlreadyRefreshed) {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/EachRowIterator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/EachRowIterator.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/EachRowIterator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/EachRowIterator.java Mon May 2 18:14:18 2011
@@ -77,7 +77,7 @@ final class EachRowIterator extends Abst
} catch (SQLException sqle) {
// Can't use relative on MySQL Connector/J; try advancing manually
int i = 0;
- while ((i < n) && resultSet.next()) {
+ while (i < n && resultSet.next()) {
i++;
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java Mon May 2 18:14:18 2011
@@ -51,8 +51,8 @@ import com.google.common.base.Preconditi
/**
* <p>
- * For each user, these implementation determine the top <code>n</code> preferences, then evaluate the IR
- * statistics based on a {@link DataModel} that does not have these values. This number <code>n</code> is the
+ * For each user, these implementation determine the top {@code n} preferences, then evaluate the IR
+ * statistics based on a {@link DataModel} that does not have these values. This number {@code n} is the
* "at" value, as in "precision at 5". For example, this would mean precision evaluated by removing the top 5
* preferences for a user and then finding the percentage of those 5 items included in the top 5
* recommendations for that user.
@@ -124,7 +124,7 @@ public final class GenericRecommenderIRS
prefs.sortByValueReversed();
- for (int i = 0; (i < size) && (relevantItemIDs.size() < at); i++) {
+ for (int i = 0; i < size && relevantItemIDs.size() < at; i++) {
if (prefs.getValue(i) >= theRelevanceThreshold) {
relevantItemIDs.add(prefs.getItemID(i));
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/OrderBasedRecommenderEvaluator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/OrderBasedRecommenderEvaluator.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/OrderBasedRecommenderEvaluator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/OrderBasedRecommenderEvaluator.java Mon May 2 18:14:18 2011
@@ -39,11 +39,14 @@ public final class OrderBasedRecommender
private static final Logger log = LoggerFactory.getLogger(OrderBasedRecommenderEvaluator.class);
- public void evaluate(Recommender recommender1,
- Recommender recommender2,
- int samples,
- RunningAverage tracker,
- String tag) throws TasteException {
+ private OrderBasedRecommenderEvaluator() {
+ }
+
+ public static void evaluate(Recommender recommender1,
+ Recommender recommender2,
+ int samples,
+ RunningAverage tracker,
+ String tag) throws TasteException {
printHeader();
LongPrimitiveIterator users = recommender1.getDataModel().getUserIDs();
@@ -67,11 +70,11 @@ public final class OrderBasedRecommender
}
}
- public void evaluate(Recommender recommender,
- DataModel model,
- int samples,
- RunningAverage tracker,
- String tag) throws TasteException {
+ public static void evaluate(Recommender recommender,
+ DataModel model,
+ int samples,
+ RunningAverage tracker,
+ String tag) throws TasteException {
printHeader();
LongPrimitiveIterator users = recommender.getDataModel().getUserIDs();
while (users.hasNext()) {
@@ -95,11 +98,11 @@ public final class OrderBasedRecommender
}
}
- public void evaluate(DataModel model1,
- DataModel model2,
- int samples,
- RunningAverage tracker,
- String tag) throws TasteException {
+ public static void evaluate(DataModel model1,
+ DataModel model2,
+ int samples,
+ RunningAverage tracker,
+ String tag) throws TasteException {
printHeader();
LongPrimitiveIterator users = model1.getUserIDs();
while (users.hasNext()) {
@@ -213,12 +216,12 @@ public final class OrderBasedRecommender
* The one contract is that all measures are 0 for an exact match and an
* increasing positive number as differences increase.
*/
- private double scoreCommonSubset(String tag,
- long userID,
- int samples,
- int subset,
- Long[] itemsL,
- Long[] itemsR) {
+ private static double scoreCommonSubset(String tag,
+ long userID,
+ int samples,
+ int subset,
+ Long[] itemsL,
+ Long[] itemsR) {
int[] vectorZ = new int[subset];
int[] vectorZabs = new int[subset];
@@ -264,7 +267,7 @@ public final class OrderBasedRecommender
*
* The Standard Wilcoxon is not used because it requires a lookup table.
*/
- double normalWilcoxon(int[] vectorZ, int[] vectorZabs) {
+ static double normalWilcoxon(int[] vectorZ, int[] vectorZabs) {
int nitems = vectorZ.length;
double[] ranks = new double[nitems];
@@ -329,14 +332,14 @@ public final class OrderBasedRecommender
int score = vectorZabs[i];
for (int j = 0; j < nitems; j++) {
if (score == sorted[j]) {
- rank += (j + 1) - zeros;
+ rank += j + 1 - zeros;
count++;
} else if (score < sorted[j]) {
break;
}
}
if (vectorZ[i] != 0) {
- ranks[i] = (rank / count) * ((vectorZ[i] < 0) ? -1 : 1); // better be at least 1
+ ranks[i] = (rank / count) * (vectorZ[i] < 0 ? -1 : 1); // better be at least 1
ranksAbs[i] = Math.abs(ranks[i]);
}
}
@@ -377,7 +380,7 @@ public final class OrderBasedRecommender
* Do bubble sort and return number of swaps needed to match preference lists.
* Sort itemsR using itemsL as the reference order.
*/
- long sort(Long[] itemsL, Long[] itemsR) {
+ static long sort(Long[] itemsL, Long[] itemsR) {
int length = itemsL.length;
if (length < 2) {
return 0;
@@ -409,11 +412,11 @@ public final class OrderBasedRecommender
// do not swap anything already in place
int jump = 1;
if (reference[j] == sortable[j]) {
- while ((j + jump < length) && reference[j + jump] == sortable[j + jump]) {
+ while (j + jump < length && reference[j + jump] == sortable[j + jump]) {
jump++;
}
}
- if ((j + jump < length) && !(reference[j] == sortable[j] && reference[j + jump] == sortable[j + jump])) {
+ if (j + jump < length && !(reference[j] == sortable[j] && reference[j + jump] == sortable[j + jump])) {
long tmp = sortable[j];
sortable[j] = sortable[j + 1];
sortable[j + 1] = tmp;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/MySQLJDBCIDMigrator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/MySQLJDBCIDMigrator.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/MySQLJDBCIDMigrator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/MySQLJDBCIDMigrator.java Mon May 2 18:14:18 2011
@@ -23,18 +23,18 @@ import javax.sql.DataSource;
* <p>
* An implementation for MySQL. The following statement would create a table suitable for use with this class:
* </p>
- *
+ *
* <p>
- *
+ *
* <pre>
* CREATE TABLE taste_id_migration (
* long_id BIGINT NOT NULL PRIMARY KEY,
* string_id VARCHAR(255) NOT NULL UNIQUE
* )
* </pre>
- *
+ *
* </p>
- *
+ *
* <p>
* Separately, note that in a MySQL database, the following function calls will convert a string value into a
* numeric value in the same way that the standard implementations in this package do. This may be useful in
@@ -43,9 +43,9 @@ import javax.sql.DataSource;
* column values to appropriate numeric values -- though this should be viewed as a temporary arrangement
* since it will impact performance:
* </p>
- *
+ *
* <p>
- * <code>cast(conv(substring(md5([column name]),1,16),16,10) as signed)</code>
+ * {@code cast(conv(substring(md5([column name]), 1, 16),16,10) as signed)}
* </p>
*/
public final class MySQLJDBCIDMigrator extends AbstractJDBCIDMigrator {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/PlusAnonymousUserDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/PlusAnonymousUserDataModel.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/PlusAnonymousUserDataModel.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/PlusAnonymousUserDataModel.java Mon May 2 18:14:18 2011
@@ -36,33 +36,33 @@ import com.google.common.base.Preconditi
* doesn't really exist yet in your actual {@link DataModel}. For example maybe you wish to recommend DVDs to
* a user who has browsed a few titles on your DVD store site, but, the user is not yet registered.
* </p>
- *
+ *
* <p>
* This enables you to temporarily add a temporary user to an existing {@link DataModel} in a way that
* recommenders can then produce recommendations anyway. To do so, wrap your real implementation in this
* class:
* </p>
- *
+ *
* <p>
- *
+ *
* <pre>
* DataModel realModel = ...;
* DataModel plusModel = new PlusAnonymousUserDataModel(realModel);
* ...
* ItemSimilarity similarity = new LogLikelihoodSimilarity(realModel); // not plusModel
* </pre>
- *
+ *
* </p>
- *
+ *
* <p>
- * But, you may continue to use <code>realModel</code> as input to other components. To recommend, first construct and
+ * But, you may continue to use {@code realModel} as input to other components. To recommend, first construct and
* set the temporary user information on the model and then simply call the recommender. The
- * <code>synchronized</code> block exists to remind you that this is of course not thread-safe. Only one set
+ * {@code synchronized} block exists to remind you that this is of course not thread-safe. Only one set
* of temp data can be inserted into the model and used at one time.
* </p>
- *
+ *
* <p>
- *
+ *
* <pre>
* Recommender recommender = ...;
* ...
@@ -73,7 +73,7 @@ import com.google.common.base.Preconditi
* plusModel.setTempPrefs(null);
* }
* </pre>
- *
+ *
* </p>
*/
public final class PlusAnonymousUserDataModel implements DataModel {
@@ -115,7 +115,7 @@ public final class PlusAnonymousUserData
public PreferenceArray getPreferencesFromUser(long userID) throws TasteException {
if (userID == TEMP_USER_ID) {
if (tempPrefs == null) {
- throw new NoSuchUserException(userID);
+ throw new NoSuchUserException(TEMP_USER_ID);
}
return tempPrefs;
}
@@ -126,7 +126,7 @@ public final class PlusAnonymousUserData
public FastIDSet getItemIDsFromUser(long userID) throws TasteException {
if (userID == TEMP_USER_ID) {
if (tempPrefs == null) {
- throw new NoSuchUserException(userID);
+ throw new NoSuchUserException(TEMP_USER_ID);
}
return prefItemIDs;
}
@@ -177,7 +177,7 @@ public final class PlusAnonymousUserData
public Float getPreferenceValue(long userID, long itemID) throws TasteException {
if (userID == TEMP_USER_ID) {
if (tempPrefs == null) {
- throw new NoSuchUserException(userID);
+ throw new NoSuchUserException(TEMP_USER_ID);
}
for (int i = 0; i < tempPrefs.length(); i++) {
if (tempPrefs.getItemID(i) == itemID) {
@@ -193,7 +193,7 @@ public final class PlusAnonymousUserData
public Long getPreferenceTime(long userID, long itemID) throws TasteException {
if (userID == TEMP_USER_ID) {
if (tempPrefs == null) {
- throw new NoSuchUserException(userID);
+ throw new NoSuchUserException(TEMP_USER_ID);
}
return null;
}
@@ -236,7 +236,7 @@ public final class PlusAnonymousUserData
public void setPreference(long userID, long itemID, float value) throws TasteException {
if (userID == TEMP_USER_ID) {
if (tempPrefs == null) {
- throw new NoSuchUserException(userID);
+ throw new NoSuchUserException(TEMP_USER_ID);
}
throw new UnsupportedOperationException();
}
@@ -247,7 +247,7 @@ public final class PlusAnonymousUserData
public void removePreference(long userID, long itemID) throws TasteException {
if (userID == TEMP_USER_ID) {
if (tempPrefs == null) {
- throw new NoSuchUserException(userID);
+ throw new NoSuchUserException(TEMP_USER_ID);
}
throw new UnsupportedOperationException();
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java Mon May 2 18:14:18 2011
@@ -54,7 +54,7 @@ import com.google.common.base.Preconditi
* optional timestamp. Commas or tabs delimit fields:
* </p>
*
- * <p><code>userID,itemID[,preference[,timestamp]]</code></p>
+ * <p>{@code userID,itemID[,preference[,timestamp]]}</p>
*
* <p>
* Preference value is optional to accommodate applications that have no notion of a
@@ -63,18 +63,18 @@ import com.google.common.base.Preconditi
* </p>
*
* <p>
- * The preference value is assumed to be parseable as a <code>double</code>. The user IDs and item IDs are
- * read parsed as <code>long</code>s. The timestamp, if present, is assumed to be parseable as a
- * <code>long</code>, though this can be overridden via {@link #readTimestampFromString(String)}.
+ * The preference value is assumed to be parseable as a {@code double}. The user IDs and item IDs are
+ * read parsed as {@code long}s. The timestamp, if present, is assumed to be parseable as a
+ * {@code long}, though this can be overridden via {@link #readTimestampFromString(String)}.
* The preference value may be empty, to indicate "no preference value", but cannot be empty. That is,
* this is legal:
* </p>
*
- * <p><code>123,456,,129050099059</code></p>
+ * <p>{@code 123,456,,129050099059}</p>
*
* <p>But this isn't:</p>
*
- * <p><code>123,456,129050099059</code></p>
+ * <p>{@code 123,456,129050099059}</p>
*
* <p>
* It is also acceptable for the lines to contain additional fields. Fields beyond the third will be ignored.
@@ -170,7 +170,7 @@ public class FileDataModel extends Abstr
FileLineIterator iterator = new FileLineIterator(dataFile, false);
String firstLine = iterator.peek();
- while ((firstLine.length() == 0) || (firstLine.charAt(0) == COMMENT_CHAR)) {
+ while (firstLine.length() == 0 || firstLine.charAt(0) == COMMENT_CHAR) {
iterator.next();
firstLine = iterator.peek();
}
@@ -214,7 +214,7 @@ public class FileDataModel extends Abstr
long newLastModified = dataFile.lastModified();
long newLastUpdateFileModified = readLastUpdateFileModified();
- boolean loadFreshData = (delegate == null) || (newLastModified > lastModified + minReloadIntervalMS);
+ boolean loadFreshData = delegate == null || newLastModified > lastModified + minReloadIntervalMS;
long oldLastUpdateFileModifieid = lastUpdateFileModified;
lastModified = newLastModified;
@@ -691,8 +691,8 @@ public class FileDataModel extends Abstr
@Override
public void refresh(Collection<Refreshable> alreadyRefreshed) {
- if ((dataFile.lastModified() > lastModified + minReloadIntervalMS)
- || (readLastUpdateFileModified() > lastUpdateFileModified + minReloadIntervalMS)) {
+ if (dataFile.lastModified() > lastModified + minReloadIntervalMS
+ || readLastUpdateFileModified() > lastUpdateFileModified + minReloadIntervalMS) {
log.debug("File has changed; reloading...");
reload();
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java Mon May 2 18:14:18 2011
@@ -327,7 +327,7 @@ public abstract class AbstractJDBCDataMo
List<Preference> currentPrefs = new ArrayList<Preference>();
while (rs.next()) {
long nextUserID = getLongColumn(rs, 1);
- if ((currentUserID != null) && !currentUserID.equals(nextUserID) && !currentPrefs.isEmpty()) {
+ if (currentUserID != null && !currentUserID.equals(nextUserID) && !currentPrefs.isEmpty()) {
result.put(currentUserID, new GenericUserPreferenceArray(currentPrefs));
currentPrefs.clear();
}
@@ -373,7 +373,7 @@ public abstract class AbstractJDBCDataMo
FastIDSet currentItemIDs = new FastIDSet(2);
while (rs.next()) {
long nextUserID = getLongColumn(rs, 1);
- if (currentUserIDSet && (currentUserID != nextUserID) && !currentItemIDs.isEmpty()) {
+ if (currentUserIDSet && currentUserID != nextUserID && !currentItemIDs.isEmpty()) {
result.put(currentUserID, currentItemIDs);
currentItemIDs = new FastIDSet(2);
}
@@ -747,7 +747,7 @@ public abstract class AbstractJDBCDataMo
* An {@link java.util.Iterator} which returns items from a {@link ResultSet}. This is a useful way to
* iterate over all user data since it does not require all data to be read into memory at once. It does
* however require that the DB connection be held open. Note that this class will only release database
- * resources after {@link #hasNext()} has been called and has returned <code>false</code>; callers should
+ * resources after {@link #hasNext()} has been called and has returned {@code false}; callers should
* make sure to "drain" the entire set of data to avoid tying up database resources.
* </p>
*/
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/GenericJDBCDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/GenericJDBCDataModel.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/GenericJDBCDataModel.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/GenericJDBCDataModel.java Mon May 2 18:14:18 2011
@@ -59,10 +59,10 @@ public final class GenericJDBCDataModel
/**
* <p>
- * Specifies all SQL queries in a {@link Properties} object. See the <code>*_KEY</code> constants in this
+ * Specifies all SQL queries in a {@link Properties} object. See the {@code *_KEY} constants in this
* class (e.g. {@link #GET_USER_SQL_KEY}) for a list of all keys which must map to a value in this object.
* </p>
- *
+ *
* @param props
* {@link Properties} object containing values
* @throws TasteException
@@ -89,11 +89,11 @@ public final class GenericJDBCDataModel
/**
* <p>
- * See {@link #GenericJDBCDataModel(java.util.Properties)}. This constructor reads values from a file
+ * See {@link #GenericJDBCDataModel(Properties)}. This constructor reads values from a file
* instead, as if with {@link Properties#load(InputStream)}. So, the file should be in standard Java
- * properties file format -- containing <code>key=value</code> pairs, one per line.
+ * properties file format -- containing {@code key=value} pairs, one per line.
* </p>
- *
+ *
* @param propertiesFile
* properties file
* @throws TasteException
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/MySQLJDBCDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/MySQLJDBCDataModel.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/MySQLJDBCDataModel.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/MySQLJDBCDataModel.java Mon May 2 18:14:18 2011
@@ -29,7 +29,7 @@ import org.apache.mahout.cf.taste.impl.c
* assumes that there is a {@link DataSource} available under the JNDI name
* "jdbc/taste", which gives access to a database with a "taste_preferences" table with the following schema:
* </p>
- *
+ *
* <table>
* <tr>
* <th>user_id</th>
@@ -57,15 +57,15 @@ import org.apache.mahout.cf.taste.impl.c
* <td>0.3</td>
* </tr>
* </table>
- *
+ *
* <p>
- * <code>preference</code> must have a type compatible with the Java <code>float</code> type.
- * <code>user_id</code> and <code>item_id</code> should be compatible with long type (BIGINT). For example,
+ * {@code preference} must have a type compatible with the Java {@code float} type.
+ * {@code user_id} and {@code item_id} should be compatible with long type (BIGINT). For example,
* the following command sets up a suitable table in MySQL, complete with primary key and indexes:
* </p>
- *
+ *
* <p>
- *
+ *
* <pre>
* CREATE TABLE taste_preferences (
* user_id BIGINT NOT NULL,
@@ -76,30 +76,30 @@ import org.apache.mahout.cf.taste.impl.c
* INDEX (item_id)
* )
* </pre>
- *
+ *
* </p>
*
- * <p>The table may optionally have a <code>timestamp</code> column whose type is compatible with Java
- * <code>long</code>.</p>
- *
+ * <p>The table may optionally have a {@code timestamp} column whose type is compatible with Java
+ * {@code long}.</p>
+ *
* <h3>Performance Notes</h3>
- *
+ *
* <p>
* See the notes in {@link AbstractJDBCDataModel} regarding using connection pooling. It's pretty vital to
* performance.
* </p>
- *
+ *
* <p>
* Some experimentation suggests that MySQL's InnoDB engine is faster than MyISAM for these kinds of
* applications. While MyISAM is the default and, I believe, generally considered the lighter-weight and
* faster of the two engines, my guess is the row-level locking of InnoDB helps here. Your mileage may vary.
* </p>
- *
+ *
* <p>
* Here are some key settings that can be tuned for MySQL, and suggested size for a data set of around 1
* million elements:
* </p>
- *
+ *
* <ul>
* <li>innodb_buffer_pool_size=64M</li>
* <li>myisam_sort_buffer_size=64M</li>
@@ -108,11 +108,11 @@ import org.apache.mahout.cf.taste.impl.c
* <li>query_cache_type=1</li>
* <li>query_cache_size=64M</li>
* </ul>
- *
+ *
* <p>
* Also consider setting some parameters on the MySQL Connector/J driver:
* </p>
- *
+ *
* <pre>
* cachePreparedStatements = true
* cachePrepStmts = true
@@ -120,7 +120,7 @@ import org.apache.mahout.cf.taste.impl.c
* alwaysSendSetIsolation = false
* elideSetAutoCommits = true
* </pre>
- *
+ *
* <p>
* Thanks to Amila Jayasooriya for contributing MySQL notes above as part of Google Summer of Code 2007.
* </p>
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java Mon May 2 18:14:18 2011
@@ -40,7 +40,7 @@ public final class NearestNUserNeighborh
/**
* @param n neighborhood size; capped at the number of users in the data model
* @throws IllegalArgumentException
- * if n < 1, or userSimilarity or dataModel are <code>null</code>
+ * if {@code n < 1}, or userSimilarity or dataModel are {@code null}
*/
public NearestNUserNeighborhood(int n, UserSimilarity userSimilarity, DataModel dataModel) throws TasteException {
this(n, Double.NEGATIVE_INFINITY, userSimilarity, dataModel, 1.0);
@@ -50,7 +50,7 @@ public final class NearestNUserNeighborh
* @param n neighborhood size; capped at the number of users in the data model
* @param minSimilarity minimal similarity required for neighbors
* @throws IllegalArgumentException
- * if n < 1, or userSimilarity or dataModel are <code>null</code>
+ * if {@code n < 1}, or userSimilarity or dataModel are {@code null}
*/
public NearestNUserNeighborhood(int n,
double minSimilarity,
@@ -65,8 +65,8 @@ public final class NearestNUserNeighborh
* @param samplingRate percentage of users to consider when building neighborhood -- decrease to trade quality for
* performance
* @throws IllegalArgumentException
- * if n < 1 or samplingRate is NaN or not in (0,1], or userSimilarity or dataModel are
- * <code>null</code>
+ * if {@code n < 1} or samplingRate is NaN or not in (0,1], or userSimilarity or dataModel are
+ * {@code null}
*/
public NearestNUserNeighborhood(int n,
double minSimilarity,
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java Mon May 2 18:14:18 2011
@@ -45,7 +45,7 @@ public final class ThresholdUserNeighbor
* data model
* @throws IllegalArgumentException
* if threshold is {@link Double#NaN}, or if samplingRate is not positive and less than or equal
- * to 1.0, or if userSimilarity or dataModel are <code>null</code>
+ * to 1.0, or if userSimilarity or dataModel are {@code null}
*/
public ThresholdUserNeighborhood(double threshold, UserSimilarity userSimilarity, DataModel dataModel) {
this(threshold, userSimilarity, dataModel, 1.0);
@@ -63,7 +63,7 @@ public final class ThresholdUserNeighbor
* performance
* @throws IllegalArgumentException
* if threshold or samplingRate is {@link Double#NaN}, or if samplingRate is not positive and less
- * than or equal to 1.0, or if userSimilarity or dataModel are <code>null</code>
+ * than or equal to 1.0, or if userSimilarity or dataModel are {@code null}
*/
public ThresholdUserNeighborhood(double threshold,
UserSimilarity userSimilarity,
@@ -87,7 +87,7 @@ public final class ThresholdUserNeighbor
long otherUserID = usersIterable.next();
if (userID != otherUserID) {
double theSimilarity = userSimilarityImpl.userSimilarity(userID, otherUserID);
- if (!Double.isNaN(theSimilarity) && (theSimilarity >= threshold)) {
+ if (!Double.isNaN(theSimilarity) && theSimilarity >= threshold) {
neighborhood.add(otherUserID);
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java Mon May 2 18:14:18 2011
@@ -69,9 +69,9 @@ public abstract class AbstractRecommende
* <p>
* Default implementation which just calls {@link DataModel#setPreference(long, long, float)}.
* </p>
- *
+ *
* @throws IllegalArgumentException
- * if userID or itemID is <code>null</code>, or if value is {@link Double#NaN}
+ * if userID or itemID is {@code null}, or if value is {@link Double#NaN}
*/
@Override
public void setPreference(long userID, long itemID, float value) throws TasteException {
@@ -84,9 +84,9 @@ public abstract class AbstractRecommende
* <p>
* Default implementation which just calls {@link DataModel#removePreference(long, long)} (Object, Object)}.
* </p>
- *
+ *
* @throws IllegalArgumentException
- * if userID or itemID is <code>null</code>
+ * if userID or itemID is {@code null}
*/
@Override
public void removePreference(long userID, long itemID) throws TasteException {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommender.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommender.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommender.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommender.java Mon May 2 18:14:18 2011
@@ -110,7 +110,7 @@ public final class CachingRecommender im
setCurrentRescorer(rescorer);
Recommendations recommendations = recommendationCache.get(userID);
- if ((recommendations.getItems().size() < howMany) && !recommendations.isNoMoreRecommendableItems()) {
+ if (recommendations.getItems().size() < howMany && !recommendations.isNoMoreRecommendableItems()) {
clear(userID);
recommendations = recommendationCache.get(userID);
if (recommendations.getItems().size() < howMany) {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/FarthestNeighborClusterSimilarity.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/FarthestNeighborClusterSimilarity.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/FarthestNeighborClusterSimilarity.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/FarthestNeighborClusterSimilarity.java Mon May 2 18:14:18 2011
@@ -54,7 +54,7 @@ public final class FarthestNeighborClust
/**
* <p>
* Constructs a based on the given {@link UserSimilarity}. By
- * setting <code>samplingRate</code> to a value less than 1.0, this implementation will only examine that
+ * setting {@code samplingRate} to a value less than 1.0, this implementation will only examine that
* fraction of all user-user similarities between two clusters, increasing performance at the expense of
* accuracy.
* </p>
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefUserBasedRecommender.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefUserBasedRecommender.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefUserBasedRecommender.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefUserBasedRecommender.java Mon May 2 18:14:18 2011
@@ -52,7 +52,7 @@ public final class GenericBooleanPrefUse
boolean foundAPref = false;
for (long userID : theNeighborhood) {
// See GenericItemBasedRecommender.doEstimatePreference() too
- if ((userID != theUserID) && (dataModel.getPreferenceValue(userID, itemID) != null)) {
+ if (userID != theUserID && dataModel.getPreferenceValue(userID, itemID) != null) {
foundAPref = true;
totalSimilarity += similarity.userSimilarity(theUserID, userID);
}