You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2010/02/16 11:41:47 UTC
svn commit: r910458 [1/3] - 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...
Author: srowen
Date: Tue Feb 16 10:41:38 2010
New Revision: 910458
URL: http://svn.apache.org/viewvc?rev=910458&view=rev
Log:
Reverses the static-qualifier changes, and also does away with some related code issues like missorted or redundant modifiers
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/ItemItemWritable.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/MapFilesMap.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/TupleWritable.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ItemIDIndexMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/slopeone/ByItemIDComparator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.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/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/AbstractIDMigrator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/MySQLJDBCIDMigrator.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/NullRescorer.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/svd/ExpectationMaximizationSVD.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/AveragingPreferenceInferrer.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/MySQLJDBCItemSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/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/CBayesAlgorithm.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/common/BayesFeatureMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.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/CanopyDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletCluster.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/AsymmetricSampledNormalModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/L1Model.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansJob.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/MeanShiftCanopyDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/FileLineIterable.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/FileLineIterator.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/Pair.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringRecordIterator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/HybridCache.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LFUCache.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LRUCache.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LeastKCache.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/FixedSizeSamplingIterator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/IteratorUtils.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/StableFixedSizeSamplingIterator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/builder/DefaultTreeBuilder.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/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/InMemBuilder.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/Step0Job.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/InMemBuilder.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/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/ref/SequentialBuilder.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/DefaultIgSplit.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/OptIgSplit.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/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/ParallelCountingMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionSortingReducer.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/convertors/ContextStatusUpdater.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/FPTreeDepthCache.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/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/NetflixFileDataModel.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/clustering/canopy/DisplayCanopy.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/DisplayASNDirichlet.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNOutputState.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayNDirichlet.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayOutputState.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplaySNDirichlet.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/kmeans/DisplayKMeans.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.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/kmeans/Job.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/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/ga/watchmaker/cd/CDCrossover.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/hadoop/CDMahoutEvaluator.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/ToolCombiner.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/TravellingSalesman.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/text/SequenceFilesFromDirectory.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaToSequenceFile.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.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/Gram.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/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/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/term/TermCountReducer.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/term/TermDocumentCountMapper.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/vectors/arff/ARFFVectorIterableTest.java
lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.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=910458&r1=910457&r2=910458&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 Tue Feb 16 10:41:38 2010
@@ -63,11 +63,11 @@
}
protected static Option buildOption(String name, String shortName, String description) {
- return AbstractJob.buildOption(name, shortName, description, true, null);
+ return buildOption(name, shortName, description, true, null);
}
protected static Option buildOption(String name, String shortName, String description, String defaultValue) {
- return AbstractJob.buildOption(name, shortName, description, false, defaultValue);
+ return buildOption(name, shortName, description, false, defaultValue);
}
private static Option buildOption(String name,
@@ -87,10 +87,10 @@
protected static Map<String,String> parseArguments(String[] args, Option... extraOpts) {
Option inputOpt = DefaultOptionCreator.inputOption().create();
- Option tempDirOpt = AbstractJob.buildOption("tempDir", "t", "Intermediate output directory", "temp");
+ Option tempDirOpt = buildOption("tempDir", "t", "Intermediate output directory", "temp");
Option outputOpt = DefaultOptionCreator.outputOption().create();
Option helpOpt = DefaultOptionCreator.helpOption();
- Option jarFileOpt = AbstractJob.buildOption("jarFile", "m", "Implementation jar");
+ Option jarFileOpt = buildOption("jarFile", "m", "Implementation jar");
GroupBuilder gBuilder = new GroupBuilder().withName("Options").withOption(inputOpt)
.withOption(tempDirOpt).withOption(outputOpt).withOption(helpOpt).withOption(jarFileOpt);
@@ -118,13 +118,13 @@
}
Map<String,String> result = new HashMap<String,String>();
- AbstractJob.maybePut(result, cmdLine, inputOpt);
- AbstractJob.maybePut(result, cmdLine, tempDirOpt);
- AbstractJob.maybePut(result, cmdLine, outputOpt);
- AbstractJob.maybePut(result, cmdLine, helpOpt);
- AbstractJob.maybePut(result, cmdLine, jarFileOpt);
+ maybePut(result, cmdLine, inputOpt);
+ maybePut(result, cmdLine, tempDirOpt);
+ maybePut(result, cmdLine, outputOpt);
+ maybePut(result, cmdLine, helpOpt);
+ maybePut(result, cmdLine, jarFileOpt);
for (Option opt : extraOpts) {
- AbstractJob.maybePut(result, cmdLine, opt);
+ maybePut(result, cmdLine, opt);
}
return result;
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=910458&r1=910457&r2=910458&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 Feb 16 10:41:38 2010
@@ -67,8 +67,8 @@
@Override
public int compareTo(ItemItemWritable that) {
- int aCompare = ItemItemWritable.compare(itemAID, that.getItemAID());
- return aCompare == 0 ? ItemItemWritable.compare(itemBID, that.getItemBID()) : aCompare;
+ int aCompare = compare(itemAID, that.getItemAID());
+ return aCompare == 0 ? compare(itemBID, that.getItemBID()) : aCompare;
}
private static int compare(long a, long b) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/MapFilesMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/MapFilesMap.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/MapFilesMap.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/MapFilesMap.java Tue Feb 16 10:41:38 2010
@@ -50,7 +50,7 @@
public MapFilesMap(FileSystem fs, Path parentDir, Configuration conf) throws IOException {
readers = new ArrayList<MapFile.Reader>();
try {
- for (FileStatus status : fs.listStatus(parentDir, MapFilesMap.PARTS_FILTER)) {
+ for (FileStatus status : fs.listStatus(parentDir, PARTS_FILTER)) {
readers.add(new MapFile.Reader(fs, status.getPath().toString(), conf));
}
} catch (IOException ioe) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/TupleWritable.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/TupleWritable.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/TupleWritable.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/cooccurence/TupleWritable.java Tue Feb 16 10:41:38 2010
@@ -17,7 +17,7 @@
@Override
protected Class<? extends Writable>[] getTypes() {
- return (Class<? extends Writable>[]) Field.CLASSES;
+ return (Class<? extends Writable>[]) CLASSES;
}
public Field() { }
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ItemIDIndexMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ItemIDIndexMapper.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ItemIDIndexMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/ItemIDIndexMapper.java Tue Feb 16 10:41:38 2010
@@ -40,7 +40,7 @@
Reporter reporter) throws IOException {
String[] tokens = ItemIDIndexMapper.COMMA.split(value.toString());
long itemID = Long.parseLong(tokens[1]);
- int index = ItemIDIndexMapper.idToIndex(itemID);
+ int index = idToIndex(itemID);
output.collect(new IntWritable(index), new LongWritable(itemID));
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/slopeone/ByItemIDComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/slopeone/ByItemIDComparator.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/slopeone/ByItemIDComparator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/slopeone/ByItemIDComparator.java Tue Feb 16 10:41:38 2010
@@ -27,7 +27,7 @@
private static final Comparator<ItemPrefWritable> instance = new ByItemIDComparator();
public static Comparator<ItemPrefWritable> getInstance() {
- return ByItemIDComparator.instance;
+ return instance;
}
@Override
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java Tue Feb 16 10:41:38 2010
@@ -48,13 +48,13 @@
if (size < 0) {
throw new IllegalArgumentException("size must be at least 0");
}
- int max = (int) (RandomUtils.MAX_INT_SMALLER_TWIN_PRIME / FastIDSet.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);
}
- int hashSize = RandomUtils.nextTwinPrime((int) (FastIDSet.ALLOWED_LOAD_FACTOR * size));
+ int hashSize = RandomUtils.nextTwinPrime((int) (ALLOWED_LOAD_FACTOR * size));
keys = new long[hashSize];
- Arrays.fill(keys, FastIDSet.NULL);
+ Arrays.fill(keys, NULL);
}
/**
@@ -67,7 +67,7 @@
int jump = 1 + theHashCode % (hashSize - 2);
int index = theHashCode % hashSize;
long currentKey = keys[index];
- while ((currentKey != FastIDSet.NULL) && (key != currentKey)) { // note: true when currentKey == REMOVED
+ while ((currentKey != NULL) && (key != currentKey)) { // note: true when currentKey == REMOVED
if (index < jump) {
index += hashSize - jump;
} else {
@@ -88,7 +88,7 @@
int jump = 1 + theHashCode % (hashSize - 2);
int index = theHashCode % hashSize;
long currentKey = keys[index];
- while ((currentKey != FastIDSet.NULL) && (currentKey != FastIDSet.REMOVED) && (key != currentKey)) { // Different
+ while ((currentKey != NULL) && (currentKey != REMOVED) && (key != currentKey)) { // Different
// here
if (index < jump) {
index += hashSize - jump;
@@ -109,17 +109,17 @@
}
public boolean contains(long key) {
- return (key != FastIDSet.NULL) && (key != FastIDSet.REMOVED) && (keys[find(key)] != FastIDSet.NULL);
+ return (key != NULL) && (key != REMOVED) && (keys[find(key)] != NULL);
}
public boolean add(long key) {
- if ((key == FastIDSet.NULL) || (key == FastIDSet.REMOVED)) {
+ if ((key == NULL) || (key == REMOVED)) {
throw new IllegalArgumentException();
}
// If less than half the slots are open, let's clear it up
- if (numSlotsUsed * FastIDSet.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 * FastIDSet.ALLOWED_LOAD_FACTOR >= numSlotsUsed) {
+ if (numEntries * ALLOWED_LOAD_FACTOR >= numSlotsUsed) {
growAndRehash();
} else {
// Otherwise just rehash to clear REMOVED entries and don't grow
@@ -132,7 +132,7 @@
if (keyIndex != key) {
keys[index] = key;
numEntries++;
- if (keyIndex == FastIDSet.NULL) {
+ if (keyIndex == NULL) {
numSlotsUsed++;
}
return true;
@@ -147,7 +147,7 @@
public long[] toArray() {
long[] result = new long[numEntries];
for (int i = 0, position = 0; i < result.length; i++) {
- while ((keys[position] == FastIDSet.NULL) || (keys[position] == FastIDSet.REMOVED)) {
+ while ((keys[position] == NULL) || (keys[position] == REMOVED)) {
position++;
}
result[i] = keys[position++];
@@ -156,14 +156,14 @@
}
public boolean remove(long key) {
- if ((key == FastIDSet.NULL) || (key == FastIDSet.REMOVED)) {
+ if ((key == NULL) || (key == REMOVED)) {
return false;
}
int index = find(key);
- if (keys[index] == FastIDSet.NULL) {
+ if (keys[index] == NULL) {
return false;
} else {
- keys[index] = FastIDSet.REMOVED;
+ keys[index] = REMOVED;
numEntries--;
return true;
}
@@ -182,7 +182,7 @@
public boolean addAll(FastIDSet c) {
boolean changed = false;
for (long k : c.keys) {
- if ((k != FastIDSet.NULL) && (k != FastIDSet.REMOVED) && add(k)) {
+ if ((k != NULL) && (k != REMOVED) && add(k)) {
changed = true;
}
}
@@ -202,7 +202,7 @@
public boolean removeAll(FastIDSet c) {
boolean changed = false;
for (long k : c.keys) {
- if ((k != FastIDSet.NULL) && (k != FastIDSet.REMOVED) && remove(k)) {
+ if ((k != NULL) && (k != REMOVED) && remove(k)) {
changed = true;
}
}
@@ -213,8 +213,8 @@
boolean changed = false;
for (int i = 0; i < keys.length; i++) {
long k = keys[i];
- if ((k != FastIDSet.NULL) && (k != FastIDSet.REMOVED) && !c.contains(k)) {
- keys[i] = FastIDSet.REMOVED;
+ if ((k != NULL) && (k != REMOVED) && !c.contains(k)) {
+ keys[i] = REMOVED;
numEntries--;
changed = true;
}
@@ -225,18 +225,18 @@
public void clear() {
numEntries = 0;
numSlotsUsed = 0;
- Arrays.fill(keys, FastIDSet.NULL);
+ Arrays.fill(keys, NULL);
}
private void growAndRehash() {
- if (keys.length * FastIDSet.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) (FastIDSet.ALLOWED_LOAD_FACTOR * keys.length)));
+ rehash(RandomUtils.nextTwinPrime((int) (ALLOWED_LOAD_FACTOR * keys.length)));
}
public void rehash() {
- rehash(RandomUtils.nextTwinPrime((int) (FastIDSet.ALLOWED_LOAD_FACTOR * numEntries)));
+ rehash(RandomUtils.nextTwinPrime((int) (ALLOWED_LOAD_FACTOR * numEntries)));
}
private void rehash(int newHashSize) {
@@ -244,11 +244,11 @@
numEntries = 0;
numSlotsUsed = 0;
keys = new long[newHashSize];
- Arrays.fill(keys, FastIDSet.NULL);
+ Arrays.fill(keys, NULL);
int length = oldKeys.length;
for (int i = 0; i < length; i++) {
long key = oldKeys[i];
- if ((key != FastIDSet.NULL) && (key != FastIDSet.REMOVED)) {
+ if ((key != NULL) && (key != REMOVED)) {
add(key);
}
}
@@ -264,7 +264,7 @@
public int intersectionSize(FastIDSet other) {
int count = 0;
for (long key : other.keys) {
- if ((key != FastIDSet.NULL) && (key != FastIDSet.REMOVED) && (keys[find(key)] != FastIDSet.NULL)) {
+ if ((key != NULL) && (key != REMOVED) && (keys[find(key)] != NULL)) {
count++;
}
}
@@ -291,7 +291,7 @@
StringBuilder result = new StringBuilder();
result.append('[');
for (long key : keys) {
- if ((key != FastIDSet.NULL) && (key != FastIDSet.REMOVED)) {
+ if ((key != NULL) && (key != REMOVED)) {
result.append(key).append(',');
}
}
@@ -332,7 +332,7 @@
private void goToNext() {
int length = keys.length;
while ((position < length)
- && ((keys[position] == FastIDSet.NULL) || (keys[position] == FastIDSet.REMOVED))) {
+ && ((keys[position] == NULL) || (keys[position] == REMOVED))) {
position++;
}
}
@@ -345,7 +345,7 @@
if (lastNext < 0) {
throw new IllegalStateException();
}
- keys[lastNext] = FastIDSet.REMOVED;
+ keys[lastNext] = REMOVED;
numEntries--;
}
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=910458&r1=910457&r2=910458&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 Feb 16 10:41:38 2010
@@ -74,9 +74,9 @@
if (!refreshLock.isLocked()) {
refreshLock.lock();
try {
- alreadyRefreshed = RefreshHelper.buildRefreshed(alreadyRefreshed);
+ alreadyRefreshed = buildRefreshed(alreadyRefreshed);
for (Refreshable dependency : dependencies) {
- RefreshHelper.maybeRefresh(alreadyRefreshed, dependency);
+ maybeRefresh(alreadyRefreshed, dependency);
}
if (refreshRunnable != null) {
try {
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=910458&r1=910457&r2=910458&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 Feb 16 10:41:38 2010
@@ -182,12 +182,12 @@
}
log.info("Beginning evaluation of {} users", estimateCallables
.size());
- AbstractDifferenceRecommenderEvaluator.execute(estimateCallables);
+ execute(estimateCallables);
return computeFinalEvaluation();
}
static void execute(Collection<Callable<Void>> callables) throws TasteException {
- callables = AbstractDifferenceRecommenderEvaluator.wrapWithStatsCallables(callables);
+ callables = wrapWithStatsCallables(callables);
int numProcessors = Runtime.getRuntime().availableProcessors();
ExecutorService executor = Executors.newFixedThreadPool(numProcessors);
log.info("Starting timing of {} tasks in {} threads", callables
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=910458&r1=910457&r2=910458&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 Feb 16 10:41:38 2010
@@ -113,8 +113,8 @@
}
// List some most-preferred items that would count as (most) "relevant" results
- double theRelevanceThreshold = Double.isNaN(relevanceThreshold) ? GenericRecommenderIRStatsEvaluator
- .computeThreshold(prefs) : relevanceThreshold;
+ double theRelevanceThreshold = Double.isNaN(relevanceThreshold) ?
+ computeThreshold(prefs) : relevanceThreshold;
prefs.sortByValueReversed();
for (int i = 0; (i < size) && (relevantItemIDs.size() < at); i++) {
if (prefs.getValue(i) >= theRelevanceThreshold) {
@@ -127,7 +127,7 @@
.getNumUsers());
LongPrimitiveIterator it2 = dataModel.getUserIDs();
while (it2.hasNext()) {
- GenericRecommenderIRStatsEvaluator.processOtherUser(userID, relevantItemIDs, trainingUsers, it2
+ processOtherUser(userID, relevantItemIDs, trainingUsers, it2
.nextLong(), dataModel);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractIDMigrator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractIDMigrator.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractIDMigrator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractIDMigrator.java Tue Feb 16 10:41:38 2010
@@ -45,7 +45,7 @@
protected final long hash(String value) {
byte[] md5hash;
synchronized (md5Digest) {
- md5hash = md5Digest.digest(value.getBytes(AbstractIDMigrator.UTF8_CHARSET));
+ md5hash = md5Digest.digest(value.getBytes(UTF8_CHARSET));
md5Digest.reset();
}
long hash = 0L;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/MySQLJDBCIDMigrator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/MySQLJDBCIDMigrator.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/MySQLJDBCIDMigrator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/MySQLJDBCIDMigrator.java Tue Feb 16 10:41:38 2010
@@ -52,8 +52,8 @@
public final class MySQLJDBCIDMigrator extends AbstractJDBCIDMigrator {
public MySQLJDBCIDMigrator(DataSource dataSource) {
- this(dataSource, AbstractJDBCIDMigrator.DEFAULT_MAPPING_TABLE,
- AbstractJDBCIDMigrator.DEFAULT_LONG_ID_COLUMN, AbstractJDBCIDMigrator.DEFAULT_STRING_ID_COLUMN);
+ this(dataSource, DEFAULT_MAPPING_TABLE,
+ DEFAULT_LONG_ID_COLUMN, DEFAULT_STRING_ID_COLUMN);
}
public MySQLJDBCIDMigrator(DataSource dataSource,
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=910458&r1=910457&r2=910458&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 Tue Feb 16 10:41:38 2010
@@ -140,8 +140,8 @@
for (int i = 0; i < size; i++) {
long itemID = prefs.getItemID(i);
float value = prefs.getValue(i);
- ItemUserAverageRecommender.addDatumAndCreateIfNeeded(itemID, value, itemAverages);
- ItemUserAverageRecommender.addDatumAndCreateIfNeeded(userID, value, userAverages);
+ addDatumAndCreateIfNeeded(itemID, value, itemAverages);
+ addDatumAndCreateIfNeeded(userID, value, userAverages);
overallAveragePrefValue.addDatum(value);
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java Tue Feb 16 10:41:38 2010
@@ -33,19 +33,19 @@
private static final Rescorer<LongPair> userUserPairInstance = new NullRescorer<LongPair>();
public static IDRescorer getItemInstance() {
- return NullRescorer.userOrItemInstance;
+ return userOrItemInstance;
}
public static IDRescorer getUserInstance() {
- return NullRescorer.userOrItemInstance;
+ return userOrItemInstance;
}
public static Rescorer<LongPair> getItemItemPairInstance() {
- return NullRescorer.itemItemPairInstance;
+ return itemItemPairInstance;
}
public static Rescorer<LongPair> getUserUserPairInstance() {
- return NullRescorer.userUserPairInstance;
+ return userUserPairInstance;
}
private NullRescorer() {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/file/FileDiffStorage.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/file/FileDiffStorage.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/file/FileDiffStorage.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/file/FileDiffStorage.java Tue Feb 16 10:41:38 2010
@@ -106,7 +106,7 @@
FileLineIterator iterator = new FileLineIterator(dataFile, false);
String firstLine = iterator.peek();
- while ((firstLine.length() == 0) || (firstLine.charAt(0) == FileDiffStorage.COMMENT_CHAR)) {
+ while ((firstLine.length() == 0) || (firstLine.charAt(0) == COMMENT_CHAR)) {
iterator.next();
firstLine = iterator.peek();
}
@@ -129,7 +129,7 @@
private long processLine(String line, char delimiter, long averageCount) {
- if ((line.length() == 0) || (line.charAt(0) == FileDiffStorage.COMMENT_CHAR)) {
+ if ((line.length() == 0) || (line.charAt(0) == COMMENT_CHAR)) {
return averageCount;
}
@@ -315,7 +315,7 @@
@Override
public void refresh(Collection<Refreshable> alreadyRefreshed) {
long mostRecentModification = dataFile.lastModified();
- if (mostRecentModification > lastModified + FileDiffStorage.MIN_RELOAD_INTERVAL_MS) {
+ if (mostRecentModification > lastModified + MIN_RELOAD_INTERVAL_MS) {
log.debug("File has changed; reloading...");
lastModified = mostRecentModification;
buildDiffs();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ExpectationMaximizationSVD.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ExpectationMaximizationSVD.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ExpectationMaximizationSVD.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ExpectationMaximizationSVD.java Tue Feb 16 10:41:38 2010
@@ -53,7 +53,7 @@
* default starting values for the SVD vectors
*/
public ExpectationMaximizationSVD(int m, int n, int k, double defaultValue) {
- this(m, n, k, defaultValue, ExpectationMaximizationSVD.r);
+ this(m, n, k, defaultValue, r);
}
public ExpectationMaximizationSVD(int m, int n, int k, double defaultValue, double noise) {
@@ -88,10 +88,10 @@
double err = value - getDotProduct(i, j);
double[] leftVectorI = leftVector[i];
double[] rightVectorJ = rightVector[j];
- leftVectorI[k] += ExpectationMaximizationSVD.LEARNING_RATE
- * (err * rightVectorJ[k] - ExpectationMaximizationSVD.K * leftVectorI[k]);
- rightVectorJ[k] += ExpectationMaximizationSVD.LEARNING_RATE
- * (err * leftVectorI[k] - ExpectationMaximizationSVD.K * rightVectorJ[k]);
+ leftVectorI[k] += LEARNING_RATE
+ * (err * rightVectorJ[k] - K * leftVectorI[k]);
+ rightVectorJ[k] += LEARNING_RATE
+ * (err * leftVectorI[k] - K * rightVectorJ[k]);
}
int getM() {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommender.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommender.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommender.java Tue Feb 16 10:41:38 2010
@@ -144,7 +144,7 @@
}
private void nextTrainStep() {
- Collections.shuffle(cachedPreferences, SVDRecommender.random);
+ Collections.shuffle(cachedPreferences, random);
for (int i = 0; i < numFeatures; i++) {
for (Preference pref : cachedPreferences) {
int useridx = userMap.get(pref.getUserID());
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AveragingPreferenceInferrer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AveragingPreferenceInferrer.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AveragingPreferenceInferrer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AveragingPreferenceInferrer.java Tue Feb 16 10:41:38 2010
@@ -68,7 +68,7 @@
PreferenceArray prefs = dataModel.getPreferencesFromUser(key);
int size = prefs.length();
if (size == 0) {
- return AveragingPreferenceInferrer.ZERO;
+ return ZERO;
}
for (int i = 0; i < size; i++) {
average.addDatum(prefs.getValue(i));
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java Tue Feb 16 10:41:38 2010
@@ -59,7 +59,7 @@
return Double.NaN;
}
int numItems = dataModel.getNumItems();
- double logLikelihood = LogLikelihoodSimilarity.twoLogLambda(intersectionSize, prefs1Size
+ double logLikelihood = twoLogLambda(intersectionSize, prefs1Size
- intersectionSize,
prefs2Size, numItems - prefs2Size);
return 1.0 - 1.0 / (1.0 + logLikelihood);
@@ -74,7 +74,7 @@
int preferring1 = dataModel.getNumUsersWithPreferenceFor(itemID1);
int preferring2 = dataModel.getNumUsersWithPreferenceFor(itemID2);
int numUsers = dataModel.getNumUsers();
- double logLikelihood = LogLikelihoodSimilarity.twoLogLambda(preferring1and2, preferring1
+ double logLikelihood = twoLogLambda(preferring1and2, preferring1
- preferring1and2,
preferring2, numUsers - preferring2);
return 1.0 - 1.0 / (1.0 + logLikelihood);
@@ -82,14 +82,14 @@
static double twoLogLambda(double k1, double k2, double n1, double n2) {
double p = (k1 + k2) / (n1 + n2);
- return 2.0 * (LogLikelihoodSimilarity.logL(k1 / n1, k1, n1)
- + LogLikelihoodSimilarity.logL(k2 / n2, k2, n2)
- - LogLikelihoodSimilarity.logL(p, k1, n1)
- - LogLikelihoodSimilarity.logL(p, k2, n2));
+ return 2.0 * (logL(k1 / n1, k1, n1)
+ + logL(k2 / n2, k2, n2)
+ - logL(p, k1, n1)
+ - logL(p, k2, n2));
}
private static double logL(double p, double k, double n) {
- return k * LogLikelihoodSimilarity.safeLog(p) + (n - k) * LogLikelihoodSimilarity.safeLog(1.0 - p);
+ return k * safeLog(p) + (n - k) * safeLog(1.0 - p);
}
private static double safeLog(double d) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java Tue Feb 16 10:41:38 2010
@@ -77,7 +77,7 @@
public final class MySQLJDBCItemSimilarity extends AbstractJDBCItemSimilarity {
public MySQLJDBCItemSimilarity() throws TasteException {
- this(AbstractJDBCComponent.DEFAULT_DATASOURCE_NAME);
+ this(DEFAULT_DATASOURCE_NAME);
}
public MySQLJDBCItemSimilarity(String dataSourceName) throws TasteException {
@@ -85,10 +85,10 @@
}
public MySQLJDBCItemSimilarity(DataSource dataSource) {
- this(dataSource, AbstractJDBCItemSimilarity.DEFAULT_SIMILARITY_TABLE,
- AbstractJDBCItemSimilarity.DEFAULT_ITEM_A_ID_COLUMN,
- AbstractJDBCItemSimilarity.DEFAULT_ITEM_B_ID_COLUMN,
- AbstractJDBCItemSimilarity.DEFAULT_SIMILARITY_COLUMN);
+ this(dataSource, DEFAULT_SIMILARITY_TABLE,
+ DEFAULT_ITEM_A_ID_COLUMN,
+ DEFAULT_ITEM_B_ID_COLUMN,
+ DEFAULT_SIMILARITY_COLUMN);
}
public MySQLJDBCItemSimilarity(DataSource dataSource,
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java Tue Feb 16 10:41:38 2010
@@ -105,7 +105,7 @@
} else {
Writer writer = new OutputStreamWriter(new FileOutputStream(new File(outDir, input.getName())), charset);
try {
- BayesFileFormatter.writeFile(label, analyzer, input, charset, writer);
+ writeFile(label, analyzer, input, charset, writer);
} finally {
IOUtils.quietClose(writer);
}
@@ -165,7 +165,7 @@
} else {
theWriter = writer;
}
- BayesFileFormatter.writeFile(label, analyzer, file, charset, theWriter);
+ writeFile(label, analyzer, file, charset, theWriter);
if (writer != null) {
// just write a new line
theWriter.write('\n');
@@ -320,9 +320,9 @@
boolean collapse = cmdLine.hasOption(collapseOpt);
if (collapse) {
- BayesFileFormatter.collapse(label, analyzer, input, charset, output);
+ collapse(label, analyzer, input, charset, output);
} else {
- BayesFileFormatter.format(label, analyzer, input, charset, output);
+ format(label, analyzer, input, charset, output);
}
} catch (OptionException e) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java Tue Feb 16 10:41:38 2010
@@ -143,7 +143,7 @@
returnString.append("-------------------------------------------------------").append('\n');
for (String correctLabel : this.labels) {
- returnString.append(StringUtils.rightPad(ConfusionMatrix.getSmallLabel(labelMap.get(correctLabel)), 5))
+ returnString.append(StringUtils.rightPad(getSmallLabel(labelMap.get(correctLabel)), 5))
.append('\t');
}
@@ -157,7 +157,7 @@
labelTotal += getCount(correctLabel, classifiedLabel);
}
returnString.append(" | ").append(StringUtils.rightPad(String.valueOf(labelTotal), 6)).append('\t')
- .append(StringUtils.rightPad(ConfusionMatrix.getSmallLabel(labelMap.get(correctLabel)), 5)).append(
+ .append(StringUtils.rightPad(getSmallLabel(labelMap.get(correctLabel)), 5)).append(
" = ").append(correctLabel).append('\n');
}
returnString.append("Default Category: ").append(defaultLabel).append(": ").append(
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java Tue Feb 16 10:41:38 2010
@@ -170,9 +170,9 @@
params.set("testDirPath", testDirPath);
if (classificationMethod.equalsIgnoreCase("sequential")) {
- TestClassifier.classifySequential(params);
+ classifySequential(params);
} else if (classificationMethod.equalsIgnoreCase("mapreduce")) {
- TestClassifier.classifyParallel(params);
+ classifyParallel(params);
}
} catch (OptionException e) {
CommandLineUtil.printHelp(group);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java Tue Feb 16 10:41:38 2010
@@ -119,13 +119,13 @@
if (classifierType.equalsIgnoreCase("bayes")) {
log.info("Training Bayes Classifier");
- TrainClassifier.trainNaiveBayes((String) cmdLine.getValue(inputDirOpt), (String) cmdLine
+ trainNaiveBayes((String) cmdLine.getValue(inputDirOpt), (String) cmdLine
.getValue(outputOpt), params);
} else if (classifierType.equalsIgnoreCase("cbayes")) {
log.info("Training Complementary Bayes Classifier");
// setup the HDFS and copy the files there, then run the trainer
- TrainClassifier.trainCNaiveBayes((String) cmdLine.getValue(inputDirOpt), (String) cmdLine
+ trainCNaiveBayes((String) cmdLine.getValue(inputDirOpt), (String) cmdLine
.getValue(outputOpt), params);
}
} catch (OptionException e) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/algorithm/CBayesAlgorithm.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/algorithm/CBayesAlgorithm.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/algorithm/CBayesAlgorithm.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/algorithm/CBayesAlgorithm.java Tue Feb 16 10:41:38 2010
@@ -117,7 +117,7 @@
@Override
public double documentWeight(final Datastore datastore,
final String label,
- final String[] document) throws InvalidDatastoreException {
+ String[] document) throws InvalidDatastoreException {
OpenObjectIntHashMap<String> wordList = new OpenObjectIntHashMap<String>(document.length / 2);
for (String word : document) {
if (wordList.containsKey(word) == false) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/io/SequenceFileModelReader.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/io/SequenceFileModelReader.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/io/SequenceFileModelReader.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/io/SequenceFileModelReader.java Tue Feb 16 10:41:38 2010
@@ -49,11 +49,11 @@
Parameters params,
Configuration conf) throws IOException {
- SequenceFileModelReader.loadFeatureWeights(datastore, fs, new Path(params.get("sigma_j")), conf);
- SequenceFileModelReader.loadLabelWeights(datastore, fs, new Path(params.get("sigma_k")), conf);
- SequenceFileModelReader.loadSumWeight(datastore, fs, new Path(params.get("sigma_kSigma_j")), conf);
- SequenceFileModelReader.loadThetaNormalizer(datastore, fs, new Path(params.get("thetaNormalizer")), conf);
- SequenceFileModelReader.loadWeightMatrix(datastore, fs, new Path(params.get("weight")), conf);
+ loadFeatureWeights(datastore, fs, new Path(params.get("sigma_j")), conf);
+ loadLabelWeights(datastore, fs, new Path(params.get("sigma_k")), conf);
+ loadSumWeight(datastore, fs, new Path(params.get("sigma_kSigma_j")), conf);
+ loadThetaNormalizer(datastore, fs, new Path(params.get("thetaNormalizer")), conf);
+ loadWeightMatrix(datastore, fs, new Path(params.get("weight")), conf);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierDriver.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierDriver.java Tue Feb 16 10:41:38 2010
@@ -83,7 +83,7 @@
JobClient.runJob(conf);
Path outputFiles = new Path(outPath.toString() + "/part*");
- ConfusionMatrix matrix = BayesClassifierDriver.readResult(dfs, outputFiles, conf, params);
+ ConfusionMatrix matrix = readResult(dfs, outputFiles, conf, params);
log.info("{}", matrix.summarize());
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureMapper.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureMapper.java Tue Feb 16 10:41:38 2010
@@ -139,12 +139,12 @@
dfTuple.add(BayesConstants.DOCUMENT_FREQUENCY);
dfTuple.add(label);
dfTuple.add(token);
- output.collect(dfTuple, BayesFeatureMapper.ONE);
+ output.collect(dfTuple, ONE);
StringTuple tokenCountTuple = new StringTuple();
tokenCountTuple.add(BayesConstants.FEATURE_COUNT);
tokenCountTuple.add(token);
- output.collect(tokenCountTuple, BayesFeatureMapper.ONE);
+ output.collect(tokenCountTuple, ONE);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -157,7 +157,7 @@
StringTuple labelCountTuple = new StringTuple();
labelCountTuple.add(BayesConstants.LABEL_COUNT);
labelCountTuple.add(label);
- output.collect(labelCountTuple, BayesFeatureMapper.ONE);
+ output.collect(labelCountTuple, ONE);
}
@Override
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java Tue Feb 16 10:41:38 2010
@@ -88,7 +88,7 @@
@Override
public String asFormatString(String[] bindings) {
StringBuilder buf = new StringBuilder();
- buf.append(getIdentifier()).append(": ").append(ClusterBase.formatVector(computeCentroid(), bindings));
+ buf.append(getIdentifier()).append(": ").append(formatVector(computeCentroid(), bindings));
return buf.toString();
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java Tue Feb 16 10:41:38 2010
@@ -76,7 +76,7 @@
@Override
public String asFormatString() {
- return Canopy.formatCanopy(this);
+ return formatCanopy(this);
}
/**
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java Tue Feb 16 10:41:38 2010
@@ -107,7 +107,7 @@
double t1 = Double.parseDouble(cmdLine.getValue(t1Opt).toString());
double t2 = Double.parseDouble(cmdLine.getValue(t2Opt).toString());
- CanopyDriver.runJob(input, output, measureClass, t1, t2);
+ runJob(input, output, measureClass, t1, t2);
} catch (OptionException e) {
log.error("Exception", e);
CommandLineUtil.printHelp(group);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletCluster.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletCluster.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletCluster.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletCluster.java Tue Feb 16 10:41:38 2010
@@ -35,13 +35,13 @@
@Override
public void readFields(DataInput in) throws IOException {
this.totalCount = in.readDouble();
- this.model = DirichletCluster.readModel(in);
+ this.model = readModel(in);
}
@Override
public void write(DataOutput out) throws IOException {
out.writeDouble(totalCount);
- DirichletCluster.writeModel(out, model);
+ writeModel(out, model);
}
private Model<O> model; // the model for this iteration
@@ -112,7 +112,7 @@
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Model.class, new JsonModelAdapter());
Gson gson = builder.create();
- return gson.toJson(this, DirichletCluster.clusterType);
+ return gson.toJson(this, clusterType);
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java Tue Feb 16 10:41:38 2010
@@ -91,7 +91,7 @@
int numModels = Integer.parseInt(cmdLine.getValue(topicsOpt).toString());
int maxIterations = Integer.parseInt(cmdLine.getValue(maxIterOpt).toString());
double alpha_0 = Double.parseDouble(cmdLine.getValue(mOpt).toString());
- DirichletJob.runJob(input, output, modelFactory, modelPrototype, prototypeSize, numModels,
+ runJob(input, output, modelFactory, modelPrototype, prototypeSize, numModels,
maxIterations, alpha_0);
} catch (OptionException e) {
log.error("Exception parsing command line: ", e);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java Tue Feb 16 10:41:38 2010
@@ -48,7 +48,7 @@
OutputCollector<Text,VectorWritable> output,
Reporter reporter) throws IOException {
// compute a normalized vector of probabilities that v is described by each model
- Vector pi = DirichletMapper.normalizedProbabilities(state, v);
+ Vector pi = normalizedProbabilities(state, v);
// then pick one model by sampling a Multinomial distribution based upon them
// see: http://en.wikipedia.org/wiki/Multinomial_distribution
int k = UncommonDistributions.rMultinom(pi);
@@ -63,7 +63,7 @@
public void configure(JobConf job) {
super.configure(job);
try {
- state = DirichletMapper.getDirichletState(job);
+ state = getDirichletState(job);
} catch (NumberFormatException e) {
throw new IllegalStateException(e);
} catch (SecurityException e) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java Tue Feb 16 10:41:38 2010
@@ -90,8 +90,8 @@
* @return a Vector of samples
*/
public static double rBeta(double shape1, double shape2) {
- double gam1 = UncommonDistributions.rGamma(shape1, 1);
- double gam2 = UncommonDistributions.rGamma(shape2, 1);
+ double gam1 = rGamma(shape1, 1);
+ double gam2 = rGamma(shape2, 1);
return gam1 / (gam1 + gam2);
}
@@ -113,7 +113,7 @@
// params.add(Math.max(0, shape2));
Vector result = new DenseVector(K);
for (int i = 0; i < K; i++) {
- result.set(i, UncommonDistributions.rBeta(shape1, shape2));
+ result.set(i, rBeta(shape1, shape2));
}
return result;
}
@@ -126,7 +126,7 @@
public static double rChisq(double df) {
double result = 0.0;
for (int i = 0; i < df; i++) {
- double sample = UncommonDistributions.rNorm(0, 1);
+ double sample = rNorm(0, 1);
result += sample * sample;
}
return result;
@@ -142,7 +142,7 @@
* @return a double sample
*/
public static double rNorm(double mean, double sd) {
- GaussianGenerator dist = new GaussianGenerator(mean, sd, UncommonDistributions.random);
+ GaussianGenerator dist = new GaussianGenerator(mean, sd, random);
return dist.nextValue();
}
@@ -163,7 +163,7 @@
double xms = (x - m) / s;
double ex = xms * xms / 2;
double exp = Math.exp(-ex);
- return exp / (UncommonDistributions.sqrt2pi * s);
+ return exp / (sqrt2pi * s);
}
/** Returns one sample from a multinomial. */
@@ -206,7 +206,7 @@
Vector result = new DenseVector(cardinality);
for (int i = 0; (total > 0) && (i < cardinality); i++) {
double p = probabilities.get(i);
- int ki = UncommonDistributions.rBinomial(size, p / total);
+ int ki = rBinomial(size, p / total);
total -= p;
size -= ki;
result.set(i, ki);
@@ -255,7 +255,7 @@
for (int k = 0; k < pi.size(); k++) {
double countK = totalCounts.get(k);
total -= countK;
- double betaK = UncommonDistributions.rBeta(1 + countK, Math.max(0, alpha_0 + total));
+ double betaK = rBeta(1 + countK, Math.max(0, alpha_0 + total));
double piK = betaK * remainder;
pi.set(k, piK);
remainder -= piK;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/AsymmetricSampledNormalModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/AsymmetricSampledNormalModel.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/AsymmetricSampledNormalModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/AsymmetricSampledNormalModel.java Tue Feb 16 10:41:38 2010
@@ -122,7 +122,7 @@
double sd2 = sd * sd;
double exp = -(x.dot(x) - 2 * x.dot(mean) + mean.dot(mean)) / (2 * sd2);
double ex = Math.exp(exp);
- return ex / (sd * AsymmetricSampledNormalModel.sqrt2pi);
+ return ex / (sd * sqrt2pi);
}
@Override
@@ -190,6 +190,6 @@
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Model.class, new JsonModelAdapter());
Gson gson = builder.create();
- return gson.toJson(this, AsymmetricSampledNormalModel.modelType);
+ return gson.toJson(this, modelType);
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/L1Model.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/L1Model.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/L1Model.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/L1Model.java Tue Feb 16 10:41:38 2010
@@ -116,7 +116,7 @@
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Model.class, new JsonModelAdapter());
Gson gson = builder.create();
- return gson.toJson(this, L1Model.modelType);
+ return gson.toJson(this, modelType);
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModel.java Tue Feb 16 10:41:38 2010
@@ -118,7 +118,7 @@
double sd2 = stdDev * stdDev;
double exp = -(x.dot(x) - 2 * x.dot(mean) + mean.dot(mean)) / (2 * sd2);
double ex = Math.exp(exp);
- return ex / (stdDev * NormalModel.sqrt2pi);
+ return ex / (stdDev * sqrt2pi);
}
@Override
@@ -169,6 +169,6 @@
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Model.class, new JsonModelAdapter());
Gson gson = builder.create();
- return gson.toJson(this, NormalModel.modelType);
+ return gson.toJson(this, modelType);
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java Tue Feb 16 10:41:38 2010
@@ -168,12 +168,12 @@
/** Computes the probability of a point belonging to a cluster */
public double computeProbWeight(double clusterDistance, List<Double> clusterDistanceList) {
if (clusterDistance == 0) {
- clusterDistance = FuzzyKMeansClusterer.MINIMAL_VALUE;
+ clusterDistance = MINIMAL_VALUE;
}
double denom = 0.0;
for (double eachCDist : clusterDistanceList) {
if (eachCDist == 0.0) {
- eachCDist = FuzzyKMeansClusterer.MINIMAL_VALUE;
+ eachCDist = MINIMAL_VALUE;
}
denom += Math.pow(clusterDistance / eachCDist, 2.0 / (m - 1));
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java Tue Feb 16 10:41:38 2010
@@ -176,10 +176,10 @@
}
if (cmdLine.hasOption(clusteringOpt)) {
- FuzzyKMeansDriver.runClustering(input, clusters, output, measureClass, convergenceDelta, numMapTasks,
+ runClustering(input, clusters, output, measureClass, convergenceDelta, numMapTasks,
m);
} else {
- FuzzyKMeansDriver.runJob(input, clusters, output, measureClass, convergenceDelta, maxIterations,
+ runJob(input, clusters, output, measureClass, convergenceDelta, maxIterations,
numMapTasks, numReduceTasks, m);
}
@@ -232,7 +232,7 @@
// point the output to a new directory per iteration
String clustersOut = output + File.separator + "clusters-" + iteration;
- converged = FuzzyKMeansDriver.runIteration(input, clustersIn, clustersOut, measureClass,
+ converged = runIteration(input, clustersIn, clustersOut, measureClass,
convergenceDelta, numMapTasks, numReduceTasks, iteration, m);
// now point the input to the old output directory
@@ -243,7 +243,7 @@
// now actually cluster the points
log.info("Clustering ");
- FuzzyKMeansDriver.runClustering(input, clustersIn, output + File.separator + "points", measureClass,
+ runClustering(input, clustersIn, output + File.separator + "points", measureClass,
convergenceDelta, numMapTasks, m);
}
@@ -311,7 +311,7 @@
try {
JobClient.runJob(conf);
FileSystem fs = FileSystem.get(outPath.toUri(), conf);
- return FuzzyKMeansDriver.isConverged(clustersOut, conf, fs);
+ return isConverged(clustersOut, conf, fs);
} catch (IOException e) {
log.warn(e.toString(), e);
return true;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansJob.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansJob.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansJob.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansJob.java Tue Feb 16 10:41:38 2010
@@ -102,7 +102,7 @@
float m = Float.parseFloat(cmdLine.getValue(mOpt).toString());
// String vectorClassName = cmdLine.getValue(vectorClassOpt).toString();
// Class<? extends Vector> vectorClass = (Class<? extends Vector>) Class.forName(vectorClassName);
- FuzzyKMeansJob.runJob(input, clusters, output, measureClass, convergenceDelta, maxIterations,
+ runJob(input, clusters, output, measureClass, convergenceDelta, maxIterations,
numMapTasks, numReduceTasks, doCanopy, m);
} catch (OptionException e) {
log.error("Exception parsing command line: ", e);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java Tue Feb 16 10:41:38 2010
@@ -183,7 +183,7 @@
@Override
public String toString() {
- return MeanShiftCanopy.formatCanopy(this);
+ return formatCanopy(this);
}
/**
@@ -233,7 +233,7 @@
@Override
public String asFormatString() {
- return MeanShiftCanopy.formatCanopy(this);
+ return formatCanopy(this);
}
public void setBoundPoints(List<Vector> boundPoints) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java Tue Feb 16 10:41:38 2010
@@ -88,7 +88,7 @@
double t1 = Double.parseDouble(cmdLine.getValue(threshold1Opt).toString());
double t2 = Double.parseDouble(cmdLine.getValue(threshold2Opt).toString());
double convergenceDelta = Double.parseDouble(cmdLine.getValue(convergenceDeltaOpt).toString());
- MeanShiftCanopyDriver.runJob(input, output, output + MeanShiftCanopyConfigKeys.CONTROL_PATH_KEY,
+ runJob(input, output, output + MeanShiftCanopyConfigKeys.CONTROL_PATH_KEY,
measureClassName, t1, t2, convergenceDelta);
} catch (OptionException e) {
log.error("Exception parsing command line: ", e);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/FileLineIterable.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/FileLineIterable.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/FileLineIterable.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/FileLineIterable.java Tue Feb 16 10:41:38 2010
@@ -40,12 +40,12 @@
/** Creates a {@link FileLineIterable} over a given file, assuming a UTF-8 encoding. */
public FileLineIterable(File file) throws IOException {
- this(file, FileLineIterable.UTF8, false);
+ this(file, UTF8, false);
}
/** Creates a {@link FileLineIterable} over a given file, assuming a UTF-8 encoding. */
public FileLineIterable(File file, boolean skipFirstLine) throws IOException {
- this(file, FileLineIterable.UTF8, skipFirstLine);
+ this(file, UTF8, skipFirstLine);
}
/** Creates a {@link FileLineIterable} over a given file, using the given encoding. */
@@ -54,11 +54,11 @@
}
public FileLineIterable(InputStream is) {
- this(is, FileLineIterable.UTF8, false);
+ this(is, UTF8, false);
}
public FileLineIterable(InputStream is, boolean skipFirstLine) {
- this(is, FileLineIterable.UTF8, skipFirstLine);
+ this(is, UTF8, skipFirstLine);
}
public FileLineIterable(InputStream is, Charset encoding, boolean skipFirstLine) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/FileLineIterator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/FileLineIterator.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/FileLineIterator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/FileLineIterator.java Tue Feb 16 10:41:38 2010
@@ -53,7 +53,7 @@
* if the file cannot be read
*/
public FileLineIterator(File file) throws IOException {
- this(file, FileLineIterator.UTF8, false);
+ this(file, UTF8, false);
}
/**
@@ -65,7 +65,7 @@
* if the file cannot be read
*/
public FileLineIterator(File file, boolean skipFirstLine) throws IOException {
- this(file, FileLineIterator.UTF8, skipFirstLine);
+ this(file, UTF8, skipFirstLine);
}
/**
@@ -77,15 +77,15 @@
* if the file cannot be read
*/
public FileLineIterator(File file, Charset encoding, boolean skipFirstLine) throws IOException {
- this(FileLineIterator.getFileInputStream(file), encoding, skipFirstLine);
+ this(getFileInputStream(file), encoding, skipFirstLine);
}
public FileLineIterator(InputStream is) throws IOException {
- this(is, FileLineIterator.UTF8, false);
+ this(is, UTF8, false);
}
public FileLineIterator(InputStream is, boolean skipFirstLine) throws IOException {
- this(is, FileLineIterator.UTF8, skipFirstLine);
+ this(is, UTF8, skipFirstLine);
}
public FileLineIterator(InputStream is, Charset encoding, boolean skipFirstLine) throws IOException {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java Tue Feb 16 10:41:38 2010
@@ -92,9 +92,9 @@
* {@link Connection} to close
*/
public static void quietClose(ResultSet resultSet, Statement statement, Connection connection) {
- IOUtils.quietClose(resultSet);
- IOUtils.quietClose(statement);
- IOUtils.quietClose(connection);
+ quietClose(resultSet);
+ quietClose(statement);
+ quietClose(connection);
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Pair.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Pair.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Pair.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Pair.java Tue Feb 16 10:41:38 2010
@@ -48,8 +48,8 @@
return false;
}
Pair<?, ?> otherPair = (Pair<?, ?>) obj;
- return Pair.isEqualOrNulls(first, otherPair.getFirst()) &&
- Pair.isEqualOrNulls(second, otherPair.getSecond());
+ return isEqualOrNulls(first, otherPair.getFirst()) &&
+ isEqualOrNulls(second, otherPair.getSecond());
}
private static boolean isEqualOrNulls(Object obj1, Object obj2) {
@@ -58,10 +58,10 @@
@Override
public int hashCode() {
- int firstHash = Pair.hashCodeNull(first);
+ int firstHash = hashCodeNull(first);
// Flip top and bottom 16 bits; this makes the hash function probably different
// for (a,b) versus (b,a)
- return (firstHash >>> 16 | firstHash << 16) ^ Pair.hashCodeNull(second);
+ return (firstHash >>> 16 | firstHash << 16) ^ hashCodeNull(second);
}
private static int hashCodeNull(Object obj) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringRecordIterator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringRecordIterator.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringRecordIterator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringRecordIterator.java Tue Feb 16 10:41:38 2010
@@ -43,7 +43,7 @@
public Pair<List<String>,Long> next() {
String line = lineIterator.next();
String[] items = splitter.split(line);
- return new Pair<List<String>,Long>(Arrays.asList(items), StringRecordIterator.ONE);
+ return new Pair<List<String>,Long>(Arrays.asList(items), ONE);
}
@Override
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/HybridCache.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/HybridCache.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/HybridCache.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/HybridCache.java Tue Feb 16 10:41:38 2010
@@ -19,13 +19,13 @@
public class HybridCache<K,V> implements Cache<K,V> {
- private int lfuCapacity;
+ private final int lfuCapacity;
- private int lruCapacity;
+ private final int lruCapacity;
- private LRUCache<K,V> lruCache;
+ private final LRUCache<K,V> lruCache;
- private LFUCache<K,V> lfuCache;
+ private final LFUCache<K,V> lfuCache;
public HybridCache(int lfuCapacity, int lruCapacity) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LFUCache.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LFUCache.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LFUCache.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LFUCache.java Tue Feb 16 10:41:38 2010
@@ -31,11 +31,11 @@
public class LFUCache<K,V> implements Cache<K,V> {
- private SortedMap<Long,Set<K>> evictionMap;
+ private final SortedMap<Long,Set<K>> evictionMap;
- private Map<K,Pair<V,AtomicLong>> dataMap;
+ private final Map<K,Pair<V,AtomicLong>> dataMap;
- private int capacity;
+ private final int capacity;
private int evictionCount;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LRUCache.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LRUCache.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LRUCache.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LRUCache.java Tue Feb 16 10:41:38 2010
@@ -22,9 +22,9 @@
public class LRUCache<K,V> implements Cache<K,V> {
- private int capacity;
+ private final int capacity;
- private Map<K,V> lruCache;
+ private final Map<K,V> lruCache;
public LRUCache(final int capacity) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LeastKCache.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LeastKCache.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LeastKCache.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LeastKCache.java Tue Feb 16 10:41:38 2010
@@ -24,11 +24,11 @@
public class LeastKCache<K extends Comparable<? super K>,V> implements Cache<K,V> {
- private int capacity;
+ private final int capacity;
- private Map<K,V> cache;
+ private final Map<K,V> cache;
- private PriorityQueue<K> queue;
+ private final PriorityQueue<K> queue;
public LeastKCache(int capacity) {