mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robina...@apache.org
Subject svn commit: r910282 [1/6] - in /lucene/mahout/trunk: core/src/main/java/org/apache/mahout/cf/taste/hadoop/ core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/ core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ core/src/main/java/o...
Date Mon, 15 Feb 2010 18:18:05 GMT
Author: robinanil
Date: Mon Feb 15 18:17:54 2010
New Revision: 910282

URL: http://svn.apache.org/viewvc?rev=910282&view=rev
Log:
MAHOUT-291 Fix Static Qualifiers, Extra Blank lines and formatter errors

Modified:
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/AbstractJob.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/ItemBigramGenerator.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/ItemSimilarityEstimator.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/UserItemJoiner.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderMapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ToUserVectorReducer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderReducer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.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/jdbc/AbstractJDBCComponent.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluator.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.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/AbstractBooleanPrefJDBCDataModel.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/AbstractRecommender.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/GenericItemBasedRecommender.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/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/knn/ConjugateGradientOptimizer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/knn/NonNegativeQuadraticOptimizer.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/file/FileDiffStorage.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/recommender/slopeone/jdbc/MySQLJDBCDiffStorage.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommender.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/GenericUserSimilarity.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/jdbc/AbstractJDBCItemSimilarity.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/Classify.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/algorithm/BayesAlgorithm.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/algorithm/CBayesAlgorithm.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/datastore/HBaseBayesDatastore.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/datastore/InMemoryBayesDatastore.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/bayes/mapreduce/bayes/BayesClassifierDriver.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesDriver.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesThetaNormalizerDriver.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesThetaNormalizerMapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesThetaNormalizerReducer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/cbayes/CBayesDriver.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/cbayes/CBayesThetaNormalizerDriver.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/cbayes/CBayesThetaNormalizerMapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/cbayes/CBayesThetaNormalizerReducer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureMapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfDriver.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfMapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfReducer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesWeightSummerReducer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/JobExecutor.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearModel.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/PerceptronTrainer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/TrainingException.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/WinnowTrainer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusterer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusteringJob.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterDriver.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/JsonClusterAdapter.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/JsonModelAdapter.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/FuzzyKMeansUtil.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/KMeansClusterer.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/KMeansUtil.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/RandomSeedGenerator.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAInference.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAReducer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyJob.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/HadoopUtil.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Parameters.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/RandomUtils.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/ManhattanDistanceMeasure.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/Bagging.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/DFUtils.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/builder/DefaultTreeBuilder.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataConverter.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataUtils.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Dataset.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DescriptorUtils.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/Builder.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemInputFormat.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemMapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/PartialBuilder.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step1Mapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step2Mapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/Builder.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormat.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/InterResults.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/PartialBuilder.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step1Mapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step2Mapper.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/TreeID.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/node/CategoricalNode.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/ref/SequentialBuilder.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Describe.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Frequencies.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/FrequenciesJob.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthDriver.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/convertors/ContextWriteOutputCollector.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPTree.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPTreeDepthCache.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/Pattern.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/EvalMapper.java
    lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java
    lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/DummySimilarity.java
    lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
    lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java
    lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestLDAInference.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingRecommenderEvaluatorRunner.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/GroupLensRecommenderEvaluatorRunner.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/jester/JesterRecommenderEvaluatorRunner.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/NetflixDataModel.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/NetflixRecommenderEvaluatorRunner.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.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/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/dirichlet/Display2dASNDirichlet.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayDirichlet.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/Job.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.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/OutputMapper.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/df/BreimanExample.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/df/mapred/BuildForest.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/df/mapreduce/BuildForest.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/fpm/pfpgrowth/dataset/KeyBasedStringTupleMapper.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/FileInfoParser.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/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/ToolMapper.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaMapper.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaToSequenceFile.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/text/SparseVectorsFromSequenceFiles.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/CollocDriver.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/CollocMapper.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/CollocReducer.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/LLRReducer.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/NGramCollector.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/arff/ARFFModel.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterable.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/arff/Driver.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/arff/MapBackedARFFModel.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/common/PartialVectorMerger.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfo.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/Driver.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizer.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DocumentProcessor.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/document/SequenceFileTokenizerMapper.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/term/TermDocumentCountMapper.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/tfidf/TFIDFConverter.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/tfidf/TFIDFPartialVectorReducer.java
    lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/dirichlet/TestL1ModelClustering.java
    lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/CollocMapperTest.java
    lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/CollocReducerTest.java
    lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/LLRReducerTest.java

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/AbstractJob.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/AbstractJob.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/AbstractJob.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/AbstractJob.java Mon Feb 15 18:17:54 2010
@@ -107,7 +107,7 @@
       parser.setGroup(group);
       cmdLine = parser.parse(args);
     } catch (OptionException e) {
-      AbstractJob.log.error(e.getMessage());
+      log.error(e.getMessage());
       CommandLineUtil.printHelp(group);
       return null;
     }

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/ItemBigramGenerator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/ItemBigramGenerator.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/ItemBigramGenerator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/ItemBigramGenerator.java Mon Feb 15 18:17:54 2010
@@ -83,14 +83,14 @@
           output.collect(user, item);
         } catch (NumberFormatException nfe) {
           reporter.incrCounter(Records.INVALID_IDS, 1);
-          UserItemMapper.log.warn("Invalid IDs in record: {}", userPrefLine);
+          log.warn("Invalid IDs in record: {}", userPrefLine);
         } catch (IllegalArgumentException iae) {
           reporter.incrCounter(Records.INVALID_IDS, 1);
-          UserItemMapper.log.warn("Invalid IDs in record: {}", userPrefLine);
+          log.warn("Invalid IDs in record: {}", userPrefLine);
         }
       } else {
         reporter.incrCounter(Records.INVALID_SCHEMA, 1);
-        UserItemMapper.log.warn("No preference found in record: {}", userPrefLine);
+        log.warn("No preference found in record: {}", userPrefLine);
       }
     }
   }
@@ -164,7 +164,7 @@
   public int run(String[] args) throws IOException {
     // TODO use Commons CLI 2
     if (args.length < 2) {
-      ItemBigramGenerator.log.error("Usage: ItemBigramGemerator <input-dir> <output-dir> [reducers]");
+      log.error("Usage: ItemBigramGemerator <input-dir> <output-dir> [reducers]");
       ToolRunner.printGenericCommandUsage(System.out);
       return -1;
     }

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/ItemSimilarityEstimator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/ItemSimilarityEstimator.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/ItemSimilarityEstimator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/ItemSimilarityEstimator.java Mon Feb 15 18:17:54 2010
@@ -83,7 +83,7 @@
                     OutputCollector<Bigram,Bigram> output,
                     Reporter reporter) throws IOException {
       keyBigram.set(item1.get(), item2.get());
-      valueBigram.set(item2.get(), ItemItemMapper.ONE);
+      valueBigram.set(item2.get(), ONE);
       output.collect(keyBigram, valueBigram);
     }
   }

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/UserItemJoiner.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/UserItemJoiner.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/UserItemJoiner.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/UserItemJoiner.java Mon Feb 15 18:17:54 2010
@@ -83,7 +83,7 @@
         joinKey.set(itemId, keyID.get());
         output.collect(joinKey, tuple);
       } else {
-        JoinUserMapper.log.warn("No preference found in record: {}", userPrefLine);
+        log.warn("No preference found in record: {}", userPrefLine);
       }
     }
   }
@@ -184,7 +184,7 @@
   public int run(String[] args) throws IOException {
     // TODO use Commons CLI 2
     if (args.length < 3) {
-      UserItemJoiner.log.error("UserItemJoiner <user-input-dirs> <item-input-dir> <output-dir> [reducers]");
+      log.error("UserItemJoiner <user-input-dirs> <item-input-dir> <output-dir> [reducers]");
       ToolRunner.printGenericCommandUsage(System.out);
       return -1;
     }

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderMapper.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderMapper.java Mon Feb 15 18:17:54 2010
@@ -67,13 +67,13 @@
   public void configure(JobConf jobConf) {
     try {
       FileSystem fs = FileSystem.get(jobConf);
-      Path cooccurrencePath = new Path(jobConf.get(RecommenderMapper.COOCCURRENCE_PATH)).makeQualified(fs);
-      Path itemIDIndexPath = new Path(jobConf.get(RecommenderMapper.ITEMID_INDEX_PATH)).makeQualified(fs);
-      recommendationsPerUser = jobConf.getInt(RecommenderMapper.RECOMMENDATIONS_PER_USER, 10);
+      Path cooccurrencePath = new Path(jobConf.get(COOCCURRENCE_PATH)).makeQualified(fs);
+      Path itemIDIndexPath = new Path(jobConf.get(ITEMID_INDEX_PATH)).makeQualified(fs);
+      recommendationsPerUser = jobConf.getInt(RECOMMENDATIONS_PER_USER, 10);
       indexItemIDMap = new MapFilesMap<IntWritable,LongWritable>(fs, itemIDIndexPath, new Configuration());
       cooccurrenceColumnMap = new MapFilesMap<IntWritable,VectorWritable>(fs, cooccurrencePath,
           new Configuration());
-      String usersFilePathString = jobConf.get(RecommenderMapper.USERS_FILE);
+      String usersFilePathString = jobConf.get(USERS_FILE);
       if (usersFilePathString == null) {
         usersToRecommendFor = null;
       } else {

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ToUserVectorReducer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ToUserVectorReducer.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ToUserVectorReducer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ToUserVectorReducer.java Mon Feb 15 18:17:54 2010
@@ -75,11 +75,11 @@
         userVector.set(index, itemPref.getPrefValue());
       }
       
-      if (userVector.getNumNondefaultElements() > ToUserVectorReducer.MAX_PREFS_CONSIDERED) {
-        double cutoff = ToUserVectorReducer.findTopNPrefsCutoff(ToUserVectorReducer.MAX_PREFS_CONSIDERED,
+      if (userVector.getNumNondefaultElements() > MAX_PREFS_CONSIDERED) {
+        double cutoff = findTopNPrefsCutoff(MAX_PREFS_CONSIDERED,
           userVector);
         RandomAccessSparseVector filteredVector = new RandomAccessSparseVector(Integer.MAX_VALUE,
-            ToUserVectorReducer.MAX_PREFS_CONSIDERED);
+            MAX_PREFS_CONSIDERED);
         Iterator<Vector.Element> it = userVector.iterateNonZero();
         while (it.hasNext()) {
           Vector.Element element = it.next();

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderReducer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderReducer.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderReducer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderReducer.java Mon Feb 15 18:17:54 2010
@@ -66,8 +66,8 @@
   
   @Override
   public void configure(JobConf jobConf) {
-    String dataModelFile = jobConf.get(RecommenderReducer.DATA_MODEL_FILE);
-    String recommenderClassName = jobConf.get(RecommenderReducer.RECOMMENDER_CLASS_NAME);
+    String dataModelFile = jobConf.get(DATA_MODEL_FILE);
+    String recommenderClassName = jobConf.get(RECOMMENDER_CLASS_NAME);
     FileDataModel fileDataModel;
     try {
       Path dataModelPath = new Path(dataModelFile);
@@ -76,7 +76,7 @@
       tempDataFile.deleteOnExit();
       fs.copyToLocalFile(dataModelPath, new Path(tempDataFile.getAbsolutePath()));
       fileDataModel = new FileDataModel(tempDataFile);
-      String usersFilePathString = jobConf.get(RecommenderReducer.USERS_FILE);
+      String usersFilePathString = jobConf.get(USERS_FILE);
       if (usersFilePathString == null) {
         usersToRecommendFor = null;
       } else {
@@ -106,7 +106,7 @@
     } catch (InvocationTargetException ite) {
       throw new IllegalStateException(ite.getCause());
     }
-    recommendationsPerUser = jobConf.getInt(RecommenderReducer.RECOMMENDATIONS_PER_USER, 10);
+    recommendationsPerUser = jobConf.getInt(RECOMMENDATIONS_PER_USER, 10);
   }
   
   @Override

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java Mon Feb 15 18:17:54 2010
@@ -51,11 +51,11 @@
   
   /** Creates a new {@link FastByIDMap} with default capacity. */
   public FastByIDMap() {
-    this(2, FastByIDMap.NO_MAX_SIZE);
+    this(2, NO_MAX_SIZE);
   }
   
   public FastByIDMap(int size) {
-    this(size, FastByIDMap.NO_MAX_SIZE);
+    this(size, NO_MAX_SIZE);
   }
   
   /**
@@ -74,16 +74,16 @@
     if (size < 0) {
       throw new IllegalArgumentException("size must be at least 0");
     }
-    int max = (int) (RandomUtils.MAX_INT_SMALLER_TWIN_PRIME / FastByIDMap.ALLOWED_LOAD_FACTOR);
+    int max = (int) (RandomUtils.MAX_INT_SMALLER_TWIN_PRIME / ALLOWED_LOAD_FACTOR);
     if (size >= max) {
       throw new IllegalArgumentException("size must be less than " + max);
     }
     if (maxSize < 1) {
       throw new IllegalArgumentException("maxSize must be at least 1");
     }
-    int hashSize = RandomUtils.nextTwinPrime((int) (FastByIDMap.ALLOWED_LOAD_FACTOR * size));
+    int hashSize = RandomUtils.nextTwinPrime((int) (ALLOWED_LOAD_FACTOR * size));
     keys = new long[hashSize];
-    Arrays.fill(keys, FastByIDMap.NULL);
+    Arrays.fill(keys, NULL);
     values = (V[]) new Object[hashSize];
     this.maxSize = maxSize;
     this.countingAccesses = maxSize != Integer.MAX_VALUE;
@@ -100,7 +100,7 @@
     int jump = 1 + theHashCode % (hashSize - 2);
     int index = theHashCode % hashSize;
     long currentKey = keys[index];
-    while ((currentKey != FastByIDMap.NULL) && (key != currentKey)) {
+    while ((currentKey != NULL) && (key != currentKey)) {
       if (index < jump) {
         index += hashSize - jump;
       } else {
@@ -121,7 +121,7 @@
     int jump = 1 + theHashCode % (hashSize - 2);
     int index = theHashCode % hashSize;
     long currentKey = keys[index];
-    while ((currentKey != FastByIDMap.NULL) && (currentKey != FastByIDMap.REMOVED) && (key != currentKey)) { // Different
+    while ((currentKey != NULL) && (currentKey != REMOVED) && (key != currentKey)) { // Different
                                                                                                              // here
       if (index < jump) {
         index += hashSize - jump;
@@ -134,7 +134,7 @@
   }
   
   public V get(long key) {
-    if (key == FastByIDMap.NULL) {
+    if (key == NULL) {
       return null;
     }
     int index = find(key);
@@ -153,7 +153,7 @@
   }
   
   public boolean containsKey(long key) {
-    return (key != FastByIDMap.NULL) && (key != FastByIDMap.REMOVED) && (keys[find(key)] != FastByIDMap.NULL);
+    return (key != NULL) && (key != REMOVED) && (keys[find(key)] != NULL);
   }
   
   public boolean containsValue(Object value) {
@@ -169,16 +169,16 @@
   }
   
   public V put(long key, V value) {
-    if ((key == FastByIDMap.NULL) || (key == FastByIDMap.REMOVED)) {
+    if ((key == NULL) || (key == REMOVED)) {
       throw new IllegalArgumentException();
     }
     if (value == null) {
       throw new NullPointerException();
     }
     // If less than half the slots are open, let's clear it up
-    if (numSlotsUsed * FastByIDMap.ALLOWED_LOAD_FACTOR >= keys.length) {
+    if (numSlotsUsed * ALLOWED_LOAD_FACTOR >= keys.length) {
       // If over half the slots used are actual entries, let's grow
-      if (numEntries * FastByIDMap.ALLOWED_LOAD_FACTOR >= numSlotsUsed) {
+      if (numEntries * ALLOWED_LOAD_FACTOR >= numSlotsUsed) {
         growAndRehash();
       } else {
         // Otherwise just rehash to clear REMOVED entries and don't grow
@@ -201,7 +201,7 @@
       keys[index] = key;
       values[index] = value;
       numEntries++;
-      if (keyIndex == FastByIDMap.NULL) {
+      if (keyIndex == NULL) {
         numSlotsUsed++;
       }
       return null;
@@ -218,7 +218,7 @@
           index--;
         }
         currentKey = keys[index];
-      } while ((currentKey == FastByIDMap.NULL) || (currentKey == FastByIDMap.REMOVED));
+      } while ((currentKey == NULL) || (currentKey == REMOVED));
       if (recentlyAccessed.get(index)) {
         recentlyAccessed.clear(index);
       } else {
@@ -226,20 +226,20 @@
       }
     }
     // Delete the entry
-    keys[index] = FastByIDMap.REMOVED;
+    keys[index] = REMOVED;
     numEntries--;
     values[index] = null;
   }
   
   public V remove(long key) {
-    if ((key == FastByIDMap.NULL) || (key == FastByIDMap.REMOVED)) {
+    if ((key == NULL) || (key == REMOVED)) {
       return null;
     }
     int index = find(key);
-    if (keys[index] == FastByIDMap.NULL) {
+    if (keys[index] == NULL) {
       return null;
     } else {
-      keys[index] = FastByIDMap.REMOVED;
+      keys[index] = REMOVED;
       numEntries--;
       V oldValue = values[index];
       values[index] = null;
@@ -252,7 +252,7 @@
   public void clear() {
     numEntries = 0;
     numSlotsUsed = 0;
-    Arrays.fill(keys, FastByIDMap.NULL);
+    Arrays.fill(keys, NULL);
     Arrays.fill(values, null);
     if (countingAccesses) {
       recentlyAccessed.clear();
@@ -268,14 +268,14 @@
   }
   
   public void rehash() {
-    rehash(RandomUtils.nextTwinPrime((int) (FastByIDMap.ALLOWED_LOAD_FACTOR * numEntries)));
+    rehash(RandomUtils.nextTwinPrime((int) (ALLOWED_LOAD_FACTOR * numEntries)));
   }
   
   private void growAndRehash() {
-    if (keys.length * FastByIDMap.ALLOWED_LOAD_FACTOR >= RandomUtils.MAX_INT_SMALLER_TWIN_PRIME) {
+    if (keys.length * ALLOWED_LOAD_FACTOR >= RandomUtils.MAX_INT_SMALLER_TWIN_PRIME) {
       throw new IllegalStateException("Can't grow any more");
     }
-    rehash(RandomUtils.nextTwinPrime((int) (FastByIDMap.ALLOWED_LOAD_FACTOR * keys.length)));
+    rehash(RandomUtils.nextTwinPrime((int) (ALLOWED_LOAD_FACTOR * keys.length)));
   }
   
   private void rehash(int newHashSize) {
@@ -287,12 +287,12 @@
       recentlyAccessed = new BitSet(newHashSize);
     }
     keys = new long[newHashSize];
-    Arrays.fill(keys, FastByIDMap.NULL);
+    Arrays.fill(keys, NULL);
     values = (V[]) new Object[newHashSize];
     int length = oldKeys.length;
     for (int i = 0; i < length; i++) {
       long key = oldKeys[i];
-      if ((key != FastByIDMap.NULL) && (key != FastByIDMap.REMOVED)) {
+      if ((key != NULL) && (key != REMOVED)) {
         put(key, oldValues[i]);
       }
     }
@@ -306,7 +306,7 @@
       throw new IllegalStateException();
     }
     values[lastNext] = null;
-    keys[lastNext] = FastByIDMap.REMOVED;
+    keys[lastNext] = REMOVED;
     numEntries--;
   }
   
@@ -333,7 +333,7 @@
     result.append('{');
     for (int i = 0; i < keys.length; i++) {
       long key = keys[i];
-      if ((key != FastByIDMap.NULL) && (key != FastByIDMap.REMOVED)) {
+      if ((key != NULL) && (key != REMOVED)) {
         result.append(key).append('=').append(values[i]).append(',');
       }
     }
@@ -394,12 +394,12 @@
     
     @Override
     public int size() {
-      return FastByIDMap.this.size();
+      return this.size();
     }
     
     @Override
     public boolean isEmpty() {
-      return FastByIDMap.this.isEmpty();
+      return this.isEmpty();
     }
     
     @Override
@@ -439,7 +439,7 @@
     
     @Override
     public void clear() {
-      FastByIDMap.this.clear();
+      this.clear();
     }
     
     private final class MapEntry implements Map.Entry<Long,V> {

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=910282&r1=910281&r2=910282&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 Mon Feb 15 18:17:54 2010
@@ -82,7 +82,7 @@
           try {
             refreshRunnable.call();
           } catch (Exception e) {
-            RefreshHelper.log.warn("Unexpected exception while refreshing", e);
+            log.warn("Unexpected exception while refreshing", e);
           }
         }
       } finally {
@@ -115,9 +115,9 @@
   public static void maybeRefresh(Collection<Refreshable> alreadyRefreshed, Refreshable refreshable) {
     if (!alreadyRefreshed.contains(refreshable)) {
       alreadyRefreshed.add(refreshable);
-      RefreshHelper.log.info("Added refreshable: {}", refreshable);
+      log.info("Added refreshable: {}", refreshable);
       refreshable.refresh(alreadyRefreshed);
-      RefreshHelper.log.info("Refreshed: {}", alreadyRefreshed);
+      log.info("Refreshed: {}", alreadyRefreshed);
     }
   }
 }

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/AbstractJDBCComponent.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/AbstractJDBCComponent.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/AbstractJDBCComponent.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/AbstractJDBCComponent.java Mon Feb 15 18:17:54 2010
@@ -43,7 +43,7 @@
     if ((value == null) || (value.toString().length() == 0)) {
       throw new IllegalArgumentException(argName + " is null or empty");
     }
-    AbstractJDBCComponent.log.debug("{}: {}", argName, value);
+    log.debug("{}: {}", argName, value);
   }
   
   protected static void checkNotNullAndLog(String argName, Object[] values) {
@@ -51,7 +51,7 @@
       throw new IllegalArgumentException(argName + " is null or zero-length");
     }
     for (Object value : values) {
-      AbstractJDBCComponent.checkNotNullAndLog(argName, value);
+      checkNotNullAndLog(argName, value);
     }
   }
   
@@ -79,14 +79,14 @@
         try {
           context.close();
         } catch (NamingException ne) {
-          AbstractJDBCComponent.log.warn("Error while closing Context; continuing...", ne);
+          log.warn("Error while closing Context; continuing...", ne);
         }
       }
     }
   }
   
   protected int getFetchSize() {
-    return AbstractJDBCComponent.DEFAULT_FETCH_SIZE;
+    return DEFAULT_FETCH_SIZE;
   }
   
   protected void advanceResultSet(ResultSet resultSet, int n) throws SQLException {

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=910282&r1=910281&r2=910282&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 Mon Feb 15 18:17:54 2010
@@ -106,7 +106,7 @@
       throw new IllegalArgumentException("Invalid evaluationPercentage: " + evaluationPercentage);
     }
     
-    AbstractDifferenceRecommenderEvaluator.log.info("Beginning evaluation using {} of {}",
+    log.info("Beginning evaluation using {} of {}",
       trainingPercentage, dataModel);
     
     int numUsers = dataModel.getNumUsers();
@@ -129,7 +129,7 @@
     Recommender recommender = recommenderBuilder.buildRecommender(trainingModel);
     
     double result = getEvaluation(testUserPrefs, recommender);
-    AbstractDifferenceRecommenderEvaluator.log.info("Evaluation result: {}", result);
+    log.info("Evaluation result: {}", result);
     return result;
   }
   
@@ -180,7 +180,7 @@
     for (Map.Entry<Long,PreferenceArray> entry : testUserPrefs.entrySet()) {
       estimateCallables.add(new PreferenceEstimateCallable(recommender, entry.getKey(), entry.getValue()));
     }
-    AbstractDifferenceRecommenderEvaluator.log.info("Beginning evaluation of {} users", estimateCallables
+    log.info("Beginning evaluation of {} users", estimateCallables
         .size());
     AbstractDifferenceRecommenderEvaluator.execute(estimateCallables);
     return computeFinalEvaluation();
@@ -190,7 +190,7 @@
     callables = AbstractDifferenceRecommenderEvaluator.wrapWithStatsCallables(callables);
     int numProcessors = Runtime.getRuntime().availableProcessors();
     ExecutorService executor = Executors.newFixedThreadPool(numProcessors);
-    AbstractDifferenceRecommenderEvaluator.log.info("Starting timing of {} tasks in {} threads", callables
+    log.info("Starting timing of {} tasks in {} threads", callables
         .size(), numProcessors);
     try {
       List<Future<Void>> futures = executor.invokeAll(callables);
@@ -247,10 +247,10 @@
         } catch (NoSuchUserException nsue) {
           // It's possible that an item exists in the test data but not training data in which case
           // NSEE will be thrown. Just ignore it and move on.
-          AbstractDifferenceRecommenderEvaluator.log.info(
+          log.info(
             "User exists in test data but not training data: {}", testUserID);
         } catch (NoSuchItemException nsie) {
-          AbstractDifferenceRecommenderEvaluator.log.info(
+          log.info(
             "Item exists in test data but not training data: {}", realPref.getItemID());
         }
         if (!Float.isNaN(estimatedPreference)) {
@@ -284,10 +284,10 @@
       if (logStats) {
         Runtime runtime = Runtime.getRuntime();
         int average = (int) timing.getAverage();
-        AbstractDifferenceRecommenderEvaluator.log.info("Average time per recommendation: {}ms", average);
+        log.info("Average time per recommendation: {}ms", average);
         long totalMemory = runtime.totalMemory();
         long memory = totalMemory - runtime.freeMemory();
-        AbstractDifferenceRecommenderEvaluator.log.info("Approximate memory used: {}MB / {}MB",
+        log.info("Approximate memory used: {}MB / {}MB",
           memory / 1000000L, totalMemory / 1000000L);
       }
       return null;

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=910282&r1=910281&r2=910282&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 Mon Feb 15 18:17:54 2010
@@ -161,7 +161,7 @@
           long end = System.currentTimeMillis();
           GenericRecommenderIRStatsEvaluator.log
               .info("Evaluated with user {} in {}ms", userID, (end - start));
-          GenericRecommenderIRStatsEvaluator.log.info("Precision/recall/fall-out: {} / {} / {}",
+          log.info("Precision/recall/fall-out: {} / {} / {}",
             new Object[] {precision.getAverage(), recall.getAverage(), fallOut.getAverage()});
         }
       }

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/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=910282&r1=910281&r2=910282&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 Mon Feb 15 18:17:54 2010
@@ -86,10 +86,10 @@
         prefsForItem.add(preference);
       }
       if (++currentCount % 10000 == 0) {
-        GenericDataModel.log.info("Processed {} users", currentCount);
+        log.info("Processed {} users", currentCount);
       }
     }
-    GenericDataModel.log.info("Processed {} users", currentCount);
+    log.info("Processed {} users", currentCount);
     
     this.itemIDs = itemIDSet.toArray();
     itemIDSet = null; // Might help GC -- this is big

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java Mon Feb 15 18:17:54 2010
@@ -125,7 +125,7 @@
   
   @Override
   public void sortByUser() {
-    selectionSort(GenericItemPreferenceArray.USER);
+    selectionSort(USER);
   }
   
   @Override
@@ -133,12 +133,12 @@
   
   @Override
   public void sortByValue() {
-    selectionSort(GenericItemPreferenceArray.VALUE);
+    selectionSort(VALUE);
   }
   
   @Override
   public void sortByValueReversed() {
-    selectionSort(GenericItemPreferenceArray.VALUE_REVERSED);
+    selectionSort(VALUE_REVERSED);
   }
   
   @Override

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java Mon Feb 15 18:17:54 2010
@@ -129,17 +129,17 @@
   
   @Override
   public void sortByItem() {
-    selectionSort(GenericUserPreferenceArray.ITEM);
+    selectionSort(ITEM);
   }
   
   @Override
   public void sortByValue() {
-    selectionSort(GenericUserPreferenceArray.VALUE);
+    selectionSort(VALUE);
   }
   
   @Override
   public void sortByValueReversed() {
-    selectionSort(GenericUserPreferenceArray.VALUE_REVERSED);
+    selectionSort(VALUE_REVERSED);
   }
   
   @Override

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=910282&r1=910281&r2=910282&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 Mon Feb 15 18:17:54 2010
@@ -144,7 +144,7 @@
       throw new FileNotFoundException(dataFile.toString());
     }
     
-    FileDataModel.log.info("Creating FileDataModel for file {}", dataFile);
+    log.info("Creating FileDataModel for file {}", dataFile);
     
     this.dataFile = dataFile.getAbsoluteFile();
     this.lastModified = dataFile.lastModified();
@@ -179,7 +179,7 @@
         delegate = buildModel();
         loaded = true;
       } catch (IOException ioe) {
-        FileDataModel.log.warn("Exception while reloading", ioe);
+        log.warn("Exception while reloading", ioe);
       } finally {
         reloadLock.unlock();
       }
@@ -309,7 +309,7 @@
   }
   
   protected void processFile(FileLineIterator dataOrUpdateFileIterator, FastByIDMap<?> data) {
-    FileDataModel.log.info("Reading file info...");
+    log.info("Reading file info...");
     AtomicInteger count = new AtomicInteger();
     while (dataOrUpdateFileIterator.hasNext()) {
       String line = dataOrUpdateFileIterator.next();
@@ -317,11 +317,11 @@
         processLine(line, data);
         int currentCount = count.incrementAndGet();
         if (currentCount % 1000000 == 0) {
-          FileDataModel.log.info("Processed {} lines", currentCount);
+          log.info("Processed {} lines", currentCount);
         }
       }
     }
-    FileDataModel.log.info("Read lines: {}", count.get());
+    log.info("Read lines: {}", count.get());
   }
   
   /**
@@ -483,7 +483,7 @@
   }
   
   protected void processFileWithoutID(FileLineIterator dataOrUpdateFileIterator, FastByIDMap<FastIDSet> data) {
-    FileDataModel.log.info("Reading file info...");
+    log.info("Reading file info...");
     AtomicInteger count = new AtomicInteger();
     while (dataOrUpdateFileIterator.hasNext()) {
       String line = dataOrUpdateFileIterator.next();
@@ -491,11 +491,11 @@
         processLineWithoutID(line, data);
         int currentCount = count.incrementAndGet();
         if (currentCount % 100000 == 0) {
-          FileDataModel.log.info("Processed {} lines", currentCount);
+          log.info("Processed {} lines", currentCount);
         }
       }
     }
-    FileDataModel.log.info("Read lines: {}", count.get());
+    log.info("Read lines: {}", count.get());
   }
   
   protected void processLineWithoutID(String line, FastByIDMap<FastIDSet> data) {
@@ -625,7 +625,7 @@
   public void refresh(Collection<Refreshable> alreadyRefreshed) {
     if ((dataFile.lastModified() > lastModified + FileDataModel.MIN_RELOAD_INTERVAL_MS)
         || (readLastUpdateFileModified() > lastUpdateFileModified + FileDataModel.MIN_RELOAD_INTERVAL_MS)) {
-      FileDataModel.log.debug("File has changed; reloading...");
+      log.debug("File has changed; reloading...");
       reload();
     }
   }

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractBooleanPrefJDBCDataModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractBooleanPrefJDBCDataModel.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractBooleanPrefJDBCDataModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractBooleanPrefJDBCDataModel.java Mon Feb 15 18:17:54 2010
@@ -71,7 +71,7 @@
       throw new IllegalArgumentException("Invalid value: " + value);
     }
     
-    AbstractBooleanPrefJDBCDataModel.log.debug("Setting preference for user {}, item {}", userID, itemID);
+    log.debug("Setting preference for user {}, item {}", userID, itemID);
     
     Connection conn = null;
     PreparedStatement stmt = null;
@@ -82,15 +82,15 @@
       setLongParameter(stmt, 1, userID);
       setLongParameter(stmt, 2, itemID);
       
-      AbstractBooleanPrefJDBCDataModel.log.debug("Executing SQL update: {}", setPreferenceSQL);
+      log.debug("Executing SQL update: {}", setPreferenceSQL);
       stmt.executeUpdate();
       
     } catch (SQLException sqle) {
-      AbstractBooleanPrefJDBCDataModel.log.warn("Exception while setting preference", sqle);
+      log.warn("Exception while setting preference", sqle);
       throw new TasteException(sqle);
     } finally {
       IOUtils.quietClose(null, stmt, conn);
     }
   }
   
-}
\ No newline at end of file
+}

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=910282&r1=910281&r2=910282&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 Mon Feb 15 18:17:54 2010
@@ -136,7 +136,7 @@
                                   String getNumPreferenceForItemSQL,
                                   String getNumPreferenceForItemsSQL) {
     
-    AbstractJDBCDataModel.log.debug("Creating AbstractJDBCModel...");
+    log.debug("Creating AbstractJDBCModel...");
     
     AbstractJDBCComponent.checkNotNullAndLog("preferenceTable", preferenceTable);
     AbstractJDBCComponent.checkNotNullAndLog("userIDColumn", userIDColumn);
@@ -212,7 +212,7 @@
   
   @Override
   public LongPrimitiveIterator getUserIDs() throws TasteException {
-    AbstractJDBCDataModel.log.debug("Retrieving all users...");
+    log.debug("Retrieving all users...");
     return new ResultSetIDIterator(getUsersSQL);
   }
   
@@ -223,7 +223,7 @@
   @Override
   public PreferenceArray getPreferencesFromUser(long id) throws TasteException {
     
-    AbstractJDBCDataModel.log.debug("Retrieving user ID '{}'", id);
+    log.debug("Retrieving user ID '{}'", id);
     
     Connection conn = null;
     PreparedStatement stmt = null;
@@ -236,7 +236,7 @@
       stmt.setFetchSize(getFetchSize());
       setLongParameter(stmt, 1, id);
       
-      AbstractJDBCDataModel.log.debug("Executing SQL query: {}", getUserSQL);
+      log.debug("Executing SQL query: {}", getUserSQL);
       rs = stmt.executeQuery();
       
       List<Preference> prefs = new ArrayList<Preference>();
@@ -251,7 +251,7 @@
       return new GenericUserPreferenceArray(prefs);
       
     } catch (SQLException sqle) {
-      AbstractJDBCDataModel.log.warn("Exception while retrieving user", sqle);
+      log.warn("Exception while retrieving user", sqle);
       throw new TasteException(sqle);
     } finally {
       IOUtils.quietClose(rs, stmt, conn);
@@ -261,7 +261,7 @@
   
   @Override
   public FastByIDMap<PreferenceArray> exportWithPrefs() throws TasteException {
-    AbstractJDBCDataModel.log.debug("Exporting all data");
+    log.debug("Exporting all data");
     
     Connection conn = null;
     Statement stmt = null;
@@ -275,7 +275,7 @@
       stmt.setFetchDirection(ResultSet.FETCH_FORWARD);
       stmt.setFetchSize(getFetchSize());
       
-      AbstractJDBCDataModel.log.debug("Executing SQL query: {}", getAllUsersSQL);
+      log.debug("Executing SQL query: {}", getAllUsersSQL);
       rs = stmt.executeQuery(getAllUsersSQL);
       
       Long currentUserID = null;
@@ -299,7 +299,7 @@
       return result;
       
     } catch (SQLException sqle) {
-      AbstractJDBCDataModel.log.warn("Exception while exporting all data", sqle);
+      log.warn("Exception while exporting all data", sqle);
       throw new TasteException(sqle);
     } finally {
       IOUtils.quietClose(rs, stmt, conn);
@@ -309,7 +309,7 @@
   
   @Override
   public FastByIDMap<FastIDSet> exportWithIDsOnly() throws TasteException {
-    AbstractJDBCDataModel.log.debug("Exporting all data");
+    log.debug("Exporting all data");
     
     Connection conn = null;
     Statement stmt = null;
@@ -323,7 +323,7 @@
       stmt.setFetchDirection(ResultSet.FETCH_FORWARD);
       stmt.setFetchSize(getFetchSize());
       
-      AbstractJDBCDataModel.log.debug("Executing SQL query: {}", getAllUsersSQL);
+      log.debug("Executing SQL query: {}", getAllUsersSQL);
       rs = stmt.executeQuery(getAllUsersSQL);
       
       boolean currentUserIDSet = false;
@@ -349,7 +349,7 @@
       return result;
       
     } catch (SQLException sqle) {
-      AbstractJDBCDataModel.log.warn("Exception while exporting all data", sqle);
+      log.warn("Exception while exporting all data", sqle);
       throw new TasteException(sqle);
     } finally {
       IOUtils.quietClose(rs, stmt, conn);
@@ -364,7 +364,7 @@
   @Override
   public FastIDSet getItemIDsFromUser(long id) throws TasteException {
     
-    AbstractJDBCDataModel.log.debug("Retrieving items for user ID '{}'", id);
+    log.debug("Retrieving items for user ID '{}'", id);
     
     Connection conn = null;
     PreparedStatement stmt = null;
@@ -377,7 +377,7 @@
       stmt.setFetchSize(getFetchSize());
       setLongParameter(stmt, 1, id);
       
-      AbstractJDBCDataModel.log.debug("Executing SQL query: {}", getUserSQL);
+      log.debug("Executing SQL query: {}", getUserSQL);
       rs = stmt.executeQuery();
       
       FastIDSet result = new FastIDSet();
@@ -392,7 +392,7 @@
       return result;
       
     } catch (SQLException sqle) {
-      AbstractJDBCDataModel.log.warn("Exception while retrieving item s", sqle);
+      log.warn("Exception while retrieving item s", sqle);
       throw new TasteException(sqle);
     } finally {
       IOUtils.quietClose(rs, stmt, conn);
@@ -402,7 +402,7 @@
   
   @Override
   public Float getPreferenceValue(long userID, long itemID) throws TasteException {
-    AbstractJDBCDataModel.log.debug("Retrieving preferences for item ID '{}'", itemID);
+    log.debug("Retrieving preferences for item ID '{}'", itemID);
     Connection conn = null;
     PreparedStatement stmt = null;
     ResultSet rs = null;
@@ -414,7 +414,7 @@
       setLongParameter(stmt, 1, userID);
       setLongParameter(stmt, 2, itemID);
       
-      AbstractJDBCDataModel.log.debug("Executing SQL query: {}", getPreferenceSQL);
+      log.debug("Executing SQL query: {}", getPreferenceSQL);
       rs = stmt.executeQuery();
       if (rs.next()) {
         return rs.getFloat(1);
@@ -422,7 +422,7 @@
         return null;
       }
     } catch (SQLException sqle) {
-      AbstractJDBCDataModel.log.warn("Exception while retrieving prefs for item", sqle);
+      log.warn("Exception while retrieving prefs for item", sqle);
       throw new TasteException(sqle);
     } finally {
       IOUtils.quietClose(rs, stmt, conn);
@@ -431,7 +431,7 @@
   
   @Override
   public LongPrimitiveIterator getItemIDs() throws TasteException {
-    AbstractJDBCDataModel.log.debug("Retrieving all items...");
+    log.debug("Retrieving all items...");
     return new ResultSetIDIterator(getItemsSQL);
   }
   
@@ -442,7 +442,7 @@
   }
   
   protected List<Preference> doGetPreferencesForItem(long itemID) throws TasteException {
-    AbstractJDBCDataModel.log.debug("Retrieving preferences for item ID '{}'", itemID);
+    log.debug("Retrieving preferences for item ID '{}'", itemID);
     Connection conn = null;
     PreparedStatement stmt = null;
     ResultSet rs = null;
@@ -454,7 +454,7 @@
       stmt.setFetchSize(getFetchSize());
       setLongParameter(stmt, 1, itemID);
       
-      AbstractJDBCDataModel.log.debug("Executing SQL query: {}", getPrefsForItemSQL);
+      log.debug("Executing SQL query: {}", getPrefsForItemSQL);
       rs = stmt.executeQuery();
       List<Preference> prefs = new ArrayList<Preference>();
       while (rs.next()) {
@@ -462,7 +462,7 @@
       }
       return prefs;
     } catch (SQLException sqle) {
-      AbstractJDBCDataModel.log.warn("Exception while retrieving prefs for item", sqle);
+      log.warn("Exception while retrieving prefs for item", sqle);
       throw new TasteException(sqle);
     } finally {
       IOUtils.quietClose(rs, stmt, conn);
@@ -499,7 +499,7 @@
   }
   
   private int getNumThings(String name, String sql, long... args) throws TasteException {
-    AbstractJDBCDataModel.log.debug("Retrieving number of {} in model", name);
+    log.debug("Retrieving number of {} in model", name);
     Connection conn = null;
     PreparedStatement stmt = null;
     ResultSet rs = null;
@@ -513,12 +513,12 @@
           setLongParameter(stmt, i, args[i - 1]);
         }
       }
-      AbstractJDBCDataModel.log.debug("Executing SQL query: {}", sql);
+      log.debug("Executing SQL query: {}", sql);
       rs = stmt.executeQuery();
       rs.next();
       return rs.getInt(1);
     } catch (SQLException sqle) {
-      AbstractJDBCDataModel.log.warn("Exception while retrieving number of {}", name, sqle);
+      log.warn("Exception while retrieving number of {}", name, sqle);
       throw new TasteException(sqle);
     } finally {
       IOUtils.quietClose(rs, stmt, conn);
@@ -531,7 +531,7 @@
       throw new IllegalArgumentException("Invalid value: " + value);
     }
     
-    AbstractJDBCDataModel.log.debug("Setting preference for user {}, item {}", userID, itemID);
+    log.debug("Setting preference for user {}, item {}", userID, itemID);
     
     Connection conn = null;
     PreparedStatement stmt = null;
@@ -544,11 +544,11 @@
       stmt.setDouble(3, value);
       stmt.setDouble(4, value);
       
-      AbstractJDBCDataModel.log.debug("Executing SQL update: {}", setPreferenceSQL);
+      log.debug("Executing SQL update: {}", setPreferenceSQL);
       stmt.executeUpdate();
       
     } catch (SQLException sqle) {
-      AbstractJDBCDataModel.log.warn("Exception while setting preference", sqle);
+      log.warn("Exception while setting preference", sqle);
       throw new TasteException(sqle);
     } finally {
       IOUtils.quietClose(null, stmt, conn);
@@ -558,7 +558,7 @@
   @Override
   public void removePreference(long userID, long itemID) throws TasteException {
     
-    AbstractJDBCDataModel.log.debug("Removing preference for user '{}', item '{}'", userID, itemID);
+    log.debug("Removing preference for user '{}', item '{}'", userID, itemID);
     
     Connection conn = null;
     PreparedStatement stmt = null;
@@ -569,11 +569,11 @@
       setLongParameter(stmt, 1, userID);
       setLongParameter(stmt, 2, itemID);
       
-      AbstractJDBCDataModel.log.debug("Executing SQL update: {}", removePreferenceSQL);
+      log.debug("Executing SQL update: {}", removePreferenceSQL);
       stmt.executeUpdate();
       
     } catch (SQLException sqle) {
-      AbstractJDBCDataModel.log.warn("Exception while removing preference", sqle);
+      log.warn("Exception while removing preference", sqle);
       throw new TasteException(sqle);
     } finally {
       IOUtils.quietClose(null, stmt, conn);
@@ -633,7 +633,7 @@
         statement = connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
         statement.setFetchDirection(ResultSet.FETCH_FORWARD);
         statement.setFetchSize(getFetchSize());
-        AbstractJDBCDataModel.log.debug("Executing SQL query: {}", sql);
+        log.debug("Executing SQL query: {}", sql);
         resultSet = statement.executeQuery(sql);
         boolean anyResults = resultSet.next();
         if (!anyResults) {
@@ -656,7 +656,7 @@
             nextExists = true;
           }
         } catch (SQLException sqle) {
-          AbstractJDBCDataModel.log.warn("Unexpected exception while accessing ResultSet; continuing...",
+          log.warn("Unexpected exception while accessing ResultSet; continuing...",
             sqle);
           close();
         }
@@ -682,7 +682,7 @@
         return ID;
       } catch (SQLException sqle) {
         // No good way to handle this since we can't throw an exception
-        AbstractJDBCDataModel.log.warn("Exception while iterating", sqle);
+        log.warn("Exception while iterating", sqle);
         close();
         throw new NoSuchElementException("Can't retrieve more due to exception: " + sqle);
       }
@@ -698,7 +698,7 @@
         return getLongColumn(resultSet, 1);
       } catch (SQLException sqle) {
         // No good way to handle this since we can't throw an exception
-        AbstractJDBCDataModel.log.warn("Exception while iterating", sqle);
+        log.warn("Exception while iterating", sqle);
         close();
         throw new NoSuchElementException("Can't retrieve more due to exception: " + sqle);
       }
@@ -726,7 +726,7 @@
         try {
           advanceResultSet(resultSet, n);
         } catch (SQLException sqle) {
-          AbstractJDBCDataModel.log.warn("Exception while iterating over items", sqle);
+          log.warn("Exception while iterating over items", sqle);
           close();
         }
       }

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=910282&r1=910281&r2=910282&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 Mon Feb 15 18:17:54 2010
@@ -67,7 +67,7 @@
     if (Double.isNaN(value)) {
       throw new IllegalArgumentException("Invalid value: " + value);
     }
-    AbstractRecommender.log.debug("Setting preference for user {}, item {}", userID, itemID);
+    log.debug("Setting preference for user {}, item {}", userID, itemID);
     dataModel.setPreference(userID, itemID, value);
   }
   
@@ -81,7 +81,7 @@
    */
   @Override
   public void removePreference(long userID, long itemID) throws TasteException {
-    AbstractRecommender.log.debug("Remove preference for user '{}', item '{}'", userID, itemID);
+    log.debug("Remove preference for user '{}', item '{}'", userID, itemID);
     dataModel.removePreference(userID, itemID);
   }
   

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommender.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommender.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommender.java Mon Feb 15 18:17:54 2010
@@ -162,7 +162,7 @@
    *          clear cached data associated with this user ID
    */
   public void clear(long userID) {
-    CachingRecommender.log.debug("Clearing recommendations for user ID '{}'", userID);
+    log.debug("Clearing recommendations for user ID '{}'", userID);
     recommendationCache.remove(userID);
   }
   
@@ -172,7 +172,7 @@
    * </p>
    */
   public void clear() {
-    CachingRecommender.log.debug("Clearing all recommendations...");
+    log.debug("Clearing all recommendations...");
     recommendationCache.clear();
   }
   
@@ -191,7 +191,7 @@
     
     @Override
     public Recommendations get(Long key) throws TasteException {
-      CachingRecommender.log.debug("Retrieving new recommendations for user ID '{}'", key);
+      log.debug("Retrieving new recommendations for user ID '{}'", key);
       int howMany = maxHowMany[0];
       IDRescorer rescorer = getCurrentRescorer();
       List<RecommendedItem> recommendations = rescorer == null ? recommender.recommend(key, howMany)
@@ -212,7 +212,7 @@
     public Float get(LongPair key) throws TasteException {
       long userID = key.getFirst();
       long itemID = key.getSecond();
-      CachingRecommender.log.debug("Retrieving estimated preference for user ID '{}' and item ID '{}'",
+      log.debug("Retrieving estimated preference for user ID '{}' and item ID '{}'",
         userID, itemID);
       return recommender.estimatePreference(userID, itemID);
     }

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java Mon Feb 15 18:17:54 2010
@@ -89,7 +89,7 @@
       throw new IllegalArgumentException("howMany must be at least 1");
     }
     
-    GenericItemBasedRecommender.log.debug("Recommending items for user ID '{}'", userID);
+    log.debug("Recommending items for user ID '{}'", userID);
     
     if (getNumPreferences(userID) == 0) {
       return Collections.emptyList();
@@ -102,7 +102,7 @@
     List<RecommendedItem> topItems = TopItems.getTopItems(howMany, possibleItemIDs.iterator(), rescorer,
       estimator);
     
-    GenericItemBasedRecommender.log.debug("Recommendations are: {}", topItems);
+    log.debug("Recommendations are: {}", topItems);
     return topItems;
   }
   
@@ -122,7 +122,8 @@
   }
   
   @Override
-  public List<RecommendedItem> mostSimilarItems(long itemID, int howMany, Rescorer<LongPair> rescorer) throws TasteException {
+  public List<RecommendedItem> mostSimilarItems(long itemID, int howMany,
+                                                Rescorer<LongPair> rescorer) throws TasteException {
     TopItems.Estimator<Long> estimator = new MostSimilarEstimator(itemID, similarity, rescorer);
     return doMostSimilarItems(new long[] {itemID}, howMany, estimator);
   }
@@ -133,7 +134,8 @@
   }
   
   @Override
-  public List<RecommendedItem> mostSimilarItems(long[] itemIDs, int howMany, Rescorer<LongPair> rescorer) throws TasteException {
+  public List<RecommendedItem> mostSimilarItems(long[] itemIDs, int howMany,
+                                                Rescorer<LongPair> rescorer) throws TasteException {
     TopItems.Estimator<Long> estimator = new MultiMostSimilarEstimator(itemIDs, similarity, rescorer);
     return doMostSimilarItems(itemIDs, howMany, estimator);
   }

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java Mon Feb 15 18:17:54 2010
@@ -76,7 +76,7 @@
       throw new IllegalArgumentException("howMany must be at least 1");
     }
     
-    GenericUserBasedRecommender.log.debug("Recommending items for user ID '{}'", userID);
+    log.debug("Recommending items for user ID '{}'", userID);
     
     long[] theNeighborhood = neighborhood.getUserNeighborhood(userID);
     
@@ -91,7 +91,7 @@
     List<RecommendedItem> topItems = TopItems
         .getTopItems(howMany, allItemIDs.iterator(), rescorer, estimator);
     
-    GenericUserBasedRecommender.log.debug("Recommendations are: {}", topItems);
+    log.debug("Recommendations are: {}", topItems);
     return topItems;
   }
   

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemAverageRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemAverageRecommender.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemAverageRecommender.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemAverageRecommender.java Mon Feb 15 18:17:54 2010
@@ -74,7 +74,7 @@
     if (howMany < 1) {
       throw new IllegalArgumentException("howMany must be at least 1");
     }
-    ItemAverageRecommender.log.debug("Recommending items for user ID '{}'", userID);
+    log.debug("Recommending items for user ID '{}'", userID);
     checkAverageDiffsBuilt();
     
     FastIDSet possibleItemIDs = getAllOtherItems(userID);
@@ -84,7 +84,7 @@
     List<RecommendedItem> topItems = TopItems.getTopItems(howMany, possibleItemIDs.iterator(), rescorer,
       estimator);
     
-    ItemAverageRecommender.log.debug("Recommendations are: {}", topItems);
+    log.debug("Recommendations are: {}", topItems);
     return topItems;
   }
   

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemUserAverageRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemUserAverageRecommender.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemUserAverageRecommender.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ItemUserAverageRecommender.java Mon Feb 15 18:17:54 2010
@@ -79,7 +79,7 @@
     if (howMany < 1) {
       throw new IllegalArgumentException("howMany must be at least 1");
     }
-    ItemUserAverageRecommender.log.debug("Recommending items for user ID '{}'", userID);
+    log.debug("Recommending items for user ID '{}'", userID);
     checkAverageDiffsBuilt();
     
     FastIDSet possibleItemIDs = getAllOtherItems(userID);
@@ -89,7 +89,7 @@
     List<RecommendedItem> topItems = TopItems.getTopItems(howMany, possibleItemIDs.iterator(), rescorer,
       estimator);
     
-    ItemUserAverageRecommender.log.debug("Recommendations are: {}", topItems);
+    log.debug("Recommendations are: {}", topItems);
     return topItems;
   }
   

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TopItems.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TopItems.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TopItems.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TopItems.java Mon Feb 15 18:17:54 2010
@@ -135,10 +135,11 @@
    * @see GenericItemSimilarity#GenericItemSimilarity(org.apache.mahout.cf.taste.similarity.ItemSimilarity,
    *      org.apache.mahout.cf.taste.model.DataModel, int)
    */
-  public static List<GenericItemSimilarity.ItemItemSimilarity> getTopItemItemSimilarities(int howMany,
-                                                                                          Iterable<GenericItemSimilarity.ItemItemSimilarity> allSimilarities) {
-    Queue<GenericItemSimilarity.ItemItemSimilarity> topSimilarities = new PriorityQueue<GenericItemSimilarity.ItemItemSimilarity>(
-        howMany + 1, Collections.reverseOrder());
+  public static List<GenericItemSimilarity.ItemItemSimilarity> getTopItemItemSimilarities(
+    int howMany, Iterable<GenericItemSimilarity.ItemItemSimilarity> allSimilarities) {
+    
+    Queue<GenericItemSimilarity.ItemItemSimilarity> topSimilarities
+      = new PriorityQueue<GenericItemSimilarity.ItemItemSimilarity>(howMany + 1, Collections.reverseOrder());
     boolean full = false;
     double lowestTopValue = Double.NEGATIVE_INFINITY;
     for (GenericItemSimilarity.ItemItemSimilarity similarity : allSimilarities) {
@@ -161,10 +162,11 @@
     return result;
   }
   
-  public static List<GenericUserSimilarity.UserUserSimilarity> getTopUserUserSimilarities(int howMany,
-                                                                                          Iterable<GenericUserSimilarity.UserUserSimilarity> allSimilarities) {
-    Queue<GenericUserSimilarity.UserUserSimilarity> topSimilarities = new PriorityQueue<GenericUserSimilarity.UserUserSimilarity>(
-        howMany + 1, Collections.reverseOrder());
+  public static List<GenericUserSimilarity.UserUserSimilarity>getTopUserUserSimilarities(
+    int howMany, Iterable<GenericUserSimilarity.UserUserSimilarity> allSimilarities) {
+    
+    Queue<GenericUserSimilarity.UserUserSimilarity> topSimilarities
+      = new PriorityQueue<GenericUserSimilarity.UserUserSimilarity>(howMany + 1, Collections.reverseOrder());
     boolean full = false;
     double lowestTopValue = Double.NEGATIVE_INFINITY;
     for (GenericUserSimilarity.UserUserSimilarity similarity : allSimilarities) {

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java Mon Feb 15 18:17:54 2010
@@ -208,7 +208,7 @@
     }
     checkClustersBuilt();
     
-    TreeClusteringRecommender.log.debug("Recommending items for user ID '{}'", userID);
+    log.debug("Recommending items for user ID '{}'", userID);
     
     List<RecommendedItem> recommended = topRecsByUserID.get(userID);
     if (recommended == null) {
@@ -291,12 +291,12 @@
           findClusters(newClusters);
         }
         topRecsByUserID = computeTopRecsPerUserID(newClusters);
-        clustersByUserID = TreeClusteringRecommender.computeClustersPerUserID(newClusters);
+        clustersByUserID = computeClustersPerUserID(newClusters);
         allClusters = newClusters.toArray(new FastIDSet[newClusters.size()]);
       } else {
         topRecsByUserID = new FastByIDMap<List<RecommendedItem>>();
         clustersByUserID = new FastByIDMap<FastIDSet>();
-        allClusters = TreeClusteringRecommender.NO_CLUSTERS;
+        allClusters = NO_CLUSTERS;
       }
       clustersBuilt = true;
     } finally {
@@ -350,7 +350,7 @@
     for (int i = 0; i < size; i++) {
       FastIDSet cluster1 = clusters.get(i);
       for (int j = i + 1; j < size; j++) {
-        if ((samplingRate >= 1.0) || (TreeClusteringRecommender.r.nextDouble() < samplingRate)) {
+        if ((samplingRate >= 1.0) || (r.nextDouble() < samplingRate)) {
           FastIDSet cluster2 = clusters.get(j);
           double similarity = clusterSimilarity.getSimilarity(cluster1, cluster2);
           if (!Double.isNaN(similarity) && (similarity > bestSimilarity)) {
@@ -385,10 +385,10 @@
     
     TopItems.Estimator<Long> estimator = new Estimator(cluster);
     
-    List<RecommendedItem> topItems = TopItems.getTopItems(TreeClusteringRecommender.NUM_CLUSTER_RECS,
+    List<RecommendedItem> topItems = TopItems.getTopItems(NUM_CLUSTER_RECS,
       possibleItemIDs.iterator(), null, estimator);
     
-    TreeClusteringRecommender.log.debug("Recommendations are: {}", topItems);
+    log.debug("Recommendations are: {}", topItems);
     return Collections.unmodifiableList(topItems);
   }
   

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2.java Mon Feb 15 18:17:54 2010
@@ -162,7 +162,7 @@
     }
     checkClustersBuilt();
     
-    TreeClusteringRecommender2.log.debug("Recommending items for user ID '{}'", userID);
+    log.debug("Recommending items for user ID '{}'", userID);
     
     List<RecommendedItem> recommended = topRecsByUserID.get(userID);
     if (recommended == null) {
@@ -307,7 +307,7 @@
         }
         
         topRecsByUserID = computeTopRecsPerUserID(clusters);
-        clustersByUserID = TreeClusteringRecommender2.computeClustersPerUserID(clusters);
+        clustersByUserID = computeClustersPerUserID(clusters);
         allClusters = clusters.toArray(new FastIDSet[clusters.size()]);
         
       }
@@ -400,7 +400,8 @@
     return done;
   }
   
-  private LinkedList<ClusterClusterPair> findClosestClusters(int numUsers, List<FastIDSet> clusters) throws TasteException {
+  private LinkedList<ClusterClusterPair> findClosestClusters(int numUsers,
+                                                             List<FastIDSet> clusters) throws TasteException {
     boolean full = false;
     LinkedList<ClusterClusterPair> queue = new LinkedList<ClusterClusterPair>();
     int i = 0;
@@ -454,10 +455,10 @@
     
     TopItems.Estimator<Long> estimator = new Estimator(cluster);
     
-    List<RecommendedItem> topItems = TopItems.getTopItems(TreeClusteringRecommender2.NUM_CLUSTER_RECS,
+    List<RecommendedItem> topItems = TopItems.getTopItems(NUM_CLUSTER_RECS,
       possibleItemIDs.iterator(), null, estimator);
     
-    TreeClusteringRecommender2.log.debug("Recommendations are: {}", topItems);
+    log.debug("Recommendations are: {}", topItems);
     return Collections.unmodifiableList(topItems);
   }
   

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/knn/ConjugateGradientOptimizer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/knn/ConjugateGradientOptimizer.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/knn/ConjugateGradientOptimizer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/knn/ConjugateGradientOptimizer.java Mon Feb 15 18:17:54 2010
@@ -81,7 +81,7 @@
       w[i] = -ri;
     }
     
-    for (int iteration = 0; iteration < ConjugateGradientOptimizer.MAX_ITERATIONS; iteration++) {
+    for (int iteration = 0; iteration < MAX_ITERATIONS; iteration++) {
       
       // z = A*w;
       for (int i = 0; i < k; i++) {
@@ -115,7 +115,7 @@
         double value = r[i];
         rdot += value * value;
       }
-      if (rdot <= ConjugateGradientOptimizer.CONVERGENCE_LIMIT) {
+      if (rdot <= CONVERGENCE_LIMIT) {
         break;
       }
       

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/knn/NonNegativeQuadraticOptimizer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/knn/NonNegativeQuadraticOptimizer.java?rev=910282&r1=910281&r2=910282&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/knn/NonNegativeQuadraticOptimizer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/knn/NonNegativeQuadraticOptimizer.java Mon Feb 15 18:17:54 2010
@@ -46,7 +46,7 @@
     double[] x = new double[k];
     Arrays.fill(x, 3.0 / k);
     
-    for (int iteration = 0; iteration < NonNegativeQuadraticOptimizer.MAX_ITERATIONS; iteration++) {
+    for (int iteration = 0; iteration < MAX_ITERATIONS; iteration++) {
       
       double rdot = 0.0;
       for (int n = 0; n < k; n++) {
@@ -60,7 +60,7 @@
         
         // find active variables - those that are pinned due to
         // nonnegativity constraints; set respective ri's to zero
-        if ((x[n] < NonNegativeQuadraticOptimizer.EPSILON) && (rn < 0.0)) {
+        if ((x[n] < EPSILON) && (rn < 0.0)) {
           rn = 0.0;
         } else {
           // max step size numerator
@@ -69,7 +69,7 @@
         r[n] = rn;
       }
       
-      if (rdot <= NonNegativeQuadraticOptimizer.CONVERGENCE_LIMIT) {
+      if (rdot <= CONVERGENCE_LIMIT) {
         break;
       }
       
@@ -88,7 +88,7 @@
       double stepSize = rdot / rArdotSum;
       
       if (Double.isNaN(stepSize)) {
-        stepSize = NonNegativeQuadraticOptimizer.DEFAULT_STEP;
+        stepSize = DEFAULT_STEP;
       }
       
       // adjust step size to prevent negative values
@@ -102,7 +102,7 @@
       // update x values
       for (int n = 0; n < k; n++) {
         x[n] += stepSize * r[n];
-        if (x[n] < NonNegativeQuadraticOptimizer.EPSILON) {
+        if (x[n] < EPSILON) {
           x[n] = 0.0;
         }
       }



Mime
View raw message