You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2008/12/24 00:32:36 UTC
svn commit: r729175 [1/5] - in /lucene/mahout/trunk:
core/src/main/java/org/apache/mahout/cf/taste/common/
core/src/main/java/org/apache/mahout/cf/taste/hadoop/
core/src/main/java/org/apache/mahout/cf/taste/impl/common/
core/src/main/java/org/apache/ma...
Author: srowen
Date: Tue Dec 23 15:32:31 2008
New Revision: 729175
URL: http://svn.apache.org/viewvc?rev=729175&view=rev
Log:
Big ol' patch that mostly adds @Override for interface methods, for Java 6, but also tacks on a number of small performance tweaks and other small refactorings
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/common/TasteException.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ByItemIDComparator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ItemItemWritable.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ItemPrefWritable.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommendedItemsWritable.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/ArrayIterator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverage.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverageAndStdDev.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/EmptyIterable.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/EmptyIterator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FileLineIterable.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FileLineIterator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverage.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverageAndStdDev.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/IteratorIterable.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Pair.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/RefreshHelper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/WeightedRunningAverage.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/eval/IRStatisticsImpl.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanPreference.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByItemPreferenceComparator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByUserPreferenceComparator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByValuePreferenceComparator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItem.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreference.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUser.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/model/jdbc/ConnectionPoolDataSource.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/AbstractUserNeighborhood.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/CachingUserNeighborhood.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ByRescoreComparator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/FarthestNeighborClusterSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericRecommendedItem.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemAverageRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemUserAverageRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NearestNeighborClusterSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/SimilarUser.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TopItems.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/InvertedRunningAverage.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/InvertedRunningAverageAndStdDev.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorage.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/SlopeOneRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/AbstractJDBCDiffStorage.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AveragingPreferenceInferrer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingItemSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingUserSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/EuclideanDistanceSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/PearsonCorrelationSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/TanimotoCoefficientSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/CaseAmplification.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequency.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/ZScore.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/web/RecommenderServlet.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/ClassifierResult.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.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/ResultAnalyzer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesClassifier.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesThetaNormalizerDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesThetaNormalizerMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesThetaNormalizerReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesFeatureDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesFeatureMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesFeatureOutputFormat.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesFeatureReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesTfIdfDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesTfIdfMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesTfIdfOutputFormat.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesTfIdfReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesWeightSummerDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesWeightSummerMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesWeightSummerOutputFormat.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesWeightSummerReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/io/SequenceFileModelReader.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesClassifier.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesNormalizedWeightDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesNormalizedWeightMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesNormalizedWeightReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaNormalizerDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaNormalizerMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaNormalizerReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyCombiner.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterMapper.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/FuzzyKMeansCombiner.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/FuzzyKMeansJob.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/fuzzykmeans/FuzzyKMeansReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansUtil.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/SoftCluster.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/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/KMeansReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyCombiner.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Classifier.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Model.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/EvalMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/OutputUtils.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/STFitnessEvaluator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractMatrix.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractVector.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/BinaryFunction.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseMatrix.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseVector.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/Matrix.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/MatrixView.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/NegateFunction.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/PlusFunction.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseMatrix.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/TimesFunction.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/UnaryFunction.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/Vector.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/VectorView.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/DistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/StringUtils.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TanimotoDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/AbstractParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/ClassParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/CompositeParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/DoubleParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/FileParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/IntegerParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parametered.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/PathParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/StringParameter.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/ejb/RecommenderEJBBean.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommenderBuilder.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/PrepareTwentyNewsgroups.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/TrainClassifier.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreator.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/classifier/bayes/WikipediaDatasetCreatorOutputFormat.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorReducer.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaXmlSplitter.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/XmlInputFormat.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/OutputDriver.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/OutputMapper.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/OutputDriver.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/OutputMapper.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputDriver.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputDriver.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputMapper.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDCrossover.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDFitness.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDMutation.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDRule.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/DataSet.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/FileInfoParser.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapper.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDReducer.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtils.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/Descriptors.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombiner.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapper.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/BruteForceTravellingSalesman.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EuropeanDistanceLookup.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EvolutionaryTravellingSalesman.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ExecutionPanel.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ItineraryPanel.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/RouteEvaluator.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/StrategyPanel.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/common/TasteException.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/common/TasteException.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/common/TasteException.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/common/TasteException.java Tue Dec 23 15:32:31 2008
@@ -23,7 +23,6 @@
public final class TasteException extends Exception {
public TasteException() {
- super();
}
public TasteException(String message) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ByItemIDComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ByItemIDComparator.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ByItemIDComparator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ByItemIDComparator.java Tue Dec 23 15:32:31 2008
@@ -28,6 +28,7 @@
return instance;
}
+ @Override
public int compare(ItemPrefWritable a, ItemPrefWritable b) {
return a.getItemID().compareTo(b.getItemID());
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ItemItemWritable.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ItemItemWritable.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ItemItemWritable.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ItemItemWritable.java Tue Dec 23 15:32:31 2008
@@ -26,7 +26,7 @@
/**
* A {@link WritableComparable} encapsulating two {@link org.apache.mahout.cf.taste.model.Item}s.
*/
-public final class ItemItemWritable implements WritableComparable {
+public final class ItemItemWritable implements WritableComparable<ItemItemWritable> {
private String itemAID;
private String itemBID;
@@ -48,11 +48,13 @@
return itemBID;
}
+ @Override
public void write(DataOutput out) throws IOException {
out.writeUTF(getItemAID());
out.writeUTF(getItemBID());
}
+ @Override
public void readFields(DataInput in) throws IOException {
itemAID = in.readUTF();
itemBID = in.readUTF();
@@ -64,8 +66,8 @@
return writable;
}
- public int compareTo(Object o) {
- ItemItemWritable that = (ItemItemWritable) o;
+ @Override
+ public int compareTo(ItemItemWritable that) {
if (this == that) {
return 0;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ItemPrefWritable.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ItemPrefWritable.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ItemPrefWritable.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/ItemPrefWritable.java Tue Dec 23 15:32:31 2008
@@ -52,11 +52,13 @@
return prefValue;
}
+ @Override
public void write(DataOutput out) throws IOException {
out.writeUTF(itemID);
out.writeDouble(prefValue);
}
+ @Override
public void readFields(DataInput in) throws IOException {
itemID = in.readUTF();
prefValue = in.readDouble();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommendedItemsWritable.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommendedItemsWritable.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommendedItemsWritable.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommendedItemsWritable.java Tue Dec 23 15:32:31 2008
@@ -51,6 +51,7 @@
return recommended;
}
+ @Override
public void write(DataOutput out) throws IOException {
for (RecommendedItem item : recommended) {
out.writeUTF(item.getItem().getID().toString());
@@ -59,6 +60,7 @@
}
+ @Override
public void readFields(DataInput in) throws IOException {
recommended = new ArrayList<RecommendedItem>();
try {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderJob.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderJob.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderJob.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderJob.java Tue Dec 23 15:32:31 2008
@@ -55,6 +55,8 @@
* <p>TODO I am not a bit sure this works yet in a real distributed environment.</p>
*/
public final class RecommenderJob {
+ private RecommenderJob() {
+ }
public static void main(String[] args) throws IOException {
String recommendClassName = args[0];
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderMapper.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderMapper.java Tue Dec 23 15:32:31 2008
@@ -58,6 +58,7 @@
private Recommender recommender;
private int recommendationsPerUser;
+ @Override
public void map(LongWritable key,
Text value,
OutputCollector<Text, RecommendedItemsWritable> output,
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesJob.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesJob.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesJob.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesJob.java Tue Dec 23 15:32:31 2008
@@ -33,6 +33,8 @@
/**
*/
public final class SlopeOneDiffsToAveragesJob {
+ private SlopeOneDiffsToAveragesJob() {
+ }
public static void main(String[] args) throws IOException {
String prefsFile = args[0];
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesReducer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesReducer.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesReducer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesReducer.java Tue Dec 23 15:32:31 2008
@@ -30,6 +30,7 @@
extends MapReduceBase
implements Reducer<ItemItemWritable, DoubleWritable, ItemItemWritable, DoubleWritable> {
+ @Override
public void reduce(ItemItemWritable key,
Iterator<DoubleWritable> values,
OutputCollector<ItemItemWritable, DoubleWritable> output,
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsJob.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsJob.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsJob.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsJob.java Tue Dec 23 15:32:31 2008
@@ -34,6 +34,8 @@
/**
*/
public final class SlopeOnePrefsToDiffsJob {
+ private SlopeOnePrefsToDiffsJob() {
+ }
public static void main(String[] args) throws IOException {
String prefsFile = args[0];
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsMapper.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsMapper.java Tue Dec 23 15:32:31 2008
@@ -32,6 +32,7 @@
extends MapReduceBase
implements Mapper<LongWritable, Text, Text, ItemPrefWritable> {
+ @Override
public void map(LongWritable key,
Text value,
OutputCollector<Text, ItemPrefWritable> output,
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsReducer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsReducer.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsReducer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsReducer.java Tue Dec 23 15:32:31 2008
@@ -34,6 +34,7 @@
extends MapReduceBase
implements Reducer<Text, ItemPrefWritable, ItemItemWritable, DoubleWritable> {
+ @Override
public void reduce(Text key,
Iterator<ItemPrefWritable> values,
OutputCollector<ItemItemWritable, DoubleWritable> output,
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/ArrayIterator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/ArrayIterator.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/ArrayIterator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/ArrayIterator.java Tue Dec 23 15:32:31 2008
@@ -44,10 +44,12 @@
this.max = array.length;
}
+ @Override
public boolean hasNext() {
return position < max;
}
+ @Override
public T next() {
if (position >= array.length) {
throw new NoSuchElementException();
@@ -58,10 +60,12 @@
/**
* @throws UnsupportedOperationException
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
+ @Override
public Iterator<T> iterator() {
return this;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java Tue Dec 23 15:32:31 2008
@@ -67,6 +67,7 @@
* @return value for that key
* @throws TasteException if an exception occurs while retrieving a new cached value
*/
+ @Override
public V get(K key) throws TasteException {
V value;
synchronized (cache) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverage.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverage.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverage.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverage.java Tue Dec 23 15:32:31 2008
@@ -34,6 +34,7 @@
average = Float.NaN;
}
+ @Override
public void addDatum(double datum) {
if ((int) count < 65535) { // = 65535 = 2^16 - 1
if ((int) ++count == 1) {
@@ -45,6 +46,7 @@
}
}
+ @Override
public void removeDatum(double datum) {
if ((int) count == 0) {
throw new IllegalStateException();
@@ -57,6 +59,7 @@
}
}
+ @Override
public void changeDatum(double delta) {
if ((int) count == 0) {
throw new IllegalStateException();
@@ -64,10 +67,12 @@
average += (float) (delta / (double) count);
}
+ @Override
public int getCount() {
return (int) count;
}
+ @Override
public double getAverage() {
return (double) average;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverageAndStdDev.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverageAndStdDev.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverageAndStdDev.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverageAndStdDev.java Tue Dec 23 15:32:31 2008
@@ -29,6 +29,7 @@
stdDev = Float.NaN;
}
+ @Override
public double getStandardDeviation() {
return (double) stdDev;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/EmptyIterable.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/EmptyIterable.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/EmptyIterable.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/EmptyIterable.java Tue Dec 23 15:32:31 2008
@@ -31,6 +31,7 @@
iterator = new EmptyIterator<T>();
}
+ @Override
public Iterator<T> iterator() {
return iterator;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/EmptyIterator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/EmptyIterator.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/EmptyIterator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/EmptyIterator.java Tue Dec 23 15:32:31 2008
@@ -28,6 +28,7 @@
/**
* @return false
*/
+ @Override
public boolean hasNext() {
return false;
}
@@ -36,6 +37,7 @@
* @return never returns anything
* @throws NoSuchElementException
*/
+ @Override
public T next() {
throw new NoSuchElementException();
}
@@ -43,6 +45,7 @@
/**
* @throws UnsupportedOperationException
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java Tue Dec 23 15:32:31 2008
@@ -129,6 +129,7 @@
return index;
}
+ @Override
public V get(Object key) {
if (key == null) {
return null;
@@ -140,18 +141,22 @@
return values[index];
}
+ @Override
public int size() {
return numEntries;
}
+ @Override
public boolean isEmpty() {
return numEntries == 0;
}
+ @Override
public boolean containsKey(Object key) {
return key != null && keys[find(key)] != null;
}
+ @Override
public boolean containsValue(Object value) {
if (value == null) {
return false;
@@ -167,6 +172,7 @@
/**
* @throws NullPointerException if key or value is null
*/
+ @Override
public V put(K key, V value) {
if (key == null || value == null) {
throw new NullPointerException();
@@ -219,6 +225,7 @@
values[index] = null;
}
+ @Override
public void putAll(Map<? extends K, ? extends V> map) {
if (map == null) {
throw new NullPointerException();
@@ -228,6 +235,7 @@
}
}
+ @Override
public V remove(Object key) {
if (key == null) {
return null;
@@ -246,6 +254,7 @@
// Could un-set recentlyAccessed's bit but doesn't matter
}
+ @Override
public void clear() {
numEntries = 0;
numSlotsUsed = 0;
@@ -256,6 +265,7 @@
}
}
+ @Override
public Set<K> keySet() {
if (keySet == null) {
keySet = new KeySet();
@@ -263,6 +273,7 @@
return keySet;
}
+ @Override
public Collection<V> values() {
if (valueCollection == null) {
valueCollection = new ValueCollection();
@@ -270,6 +281,7 @@
return valueCollection;
}
+ @Override
public Set<Entry<K, V>> entrySet() {
if (entrySet == null) {
entrySet = new EntrySet();
@@ -381,14 +393,17 @@
this.index = index;
}
+ @Override
public K getKey() {
return getKeys()[index];
}
+ @Override
public V getValue() {
return getValues()[index];
}
+ @Override
public V setValue(V value) {
if (value == null) {
throw new IllegalArgumentException();
@@ -405,11 +420,13 @@
private int position;
private int lastNext = -1;
+ @Override
public boolean hasNext() {
goToNext();
return position < getKeys().length;
}
+ @Override
public Entry<K, V> next() {
goToNext();
lastNext = position;
@@ -428,6 +445,7 @@
}
}
+ @Override
public void remove() {
iteratorRemove(lastNext);
}
@@ -492,11 +510,13 @@
private int position;
private int lastNext = -1;
+ @Override
public boolean hasNext() {
goToNext();
return position < getKeys().length;
}
+ @Override
public K next() {
goToNext();
lastNext = position;
@@ -515,6 +535,7 @@
}
}
+ @Override
public void remove() {
iteratorRemove(lastNext);
}
@@ -579,11 +600,13 @@
private int position;
private int lastNext = -1;
+ @Override
public boolean hasNext() {
goToNext();
return position < getValues().length;
}
+ @Override
public V next() {
goToNext();
lastNext = position;
@@ -602,6 +625,7 @@
}
}
+ @Override
public void remove() {
iteratorRemove(lastNext);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java Tue Dec 23 15:32:31 2008
@@ -99,14 +99,17 @@
return index;
}
+ @Override
public int size() {
return numEntries;
}
+ @Override
public boolean isEmpty() {
return numEntries == 0;
}
+ @Override
public boolean contains(Object key) {
return key != null && keys[find(key)] != null;
}
@@ -114,6 +117,7 @@
/**
* @throws NullPointerException if key is null
*/
+ @Override
public boolean add(K key) {
if (key == null) {
throw new NullPointerException();
@@ -133,10 +137,12 @@
return false;
}
+ @Override
public Iterator<K> iterator() {
return new KeyIterator();
}
+ @Override
public boolean remove(Object key) {
if (key == null) {
return false;
@@ -152,6 +158,7 @@
// Could un-set recentlyAccessed's bit but doesn't matter
}
+ @Override
public boolean containsAll(Collection<?> c) {
for (Object o : c) {
if (o == null || keys[find(o)] == null) {
@@ -161,6 +168,7 @@
return true;
}
+ @Override
public boolean addAll(Collection<? extends K> c) {
boolean changed = false;
for (K k : c) {
@@ -171,6 +179,7 @@
return changed;
}
+ @Override
public boolean retainAll(Collection<?> c) {
boolean changed = false;
Iterator<K> iterator = iterator();
@@ -184,6 +193,7 @@
return changed;
}
+ @Override
public boolean removeAll(Collection<?> c) {
boolean changed = false;
for (Object o : c) {
@@ -194,17 +204,20 @@
return changed;
}
+ @Override
public void clear() {
numEntries = 0;
numSlotsUsed = 0;
Arrays.fill(keys, null);
}
+ @Override
public Object[] toArray() {
return toArray(new Object[numEntries]);
}
- @SuppressWarnings("unchecked")
+ @Override
+ @SuppressWarnings("unchecked")
public <T> T[] toArray(T[] a) {
if (a.length < numEntries) {
a = (T[]) Array.newInstance(a.getClass().getComponentType(), numEntries);
@@ -251,7 +264,7 @@
* Convenience method to quickly compute just the size of the intersection with another {@link FastSet}.
*/
@SuppressWarnings("unchecked")
- public int intersectionSize(FastSet other) {
+ public int intersectionSize(FastSet<?> other) {
int count = 0;
K[] otherKeys = (K[]) other.keys;
for (int i = 0; i < otherKeys.length; i++) {
@@ -268,11 +281,13 @@
private int position;
private int lastNext = -1;
+ @Override
public boolean hasNext() {
goToNext();
return position < getKeys().length;
}
+ @Override
public K next() {
goToNext();
lastNext = position;
@@ -291,6 +306,7 @@
}
}
+ @Override
public void remove() {
if (lastNext >= keys.length) {
throw new NoSuchElementException();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FileLineIterable.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FileLineIterable.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FileLineIterable.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FileLineIterable.java Tue Dec 23 15:32:31 2008
@@ -47,6 +47,7 @@
this.encoding = encoding;
}
+ @Override
public Iterator<String> iterator() {
try {
return new FileLineIterator(file, encoding);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FileLineIterator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FileLineIterator.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FileLineIterator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FileLineIterator.java Tue Dec 23 15:32:31 2008
@@ -61,10 +61,12 @@
nextLine = reader.readLine();
}
+ @Override
public boolean hasNext() {
return nextLine != null;
}
+ @Override
public String next() {
if (nextLine == null) {
throw new NoSuchElementException();
@@ -86,10 +88,12 @@
/**
* @throws UnsupportedOperationException
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
+ @Override
public void close() {
nextLine = null;
IOUtils.quietClose(reader);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverage.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverage.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverage.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverage.java Tue Dec 23 15:32:31 2008
@@ -38,6 +38,7 @@
/**
* @param datum new item to add to the running average
*/
+ @Override
public void addDatum(double datum) {
if (++count == 1) {
average = datum;
@@ -50,6 +51,7 @@
* @param datum item to remove to the running average
* @throws IllegalStateException if count is 0
*/
+ @Override
public void removeDatum(double datum) {
if (count == 0) {
throw new IllegalStateException();
@@ -65,6 +67,7 @@
* @param delta amount by which to change a datum in the running average
* @throws IllegalStateException if count is 0
*/
+ @Override
public void changeDatum(double delta) {
if (count == 0) {
throw new IllegalStateException();
@@ -72,10 +75,12 @@
average += delta / (double) count;
}
+ @Override
public int getCount() {
return count;
}
+ @Override
public double getAverage() {
return average;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverageAndStdDev.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverageAndStdDev.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverageAndStdDev.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverageAndStdDev.java Tue Dec 23 15:32:31 2008
@@ -29,6 +29,7 @@
stdDev = Double.NaN;
}
+ @Override
public double getStandardDeviation() {
return stdDev;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/IteratorIterable.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/IteratorIterable.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/IteratorIterable.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/IteratorIterable.java Tue Dec 23 15:32:31 2008
@@ -39,6 +39,7 @@
this.iterator = iterator;
}
+ @Override
public Iterator<T> iterator() {
if (iterator == null) {
throw new IllegalStateException("iterator() has already been called");
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Pair.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Pair.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Pair.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/Pair.java Tue Dec 23 15:32:31 2008
@@ -66,7 +66,7 @@
@Override
public String toString() {
- return '(' + String.valueOf(first) + ',' + String.valueOf(second) + ')';
+ return '(' + String.valueOf(first) + ',' + second + ')';
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/RefreshHelper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/RefreshHelper.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/RefreshHelper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/RefreshHelper.java Tue Dec 23 15:32:31 2008
@@ -50,6 +50,7 @@
}
}
+ @Override
public void refresh(Collection<Refreshable> alreadyRefreshed) {
if (!refreshLock.isLocked()) {
refreshLock.lock();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/WeightedRunningAverage.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/WeightedRunningAverage.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/WeightedRunningAverage.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/WeightedRunningAverage.java Tue Dec 23 15:32:31 2008
@@ -29,6 +29,7 @@
average = Double.NaN;
}
+ @Override
public void addDatum(double datum) {
addDatum(datum, 1.0);
}
@@ -43,6 +44,7 @@
}
}
+ @Override
public void removeDatum(double datum) {
removeDatum(datum, 1.0);
}
@@ -58,6 +60,7 @@
}
}
+ @Override
public void changeDatum(double delta) {
changeDatum(delta, 1.0);
}
@@ -76,10 +79,12 @@
/**
* @return {@link #getTotalWeight()}
*/
+ @Override
public int getCount() {
return (int) totalWeight;
}
+ @Override
public double getAverage() {
return average;
}
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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008
@@ -53,6 +53,7 @@
random = RandomUtils.getRandom();
}
+ @Override
public double evaluate(RecommenderBuilder recommenderBuilder,
DataModel dataModel,
double trainingPercentage,
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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008
@@ -69,6 +69,7 @@
random = RandomUtils.getRandom();
}
+ @Override
public IRStatistics evaluate(RecommenderBuilder recommenderBuilder,
DataModel dataModel,
Rescorer<Item> rescorer,
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/IRStatisticsImpl.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/IRStatisticsImpl.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/IRStatisticsImpl.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/IRStatisticsImpl.java Tue Dec 23 15:32:31 2008
@@ -42,22 +42,27 @@
this.fallOut = fallOut;
}
+ @Override
public double getPrecision() {
return precision;
}
+ @Override
public double getRecall() {
return recall;
}
+ @Override
public double getFallOut() {
return fallOut;
}
+ @Override
public double getF1Measure() {
return getFNMeasure(1.0);
}
+ @Override
public double getFNMeasure(double n) {
double sum = n * precision + recall;
return sum == 0.0 ? Double.NaN : (1.0 + n) * precision * recall / sum;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanPreference.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanPreference.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanPreference.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanPreference.java Tue Dec 23 15:32:31 2008
@@ -18,7 +18,6 @@
package org.apache.mahout.cf.taste.impl.model;
import org.apache.mahout.cf.taste.model.Item;
-import org.apache.mahout.cf.taste.model.Preference;
import org.apache.mahout.cf.taste.model.User;
import java.io.Serializable;
@@ -28,7 +27,7 @@
* at 1.0). This is appropriate in situations where users conceptually have only a general "yes" preference
* for items, rather than a spectrum of preference values.
*/
-public final class BooleanPreference implements Preference, SettableUserPreference, Serializable {
+public final class BooleanPreference implements SettableUserPreference, Serializable {
private User user;
private final Item item;
@@ -41,6 +40,7 @@
this.item = item;
}
+ @Override
public User getUser() {
if (user == null) {
throw new IllegalStateException("User was never set");
@@ -48,6 +48,7 @@
return user;
}
+ @Override
public void setUser(User user) {
if (user == null) {
throw new IllegalArgumentException("user is null");
@@ -55,14 +56,17 @@
this.user = user;
}
+ @Override
public Item getItem() {
return item;
}
+ @Override
public double getValue() {
return 1.0;
}
+ @Override
public void setValue(double value) {
throw new UnsupportedOperationException();
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByItemPreferenceComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByItemPreferenceComparator.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByItemPreferenceComparator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByItemPreferenceComparator.java Tue Dec 23 15:32:31 2008
@@ -38,6 +38,7 @@
return instance;
}
+ @Override
public int compare(Preference o1, Preference o2) {
return o1.getItem().compareTo(o2.getItem());
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByUserPreferenceComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByUserPreferenceComparator.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByUserPreferenceComparator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByUserPreferenceComparator.java Tue Dec 23 15:32:31 2008
@@ -37,6 +37,7 @@
return instance;
}
+ @Override
public int compare(Preference o1, Preference o2) {
return o1.getUser().compareTo(o2.getUser());
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByValuePreferenceComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByValuePreferenceComparator.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByValuePreferenceComparator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/ByValuePreferenceComparator.java Tue Dec 23 15:32:31 2008
@@ -37,6 +37,7 @@
return instance;
}
+ @Override
public int compare(Preference o1, Preference o2) {
double value1 = o1.getValue();
double value2 = o2.getValue();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java Tue Dec 23 15:32:31 2008
@@ -118,6 +118,7 @@
this(dataModel.getUsers());
}
+ @Override
public Iterable<? extends User> getUsers() {
return users;
}
@@ -125,6 +126,7 @@
/**
* @throws NoSuchElementException if there is no such {@link User}
*/
+ @Override
public User getUser(Object id) {
User user = userMap.get(id);
if (user == null) {
@@ -133,6 +135,7 @@
return user;
}
+ @Override
public Iterable<? extends Item> getItems() {
return items;
}
@@ -140,6 +143,7 @@
/**
* @throws NoSuchElementException if there is no such {@link Item}
*/
+ @Override
public Item getItem(Object id) {
Item item = itemMap.get(id);
if (item == null) {
@@ -148,25 +152,30 @@
return item;
}
+ @Override
public Iterable<? extends Preference> getPreferencesForItem(Object itemID) {
Preference[] prefs = preferenceForItems.get(itemID);
- return prefs == null ? NO_PREFS_ITERABLE : new ArrayIterator<Preference>(getPreferencesForItemAsArray(itemID));
+ return prefs == null ? NO_PREFS_ITERABLE : new ArrayIterator<Preference>(prefs);
}
+ @Override
public Preference[] getPreferencesForItemAsArray(Object itemID) {
Preference[] prefs = preferenceForItems.get(itemID);
return prefs == null ? NO_PREFS_ARRAY : prefs;
}
+ @Override
public int getNumItems() {
return items.size();
}
+ @Override
public int getNumUsers() {
return users.size();
}
- public int getNumUsersWithPreferenceFor(Object... itemIDs) throws TasteException {
+ @Override
+ public int getNumUsersWithPreferenceFor(Object... itemIDs) {
if (itemIDs == null) {
throw new IllegalArgumentException("itemIDs is null");
}
@@ -199,6 +208,7 @@
/**
* @throws UnsupportedOperationException
*/
+ @Override
public void setPreference(Object userID, Object itemID, double value) {
throw new UnsupportedOperationException();
}
@@ -206,10 +216,12 @@
/**
* @throws UnsupportedOperationException
*/
+ @Override
public void removePreference(Object userID, Object itemID) {
throw new UnsupportedOperationException();
}
+ @Override
public void refresh(Collection<Refreshable> alreadyRefreshed) {
// Does nothing
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItem.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItem.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItem.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItem.java Tue Dec 23 15:32:31 2008
@@ -41,10 +41,12 @@
this.recommendable = recommendable;
}
+ @Override
public Object getID() {
return id;
}
+ @Override
public boolean isRecommendable() {
return recommendable;
}
@@ -61,9 +63,10 @@
@Override
public String toString() {
- return "Item[id:" + String.valueOf(id) + ']';
+ return "Item[id:" + id + ']';
}
+ @Override
@SuppressWarnings("unchecked")
public int compareTo(Item item) {
return id.compareTo((K) item.getID());
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreference.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreference.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreference.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreference.java Tue Dec 23 15:32:31 2008
@@ -26,7 +26,7 @@
/**
* <p>A simple {@link Preference} encapsulating an {@link Item} and preference value.</p>
*/
-public class GenericPreference implements Preference, SettableUserPreference, Serializable {
+public class GenericPreference implements SettableUserPreference, Serializable {
private User user;
private final Item item;
@@ -44,6 +44,7 @@
this.value = value;
}
+ @Override
public User getUser() {
if (user == null) {
throw new IllegalStateException("User was never set");
@@ -51,6 +52,7 @@
return user;
}
+ @Override
public void setUser(User user) {
if (user == null) {
throw new IllegalArgumentException("user is null");
@@ -58,14 +60,17 @@
this.user = user;
}
+ @Override
public Item getItem() {
return item;
}
+ @Override
public double getValue() {
return value;
}
+ @Override
public void setValue(double value) {
if (Double.isNaN(value)) {
throw new IllegalArgumentException("Invalid value: " + value);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUser.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUser.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUser.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUser.java Tue Dec 23 15:32:31 2008
@@ -67,18 +67,22 @@
}
}
+ @Override
public K getID() {
return id;
}
+ @Override
public Preference getPreferenceFor(Object itemID) {
return data.get(itemID);
}
+ @Override
public Iterable<Preference> getPreferences() {
return new ArrayIterator<Preference>(values);
}
+ @Override
public Preference[] getPreferencesAsArray() {
return values;
}
@@ -95,9 +99,10 @@
@Override
public String toString() {
- return "User[id:" + String.valueOf(id) + ']';
+ return "User[id:" + id + ']';
}
+ @Override
@SuppressWarnings("unchecked")
public int compareTo(User o) {
return id.compareTo((K) o.getID());
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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008
@@ -94,8 +94,8 @@
}
protected void reload() {
+ reloadLock.lock();
try {
- reloadLock.lock();
Map<String, List<Preference>> data = new FastMap<String, List<Preference>>();
processFile(data);
@@ -170,46 +170,55 @@
}
}
+ @Override
public Iterable<? extends User> getUsers() throws TasteException {
checkLoaded();
return delegate.getUsers();
}
+ @Override
public User getUser(Object id) throws TasteException {
checkLoaded();
return delegate.getUser(id);
}
+ @Override
public Iterable<? extends Item> getItems() throws TasteException {
checkLoaded();
return delegate.getItems();
}
+ @Override
public Item getItem(Object id) throws TasteException {
checkLoaded();
return delegate.getItem(id);
}
+ @Override
public Iterable<? extends Preference> getPreferencesForItem(Object itemID) throws TasteException {
checkLoaded();
return delegate.getPreferencesForItem(itemID);
}
+ @Override
public Preference[] getPreferencesForItemAsArray(Object itemID) throws TasteException {
checkLoaded();
return delegate.getPreferencesForItemAsArray(itemID);
}
+ @Override
public int getNumItems() throws TasteException {
checkLoaded();
return delegate.getNumItems();
}
+ @Override
public int getNumUsers() throws TasteException {
checkLoaded();
return delegate.getNumUsers();
}
+ @Override
public int getNumUsersWithPreferenceFor(Object... itemIDs) throws TasteException {
checkLoaded();
return delegate.getNumUsersWithPreferenceFor(itemIDs);
@@ -218,6 +227,7 @@
/**
* @throws UnsupportedOperationException
*/
+ @Override
public void setPreference(Object userID, Object itemID, double value) {
throw new UnsupportedOperationException();
}
@@ -225,10 +235,12 @@
/**
* @throws UnsupportedOperationException
*/
+ @Override
public void removePreference(Object userID, Object itemID) {
throw new UnsupportedOperationException();
}
+ @Override
public void refresh(Collection<Refreshable> alreadyRefreshed) {
reload();
}
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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008
@@ -221,6 +221,7 @@
/**
* @return the {@link DataSource} that this instance is using
*/
+ @Override
public DataSource getDataSource() {
return dataSource;
}
@@ -241,6 +242,7 @@
return preferenceColumn;
}
+ @Override
public final Iterable<? extends User> getUsers() throws TasteException {
log.debug("Retrieving all users...");
return new IteratorIterable<User>(new ResultSetUserIterator(dataSource, getUsersSQL));
@@ -249,6 +251,7 @@
/**
* @throws NoSuchElementException if there is no such user
*/
+ @Override
public final User getUser(Object id) throws TasteException {
log.debug("Retrieving user ID '{}'", id);
@@ -287,15 +290,18 @@
}
+ @Override
public final Iterable<? extends Item> getItems() throws TasteException {
log.debug("Retrieving all items...");
return new IteratorIterable<Item>(new ResultSetItemIterator(dataSource, getItemsSQL));
}
+ @Override
public final Item getItem(Object id) throws TasteException {
return getItem(id, false);
}
+ @Override
public final Item getItem(Object id, boolean assumeExists) throws TasteException {
if (assumeExists) {
@@ -328,10 +334,12 @@
}
}
+ @Override
public final Iterable<? extends Preference> getPreferencesForItem(Object itemID) throws TasteException {
return doGetPreferencesForItem(itemID);
}
+ @Override
public final Preference[] getPreferencesForItemAsArray(Object itemID) throws TasteException {
List<? extends Preference> list = doGetPreferencesForItem(itemID);
return list.toArray(new Preference[list.size()]);
@@ -366,14 +374,17 @@
}
}
+ @Override
public final int getNumItems() throws TasteException {
return getNumThings("items", getNumItemsSQL);
}
+ @Override
public final int getNumUsers() throws TasteException {
return getNumThings("users", getNumUsersSQL);
}
+ @Override
public final int getNumUsersWithPreferenceFor(Object... itemIDs) throws TasteException {
if (itemIDs == null) {
throw new IllegalArgumentException("itemIDs is null");
@@ -415,6 +426,7 @@
}
}
+ @Override
public final void setPreference(Object userID, Object itemID, double value)
throws TasteException {
if (userID == null || itemID == null) {
@@ -451,6 +463,7 @@
}
}
+ @Override
public final void removePreference(Object userID, Object itemID)
throws TasteException {
if (userID == null || itemID == null) {
@@ -480,6 +493,7 @@
}
}
+ @Override
public final void refresh(Collection<Refreshable> alreadyRefreshed) {
// do nothing
}
@@ -554,6 +568,7 @@
}
}
+ @Override
public boolean hasNext() {
boolean nextExists = false;
if (!closed) {
@@ -573,6 +588,7 @@
return nextExists;
}
+ @Override
public User next() {
if (closed) {
@@ -616,6 +632,7 @@
/**
* @throws UnsupportedOperationException
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
@@ -655,6 +672,7 @@
}
}
+ @Override
public boolean hasNext() {
boolean nextExists = false;
if (!closed) {
@@ -674,6 +692,7 @@
return nextExists;
}
+ @Override
public Item next() {
if (closed) {
@@ -698,6 +717,7 @@
/**
* @throws UnsupportedOperationException
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/ConnectionPoolDataSource.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/ConnectionPoolDataSource.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/ConnectionPoolDataSource.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/ConnectionPoolDataSource.java Tue Dec 23 15:32:31 2008
@@ -47,26 +47,32 @@
this.delegate = new PoolingDataSource(connectionPool);
}
+ @Override
public Connection getConnection() throws SQLException {
return delegate.getConnection();
}
+ @Override
public Connection getConnection(String username, String password) throws SQLException {
return delegate.getConnection(username, password);
}
+ @Override
public PrintWriter getLogWriter() throws SQLException {
return delegate.getLogWriter();
}
+ @Override
public void setLogWriter(PrintWriter printWriter) throws SQLException {
delegate.setLogWriter(printWriter);
}
+ @Override
public void setLoginTimeout(int timeout) throws SQLException {
delegate.setLoginTimeout(timeout);
}
+ @Override
public int getLoginTimeout() throws SQLException {
return delegate.getLoginTimeout();
}
@@ -78,6 +84,7 @@
/**
* @throws SQLException always
*/
+ @Override
public <T> T unwrap(Class<T> iface) throws SQLException {
throw new SQLException("Unsupported operation");
}
@@ -85,6 +92,7 @@
/**
* @return false always
*/
+ @Override
public boolean isWrapperFor(Class<?> iface) {
return false;
}
@@ -97,24 +105,29 @@
this.dataSource = dataSource;
}
+ @Override
public Object makeObject() throws SQLException {
log.debug("Obtaining pooled connection");
return dataSource.getConnection();
}
+ @Override
public void destroyObject(Object o) throws SQLException {
log.debug("Closing pooled connection");
((Connection) o).close();
}
+ @Override
public boolean validateObject(Object o) {
return true;
}
+ @Override
public void activateObject(Object o) {
// do nothing
}
+ @Override
public void passivateObject(Object o) {
// do nothing
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/AbstractUserNeighborhood.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/AbstractUserNeighborhood.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/AbstractUserNeighborhood.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/AbstractUserNeighborhood.java Tue Dec 23 15:32:31 2008
@@ -68,6 +68,7 @@
return samplingRate >= 1.0 || random.nextDouble() < samplingRate;
}
+ @Override
public final void refresh(Collection<Refreshable> alreadyRefreshed) {
refreshHelper.refresh(alreadyRefreshed);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/CachingUserNeighborhood.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/CachingUserNeighborhood.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/CachingUserNeighborhood.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/CachingUserNeighborhood.java Tue Dec 23 15:32:31 2008
@@ -45,10 +45,12 @@
this.neighborhoodCache = new Cache<Object, Collection<User>>(new NeighborhoodRetriever(neighborhood), maxCacheSize);
}
+ @Override
public Collection<User> getUserNeighborhood(Object userID) throws TasteException {
return neighborhoodCache.get(userID);
}
+ @Override
public void refresh(Collection<Refreshable> alreadyRefreshed) {
neighborhoodCache.clear();
alreadyRefreshed = RefreshHelper.buildRefreshed(alreadyRefreshed);
@@ -60,6 +62,7 @@
private NeighborhoodRetriever(UserNeighborhood neighborhood) {
this.neighborhood = neighborhood;
}
+ @Override
public Collection<User> get(Object key) throws TasteException {
return neighborhood.getUserNeighborhood(key);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java Tue Dec 23 15:32:31 2008
@@ -71,6 +71,7 @@
this.n = n;
}
+ @Override
public Collection<User> getUserNeighborhood(Object userID) throws TasteException {
log.trace("Computing neighborhood around user ID '{}'", userID);
@@ -96,11 +97,12 @@
private final UserSimilarity userSimilarityImpl;
private final User theUser;
- public Estimator(UserSimilarity userSimilarityImpl, User theUser) {
+ private Estimator(UserSimilarity userSimilarityImpl, User theUser) {
this.userSimilarityImpl = userSimilarityImpl;
this.theUser = theUser;
}
+ @Override
public double estimate(User user) throws TasteException {
if (user.equals(theUser)) {
return Double.NaN;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java Tue Dec 23 15:32:31 2008
@@ -76,6 +76,7 @@
this.threshold = threshold;
}
+ @Override
public Collection<User> getUserNeighborhood(Object userID) throws TasteException {
log.trace("Computing neighborhood around user ID '{}'", userID);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.java Tue Dec 23 15:32:31 2008
@@ -48,6 +48,7 @@
* {@link Recommender#recommend(Object, int, org.apache.mahout.cf.taste.recommender.Rescorer)},
* with a {@link org.apache.mahout.cf.taste.recommender.Rescorer} that does nothing.</p>
*/
+ @Override
public List<RecommendedItem> recommend(Object userID, int howMany) throws TasteException {
return recommend(userID, howMany, null);
}
@@ -58,6 +59,7 @@
* @throws IllegalArgumentException if userID or itemID is <code>null</code>, or if value is
* {@link Double#NaN}
*/
+ @Override
public void setPreference(Object userID, Object itemID, double value) throws TasteException {
if (userID == null || itemID == null) {
throw new IllegalArgumentException("userID or itemID is null");
@@ -77,6 +79,7 @@
*
* @throws IllegalArgumentException if userID or itemID is <code>null</code>
*/
+ @Override
public void removePreference(Object userID, Object itemID) throws TasteException {
if (userID == null || itemID == null) {
throw new IllegalArgumentException("userID or itemID is null");
@@ -85,6 +88,7 @@
dataModel.removePreference(userID, itemID);
}
+ @Override
public DataModel getDataModel() {
return dataModel;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ByRescoreComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ByRescoreComparator.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ByRescoreComparator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ByRescoreComparator.java Tue Dec 23 15:32:31 2008
@@ -36,6 +36,7 @@
this.rescorer = rescorer;
}
+ @Override
public int compare(RecommendedItem o1, RecommendedItem o2) {
double rescored1;
double rescored2;