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 [2/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...
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/FixedSizeSamplingIterator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/FixedSizeSamplingIterator.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/FixedSizeSamplingIterator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/FixedSizeSamplingIterator.java Tue Feb 16 10:41:38 2010
@@ -30,7 +30,7 @@
public final class FixedSizeSamplingIterator<T> extends DelegatingIterator<T> {
public FixedSizeSamplingIterator(int size, Iterator<T> source) {
- super(FixedSizeSamplingIterator.buildDelegate(size, source));
+ super(buildDelegate(size, source));
}
private static <T> Iterator<T> buildDelegate(int size, Iterator<T> source) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/IteratorUtils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/IteratorUtils.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/IteratorUtils.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/IteratorUtils.java Tue Feb 16 10:41:38 2010
@@ -40,7 +40,7 @@
* @return a {@link List} with the objects one gets by iterating over the given {@link Iterable}
*/
public static <K> List<K> iterableToList(Iterable<K> iterable) {
- return IteratorUtils.iterableToList(iterable, null);
+ return iterableToList(iterable, null);
}
public static long[] longIteratorToList(LongPrimitiveIterator iterator) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/StableFixedSizeSamplingIterator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/StableFixedSizeSamplingIterator.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/StableFixedSizeSamplingIterator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/iterator/StableFixedSizeSamplingIterator.java Tue Feb 16 10:41:38 2010
@@ -32,7 +32,7 @@
public class StableFixedSizeSamplingIterator<T> extends DelegatingIterator<T> {
public StableFixedSizeSamplingIterator(int size, Iterator<T> source) {
- super(StableFixedSizeSamplingIterator.buildDelegate(size, source));
+ super(buildDelegate(size, source));
}
private static <T> Iterator<T> buildDelegate(int size, Iterator<T> source) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java Tue Feb 16 10:41:38 2010
@@ -60,7 +60,7 @@
* name as prefix.
*/
public static void configureParameters(Parametered parametered, JobConf jobConf) {
- ParameteredGeneralizations.configureParameters(parametered.getClass().getSimpleName() + '.',
+ configureParameters(parametered.getClass().getSimpleName() + '.',
parametered, jobConf);
}
@@ -82,7 +82,7 @@
*/
public static void configureParameters(String prefix, Parametered parametered, JobConf jobConf) {
parametered.createParameters(prefix, jobConf);
- ParameteredGeneralizations.configureParametersRecusivly(parametered, prefix, jobConf);
+ configureParametersRecusivly(parametered, prefix, jobConf);
}
private static void configureParametersRecusivly(Parametered parametered, String prefix, JobConf jobConf) {
@@ -94,7 +94,7 @@
parameter.createParameters(name, jobConf);
parameter.configure(jobConf);
if (!parameter.getParameters().isEmpty()) {
- ParameteredGeneralizations.configureParametersRecusivly(parameter, name, jobConf);
+ configureParametersRecusivly(parameter, name, jobConf);
}
}
}
@@ -137,7 +137,7 @@
recurseCount(parametered);
- numChars += (longestName + Help.distanceBetweenNameAndDescription)
+ numChars += (longestName + distanceBetweenNameAndDescription)
* parametered.getParameters().size();
sb = new StringBuilder(numChars);
@@ -150,7 +150,7 @@
sb.append(parameter.prefix());
sb.append(parameter.name());
int max = longestName - parameter.name().length() - parameter.prefix().length()
- + Help.distanceBetweenNameAndDescription;
+ + distanceBetweenNameAndDescription;
for (int i = 0; i < max; i++) {
sb.append(' ');
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/builder/DefaultTreeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/builder/DefaultTreeBuilder.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/builder/DefaultTreeBuilder.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/builder/DefaultTreeBuilder.java Tue Feb 16 10:41:38 2010
@@ -80,7 +80,7 @@
return new Leaf(data.get(0).label);
}
- int[] attributes = DefaultTreeBuilder.randomAttributes(rng, selected, m);
+ int[] attributes = randomAttributes(rng, selected, m);
// find the best split
Split best = null;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DataLoader.java Tue Feb 16 10:41:38 2010
@@ -219,7 +219,7 @@
continue;
}
- if (DataLoader.parseString(id, attrs, values, line) != null) {
+ if (parseString(id, attrs, values, line) != null) {
id++;
}
}
@@ -248,7 +248,7 @@
continue;
}
- if (DataLoader.parseString(id, attrs, values, aData) != null) {
+ if (parseString(id, attrs, values, aData) != null) {
id++;
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Dataset.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Dataset.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Dataset.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/Dataset.java Tue Feb 16 10:41:38 2010
@@ -147,9 +147,9 @@
* @param nbInstances
*/
protected Dataset(Attribute[] attrs, List<String>[] values, int nbInstances) {
- Dataset.validateValues(attrs, values);
+ validateValues(attrs, values);
- int nbattrs = Dataset.countAttributes(attrs);
+ int nbattrs = countAttributes(attrs);
// the label values are set apart
attributes = new Attribute[nbattrs];
@@ -298,7 +298,7 @@
FSDataInputStream input = fs.open(path);
- Dataset dataset = Dataset.read(input);
+ Dataset dataset = read(input);
input.close();
return dataset;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DescriptorUtils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DescriptorUtils.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DescriptorUtils.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DescriptorUtils.java Tue Feb 16 10:41:38 2010
@@ -77,7 +77,7 @@
tokens.add(tokenizer.nextToken());
}
- return DescriptorUtils.generateDescriptor(tokens);
+ return generateDescriptor(tokens);
}
/**
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/Builder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/Builder.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/Builder.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/Builder.java Tue Feb 16 10:41:38 2010
@@ -226,7 +226,7 @@
* @throws IOException
*/
public static Dataset loadDataset(JobConf job) throws IOException {
- Path datasetPath = Builder.getDistributedCacheFile(job, 0);
+ Path datasetPath = getDistributedCacheFile(job, 0);
return Dataset.load(job, datasetPath);
}
@@ -273,11 +273,11 @@
}
if (seed != null) {
- Builder.setRandomSeed(job, seed);
+ setRandomSeed(job, seed);
}
- Builder.setNbTrees(job, nbTrees);
- Builder.setTreeBuilder(job, treeBuilder);
- Builder.setOobEstimate(job, callback != null);
+ setNbTrees(job, nbTrees);
+ setTreeBuilder(job, treeBuilder);
+ setOobEstimate(job, callback != null);
// put the dataset into the DistributedCache
DistributedCache.addCacheFile(datasetPath.toUri(), job);
@@ -288,7 +288,7 @@
log.debug("Running the job...");
runJob(job);
- if (Builder.isOutput(job)) {
+ if (isOutput(job)) {
log.debug("Parsing the output...");
DecisionForest forest = parseOutput(job, callback);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemBuilder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemBuilder.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemBuilder.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemBuilder.java Tue Feb 16 10:41:38 2010
@@ -99,7 +99,7 @@
}
}
- return InMemBuilder.processOutput(output, callback);
+ return processOutput(output, callback);
}
/**
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemInputFormat.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemInputFormat.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemInputFormat.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemInputFormat.java Tue Feb 16 10:41:38 2010
@@ -223,7 +223,7 @@
@Override
public String[] getLocations() throws IOException {
- return InMemInputSplit.NO_LOCATIONS;
+ return NO_LOCATIONS;
}
@Override
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemMapper.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/inmem/InMemMapper.java Tue Feb 16 10:41:38 2010
@@ -78,7 +78,7 @@
log.info("Loading the data...");
try {
- data = InMemMapper.loadData(conf, getDataset());
+ data = loadData(conf, getDataset());
} catch (IOException e) {
throw new IllegalStateException("Exception caught while loading the data: "
+ StringUtils.stringifyException(e));
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/PartialBuilder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/PartialBuilder.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/PartialBuilder.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/PartialBuilder.java Tue Feb 16 10:41:38 2010
@@ -121,10 +121,10 @@
TreeID[] keys = new TreeID[numTrees];
Node[] trees = new Node[numTrees];
int[] firstIds = Step0Output.extractFirstIds(partitions);
- PartialBuilder.processOutput(job, outputPath, firstIds, keys, trees, callback);
+ processOutput(job, outputPath, firstIds, keys, trees, callback);
// call the second step in order to complete the oob predictions
- if ((callback != null) && (numMaps > 1) && PartialBuilder.isStep2(getConf())) {
+ if ((callback != null) && (numMaps > 1) && isStep2(getConf())) {
log.info("*****************************");
log.info("Second Step");
log.info("*****************************");
@@ -177,7 +177,7 @@
trees[index] = value.getTree();
}
- PartialBuilder.processOutput(firstIds, key, value, callback);
+ processOutput(firstIds, key, value, callback);
index++;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step0Job.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step0Job.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step0Job.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step0Job.java Tue Feb 16 10:41:38 2010
@@ -149,7 +149,7 @@
}
}
- return Step0Job.processOutput(keys, values);
+ return processOutput(keys, values);
}
/**
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step1Mapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step1Mapper.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step1Mapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step1Mapper.java Tue Feb 16 10:41:38 2010
@@ -111,12 +111,12 @@
this.partition = partition;
// compute number of trees to build
- nbTrees = Step1Mapper.nbTrees(numMapTasks, numTrees, partition);
+ nbTrees = nbTrees(numMapTasks, numTrees, partition);
// compute first tree id
firstTreeId = 0;
for (int p = 0; p < partition; p++) {
- firstTreeId += Step1Mapper.nbTrees(numMapTasks, numTrees, p);
+ firstTreeId += nbTrees(numMapTasks, numTrees, p);
}
log.debug("partition : {}", partition);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step2Mapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step2Mapper.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step2Mapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapred/partial/Step2Mapper.java Tue Feb 16 10:41:38 2010
@@ -97,7 +97,7 @@
throw new IllegalArgumentException("numTrees not found !");
}
- int nbConcerned = Step2Mapper.nbConcerned(numMaps, numTrees, p);
+ int nbConcerned = nbConcerned(numMaps, numTrees, p);
keys = new TreeID[nbConcerned];
trees = new Node[nbConcerned];
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/Builder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/Builder.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/Builder.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/Builder.java Tue Feb 16 10:41:38 2010
@@ -247,7 +247,7 @@
* loaded
*/
public static Dataset loadDataset(Configuration conf) throws IOException {
- Path datasetPath = Builder.getDistributedCacheFile(conf, 0);
+ Path datasetPath = getDistributedCacheFile(conf, 0);
return Dataset.load(conf, datasetPath);
}
@@ -314,11 +314,11 @@
}
if (seed != null) {
- Builder.setRandomSeed(conf, seed);
+ setRandomSeed(conf, seed);
}
- Builder.setNbTrees(conf, nbTrees);
- Builder.setTreeBuilder(conf, treeBuilder);
- Builder.setOobEstimate(conf, callback != null);
+ setNbTrees(conf, nbTrees);
+ setTreeBuilder(conf, treeBuilder);
+ setOobEstimate(conf, callback != null);
// put the dataset into the DistributedCache
DistributedCache.addCacheFile(datasetPath.toUri(), conf);
@@ -334,7 +334,7 @@
return null;
}
- if (Builder.isOutput(conf)) {
+ if (isOutput(conf)) {
log.debug("Parsing the output...");
DecisionForest forest = parseOutput(job, callback);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemBuilder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemBuilder.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemBuilder.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemBuilder.java Tue Feb 16 10:41:38 2010
@@ -103,7 +103,7 @@
}
}
- return InMemBuilder.processOutput(output, callback);
+ return processOutput(output, callback);
}
/**
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormat.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormat.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormat.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormat.java Tue Feb 16 10:41:38 2010
@@ -231,7 +231,7 @@
@Override
public String[] getLocations() throws IOException {
- return InMemInputSplit.NO_LOCATIONS;
+ return NO_LOCATIONS;
}
@Override
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/inmem/InMemMapper.java Tue Feb 16 10:41:38 2010
@@ -74,7 +74,7 @@
Configuration conf = context.getConfiguration();
log.info("Loading the data...");
- data = InMemMapper.loadData(conf, getDataset());
+ data = loadData(conf, getDataset());
log.info("Data loaded : {} instances", data.size());
bagging = new Bagging(getTreeBuilder(), data);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/PartialBuilder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/PartialBuilder.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/PartialBuilder.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/PartialBuilder.java Tue Feb 16 10:41:38 2010
@@ -120,13 +120,13 @@
TreeID[] keys = new TreeID[numTrees];
Node[] trees = new Node[numTrees];
int[] firstIds = Step0Output.extractFirstIds(partitions);
- PartialBuilder.processOutput(job, outputPath, firstIds, keys, trees, callback);
+ processOutput(job, outputPath, firstIds, keys, trees, callback);
// JobClient should have updated numMaps to the correct number of maps
int numMaps = partitions.length;
// call the second step in order to complete the oob predictions
- if ((callback != null) && (numMaps > 1) && PartialBuilder.isStep2(conf)) {
+ if ((callback != null) && (numMaps > 1) && isStep2(conf)) {
log.info("*****************************");
log.info("Second Step");
log.info("*****************************");
@@ -191,7 +191,7 @@
trees[index] = value.getTree();
}
- PartialBuilder.processOutput(firstIds, key, value, callback);
+ processOutput(firstIds, key, value, callback);
index++;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java Tue Feb 16 10:41:38 2010
@@ -152,7 +152,7 @@
}
}
- return Step0Job.processOutput(keys, values);
+ return processOutput(keys, values);
}
/**
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step1Mapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step1Mapper.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step1Mapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step1Mapper.java Tue Feb 16 10:41:38 2010
@@ -105,12 +105,12 @@
this.partition = partition;
// compute number of trees to build
- nbTrees = Step1Mapper.nbTrees(numMapTasks, numTrees, partition);
+ nbTrees = nbTrees(numMapTasks, numTrees, partition);
// compute first tree id
firstTreeId = 0;
for (int p = 0; p < partition; p++) {
- firstTreeId += Step1Mapper.nbTrees(numMapTasks, numTrees, p);
+ firstTreeId += nbTrees(numMapTasks, numTrees, p);
}
log.debug("partition : {}", partition);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step2Mapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step2Mapper.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step2Mapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step2Mapper.java Tue Feb 16 10:41:38 2010
@@ -84,7 +84,7 @@
throw new IllegalArgumentException("numTrees not found !");
}
- int nbConcerned = Step2Mapper.nbConcerned(numMaps, numTrees, p);
+ int nbConcerned = nbConcerned(numMaps, numTrees, p);
keys = new TreeID[nbConcerned];
trees = new Node[nbConcerned];
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/ref/SequentialBuilder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/ref/SequentialBuilder.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/ref/SequentialBuilder.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/ref/SequentialBuilder.java Tue Feb 16 10:41:38 2010
@@ -61,7 +61,7 @@
for (int treeId = 0; treeId < nbTrees; treeId++) {
trees.add(bagging.build(treeId, rng, callback));
- SequentialBuilder.logProgress(((float) treeId + 1) / nbTrees);
+ logProgress(((float) treeId + 1) / nbTrees);
}
return new DecisionForest(trees);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/DefaultIgSplit.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/DefaultIgSplit.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/DefaultIgSplit.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/DefaultIgSplit.java Tue Feb 16 10:41:38 2010
@@ -120,7 +120,7 @@
continue; // otherwise we get a NaN
}
double p = count * invDataSize;
- entropy += -p * Math.log(p) / IgSplit.LOG2;
+ entropy += -p * Math.log(p) / LOG2;
}
return entropy;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/OptIgSplit.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/OptIgSplit.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/OptIgSplit.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/split/OptIgSplit.java Tue Feb 16 10:41:38 2010
@@ -40,7 +40,7 @@
if (data.getDataset().isNumerical(attr)) {
return numericalSplit(data, attr);
} else {
- return OptIgSplit.categoricalSplit(data, attr);
+ return categoricalSplit(data, attr);
}
}
@@ -64,13 +64,13 @@
}
int size = data.size();
- double hy = OptIgSplit.entropy(countAll, size); // H(Y)
+ double hy = entropy(countAll, size); // H(Y)
double hyx = 0.0; // H(Y|X)
double invDataSize = 1.0 / size;
for (int index = 0; index < values.length; index++) {
size = DataUtils.sum(counts[index]);
- hyx += size * invDataSize * OptIgSplit.entropy(counts[index], size);
+ hyx += size * invDataSize * entropy(counts[index], size);
}
double ig = hy - hyx;
@@ -119,14 +119,14 @@
* @return
*/
protected Split numericalSplit(Data data, int attr) {
- double[] values = OptIgSplit.sortedValues(data, attr);
+ double[] values = sortedValues(data, attr);
initCounts(data, values);
computeFrequencies(data, attr, values);
int size = data.size();
- double hy = OptIgSplit.entropy(countAll, size);
+ double hy = entropy(countAll, size);
double invDataSize = 1.0 / size;
int best = -1;
@@ -138,11 +138,11 @@
// instance with attribute value < values[index]
size = DataUtils.sum(countLess);
- ig -= size * invDataSize * OptIgSplit.entropy(countLess, size);
+ ig -= size * invDataSize * entropy(countLess, size);
// instance with attribute value >= values[index]
size = DataUtils.sum(countAll);
- ig -= size * invDataSize * OptIgSplit.entropy(countAll, size);
+ ig -= size * invDataSize * entropy(countAll, size);
if (ig > bestIg) {
bestIg = ig;
@@ -181,7 +181,7 @@
continue; // otherwise we get a NaN
}
double p = count * invDataSize;
- entropy += -p * Math.log(p) / IgSplit.LOG2;
+ entropy += -p * Math.log(p) / LOG2;
}
return entropy;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Describe.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Describe.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Describe.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/Describe.java Tue Feb 16 10:41:38 2010
@@ -86,13 +86,13 @@
String dataPath = cmdLine.getValue(pathOpt).toString();
String descPath = cmdLine.getValue(descPathOpt).toString();
- List<String> descriptor = Describe.convert(cmdLine.getValues(descriptorOpt));
+ List<String> descriptor = convert(cmdLine.getValues(descriptorOpt));
log.debug("Data path : {}", dataPath);
log.debug("Descriptor path : {}", descPath);
log.debug("Descriptor : {}", descriptor);
- Describe.runTool(dataPath, descriptor, descPath);
+ runTool(dataPath, descriptor, descPath);
} catch (OptionException e) {
log.warn(e.toString(), e);
CommandLineUtil.printHelp(group);
@@ -104,13 +104,13 @@
log.info("Generating the descriptor...");
String descriptor = DescriptorUtils.generateDescriptor(description);
- Path fPath = Describe.validateOutput(filePath);
+ Path fPath = validateOutput(filePath);
log.info("generating the dataset...");
- Dataset dataset = Describe.generateDataset(descriptor, dataPath);
+ Dataset dataset = generateDataset(descriptor, dataPath);
log.info("storing the dataset description");
- Describe.storeWritable(new Configuration(), fPath, dataset);
+ storeWritable(new Configuration(), fPath, dataset);
}
private static Dataset generateDataset(String descriptor, String dataPath) throws IOException,
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/tools/UDistrib.java Tue Feb 16 10:41:38 2010
@@ -83,7 +83,7 @@
int numPartitions = Integer.parseInt(cmdLine.getValue(partitionsOpt).toString());
String output = cmdLine.getValue(outputOpt).toString();
- UDistrib.runTool(data, dataset, output, numPartitions);
+ runTool(data, dataset, output, numPartitions);
} catch (OptionException e) {
log.warn(e.toString(), e);
CommandLineUtil.printHelp(group);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthDriver.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthDriver.java Tue Feb 16 10:41:38 2010
@@ -160,7 +160,7 @@
String classificationMethod = (String) cmdLine.getValue(methodOpt);
if (classificationMethod.equalsIgnoreCase("sequential")) {
- FPGrowthDriver.runFPGrowth(params);
+ runFPGrowth(params);
} else if (classificationMethod.equalsIgnoreCase("mapreduce")) {
HadoopUtil.overwriteOutput(outputDir);
PFPGrowth.runPFPGrowth(params);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java Tue Feb 16 10:41:38 2010
@@ -188,11 +188,11 @@
public static void runPFPGrowth(Parameters params) throws IOException,
InterruptedException,
ClassNotFoundException {
- PFPGrowth.startParallelCounting(params);
- PFPGrowth.startGroupingItems(params);
- PFPGrowth.startTransactionSorting(params);
- PFPGrowth.startParallelFPGrowth(params);
- PFPGrowth.startAggregating(params);
+ startParallelCounting(params);
+ startGroupingItems(params);
+ startTransactionSorting(params);
+ startParallelFPGrowth(params);
+ startAggregating(params);
}
/**
@@ -247,7 +247,7 @@
*/
public static void startGroupingItems(Parameters params) throws IOException {
Configuration conf = new Configuration();
- List<Pair<String,Long>> fList = PFPGrowth.readFList(params);
+ List<Pair<String,Long>> fList = readFList(params);
Integer numGroups = Integer.valueOf(params.get("numGroups", "50"));
Map<String,Long> gList = new HashMap<String,Long>();
@@ -271,8 +271,8 @@
log.info("No of Features: {}", fList.size());
- params.set("gList", PFPGrowth.serializeMap(gList, conf));
- params.set("fList", PFPGrowth.serializeList(fList, conf));
+ params.set("gList", serializeMap(gList, conf));
+ params.set("fList", serializeList(fList, conf));
}
/**
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelCountingMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelCountingMapper.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelCountingMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelCountingMapper.java Tue Feb 16 10:41:38 2010
@@ -47,7 +47,7 @@
continue;
}
context.setStatus("Parallel Counting Mapper: " + item);
- context.write(new Text(item), ParallelCountingMapper.ONE);
+ context.write(new Text(item), ONE);
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionSortingReducer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionSortingReducer.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionSortingReducer.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionSortingReducer.java Tue Feb 16 10:41:38 2010
@@ -37,7 +37,7 @@
protected void reduce(LongWritable key, Iterable<TransactionTree> values, Context context) throws IOException,
InterruptedException {
for (TransactionTree tr : values) {
- context.write(TransactionSortingReducer.ONE, tr);
+ context.write(ONE, tr);
}
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/convertors/ContextStatusUpdater.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/convertors/ContextStatusUpdater.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/convertors/ContextStatusUpdater.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/convertors/ContextStatusUpdater.java Tue Feb 16 10:41:38 2010
@@ -44,7 +44,7 @@
@Override
public void update(String status) {
long curTime = System.currentTimeMillis();
- if (curTime - time > ContextStatusUpdater.PERIOD && context != null) {
+ if (curTime - time > PERIOD && context != null) {
time = curTime;
context.setStatus("Processing FPTree: " + status);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java Tue Feb 16 10:41:38 2010
@@ -235,7 +235,7 @@
}
log.info("Mining FTree Tree for all patterns with {}", attribute);
MutableLong minSupport = new MutableLong(minSupportValue);
- FrequentPatternMaxHeap frequentPatterns = FPGrowth.growth(tree, minSupport, k,
+ FrequentPatternMaxHeap frequentPatterns = growth(tree, minSupport, k,
treeCache, 0, attribute, updater);
patterns.put(attribute, frequentPatterns);
outputCollector.collect(attribute, frequentPatterns);
@@ -316,7 +316,7 @@
Pair<int[],Long> transaction = transactions.next();
Arrays.sort(transaction.getFirst());
// attribcount += transaction.length;
- nodecount += FPGrowth.treeAddCount(tree, transaction.getFirst(), transaction
+ nodecount += treeAddCount(tree, transaction.getFirst(), transaction
.getSecond(), minSupportMutable, attributeFrequency);
i++;
if (i % 10000 == 0) {
@@ -359,7 +359,7 @@
updater.update("FPGrowth Algorithm for a given feature: " + attribute);
FPTree conditionalTree = treeCache.getFirstLevelTree(attribute);
if (conditionalTree.isEmpty()) {
- FPGrowth.traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
+ traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
minSupportMutable, conditionalTree, tree);
// printTree(conditionalTree);
@@ -368,15 +368,15 @@
FrequentPatternMaxHeap returnedPatterns;
if (attribute == currentAttribute) {
- returnedPatterns = FPGrowth.growthTopDown(conditionalTree, minSupportMutable, k,
+ returnedPatterns = growthTopDown(conditionalTree, minSupportMutable, k,
treeCache, level + 1, true, currentAttribute, updater);
- frequentPatterns = FPGrowth.mergeHeap(frequentPatterns, returnedPatterns,
+ frequentPatterns = mergeHeap(frequentPatterns, returnedPatterns,
attribute, count, true, true);
} else {
- returnedPatterns = FPGrowth.growthTopDown(conditionalTree, minSupportMutable, k,
+ returnedPatterns = growthTopDown(conditionalTree, minSupportMutable, k,
treeCache, level + 1, false, currentAttribute, updater);
- frequentPatterns = FPGrowth.mergeHeap(frequentPatterns, returnedPatterns,
+ frequentPatterns = mergeHeap(frequentPatterns, returnedPatterns,
attribute, count, false, true);
}
if (frequentPatterns.isFull()) {
@@ -417,7 +417,7 @@
}
if (tree.singlePath()) {
- return FPGrowth.generateSinglePathPatterns(tree, k, minSupportMutable);
+ return generateSinglePathPatterns(tree, k, minSupportMutable);
}
updater.update("Bottom Up FP Growth");
@@ -431,28 +431,28 @@
FrequentPatternMaxHeap returnedPatterns;
if (conditionalOfCurrentAttribute) {
- FPGrowth.traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
+ traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
minSupportMutable, conditionalTree, tree);
- returnedPatterns = FPGrowth.growthBottomUp(conditionalTree, minSupportMutable,
+ returnedPatterns = growthBottomUp(conditionalTree, minSupportMutable,
k, treeCache, level + 1, true, currentAttribute, updater);
- frequentPatterns = FPGrowth.mergeHeap(frequentPatterns, returnedPatterns,
+ frequentPatterns = mergeHeap(frequentPatterns, returnedPatterns,
attribute, count, true, false);
} else {
if (attribute == currentAttribute) {
- FPGrowth.traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
+ traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
minSupportMutable, conditionalTree, tree);
- returnedPatterns = FPGrowth.growthBottomUp(conditionalTree, minSupportMutable,
+ returnedPatterns = growthBottomUp(conditionalTree, minSupportMutable,
k, treeCache, level + 1, true, currentAttribute, updater);
- frequentPatterns = FPGrowth.mergeHeap(frequentPatterns, returnedPatterns,
+ frequentPatterns = mergeHeap(frequentPatterns, returnedPatterns,
attribute, count, true, false);
} else if (attribute > currentAttribute) {
- FPGrowth.traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
+ traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
minSupportMutable, conditionalTree, tree);
- returnedPatterns = FPGrowth.growthBottomUp(conditionalTree, minSupportMutable,
+ returnedPatterns = growthBottomUp(conditionalTree, minSupportMutable,
k, treeCache, level + 1, false, currentAttribute, updater);
- frequentPatterns = FPGrowth.mergeHeap(frequentPatterns, returnedPatterns,
+ frequentPatterns = mergeHeap(frequentPatterns, returnedPatterns,
attribute, count, false, false);
}
}
@@ -494,7 +494,7 @@
}
if (tree.singlePath()) {
- return FPGrowth.generateSinglePathPatterns(tree, k, minSupportMutable);
+ return generateSinglePathPatterns(tree, k, minSupportMutable);
}
updater.update("Top Down Growth:");
@@ -510,29 +510,29 @@
FrequentPatternMaxHeap returnedPatterns;
if (conditionalOfCurrentAttribute) {
- FPGrowth.traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
+ traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
minSupportMutable, conditionalTree, tree);
- returnedPatterns = FPGrowth.growthBottomUp(conditionalTree, minSupportMutable,
+ returnedPatterns = growthBottomUp(conditionalTree, minSupportMutable,
k, treeCache, level + 1, true, currentAttribute, updater);
- frequentPatterns = FPGrowth.mergeHeap(frequentPatterns, returnedPatterns,
+ frequentPatterns = mergeHeap(frequentPatterns, returnedPatterns,
attribute, count, true, true);
} else {
if (attribute == currentAttribute) {
- FPGrowth.traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
+ traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
minSupportMutable, conditionalTree, tree);
- returnedPatterns = FPGrowth.growthBottomUp(conditionalTree, minSupportMutable,
+ returnedPatterns = growthBottomUp(conditionalTree, minSupportMutable,
k, treeCache, level + 1, true, currentAttribute, updater);
- frequentPatterns = FPGrowth.mergeHeap(frequentPatterns, returnedPatterns,
+ frequentPatterns = mergeHeap(frequentPatterns, returnedPatterns,
attribute, count, true, false);
} else if (attribute > currentAttribute) {
- FPGrowth.traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
+ traverseAndBuildConditionalFPTreeData(tree.getHeaderNext(attribute),
minSupportMutable, conditionalTree, tree);
- returnedPatterns = FPGrowth.growthBottomUp(conditionalTree, minSupportMutable,
+ returnedPatterns = growthBottomUp(conditionalTree, minSupportMutable,
k, treeCache, level + 1, false, currentAttribute, updater);
- frequentPatterns = FPGrowth.mergeHeap(frequentPatterns, returnedPatterns,
+ frequentPatterns = mergeHeap(frequentPatterns, returnedPatterns,
attribute, count, false, true);
}
@@ -621,7 +621,7 @@
tree.clearConditional();
conditionalTree.reorderHeaderTable();
- FPGrowth.pruneFPTree(minSupportMutable, conditionalTree);
+ pruneFPTree(minSupportMutable, conditionalTree);
// prune Conditional Tree
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPTreeDepthCache.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPTreeDepthCache.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPTreeDepthCache.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPTreeDepthCache.java Tue Feb 16 10:41:38 2010
@@ -37,7 +37,7 @@
FPTreeDepthCache.class);
private final LeastKCache<Integer,FPTree> firstLevelCache
- = new LeastKCache<Integer,FPTree>(FPTreeDepthCache.firstLevelCacheSize);
+ = new LeastKCache<Integer,FPTree>(firstLevelCacheSize);
private int hits;
@@ -47,11 +47,11 @@
public FPTreeDepthCache() {
log.info("Initializing FPTreeCache with firstLevelCacheSize: {}",
- FPTreeDepthCache.firstLevelCacheSize);
+ firstLevelCacheSize);
}
public static int getFirstLevelCacheSize() {
- return FPTreeDepthCache.firstLevelCacheSize;
+ return firstLevelCacheSize;
}
public static void setFirstLevelCacheSize(int firstLevelCacheSize) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java Tue Feb 16 10:41:38 2010
@@ -58,10 +58,10 @@
public static void evaluate(FitnessEvaluator<?> evaluator, List<?> population, List<Double> evaluations) throws IOException {
JobConf conf = new JobConf(MahoutEvaluator.class);
FileSystem fs = FileSystem.get(conf);
- Path inpath = MahoutEvaluator.prepareInput(fs, population);
+ Path inpath = prepareInput(fs, population);
Path outpath = OutputUtils.prepareOutput(fs);
- MahoutEvaluator.configureJob(conf, evaluator, inpath, outpath);
+ configureJob(conf, evaluator, inpath, outpath);
JobClient.runJob(conf);
OutputUtils.importEvaluations(fs, conf, outpath, evaluations);
@@ -86,7 +86,7 @@
fs.mkdirs(inpath);
- MahoutEvaluator.storePopulation(fs, new Path(inpath, "population"), population);
+ storePopulation(fs, new Path(inpath, "population"), population);
return inpath;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/OutputUtils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/OutputUtils.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/OutputUtils.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/OutputUtils.java Tue Feb 16 10:41:38 2010
@@ -90,7 +90,7 @@
Sorter sorter = new Sorter(fs, LongWritable.class, DoubleWritable.class, conf);
// merge and sort the outputs
- Path[] outfiles = OutputUtils.listOutputFiles(fs, outpath);
+ Path[] outfiles = listOutputFiles(fs, outpath);
Path output = new Path(outpath, "output.sorted");
sorter.merge(outfiles, output);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java Tue Feb 16 10:41:38 2010
@@ -48,7 +48,7 @@
* @throws IOException if an error occurs while reading or writing files
*/
public BookCrossingDataModel(File ratingsFile) throws IOException {
- super(BookCrossingDataModel.convertBCFile(ratingsFile));
+ super(convertBCFile(ratingsFile));
}
private static File convertBCFile(File originalFile) throws IOException {
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/NetflixFileDataModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/NetflixFileDataModel.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/NetflixFileDataModel.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/NetflixFileDataModel.java Tue Feb 16 10:41:38 2010
@@ -152,7 +152,7 @@
@Override
public long nextLong() {
- if (next <= MovieIDIterator.COUNT) {
+ if (next <= COUNT) {
return next++;
}
throw new NoSuchElementException();
@@ -160,7 +160,7 @@
@Override
public long peek() {
- if (next <= MovieIDIterator.COUNT) {
+ if (next <= COUNT) {
return next;
}
throw new NoSuchElementException();
@@ -168,7 +168,7 @@
@Override
public boolean hasNext() {
- return next <= MovieIDIterator.COUNT;
+ return next <= COUNT;
}
@Override
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java Tue Feb 16 10:41:38 2010
@@ -79,7 +79,7 @@
byUserEntryCache.put(userIDString, cachedLines);
}
cachedLines.add(movieIDString + ratingString);
- TransposeToByUser.maybeFlushCache(byUserDirectory, byUserEntryCache);
+ maybeFlushCache(byUserDirectory, byUserEntryCache);
}
}
@@ -96,7 +96,7 @@
File intermediateDir = new File(byUserDirectory, String.valueOf(userIDValue % 10000));
intermediateDir.mkdirs();
File userIDFile = new File(intermediateDir, userIDValue / 10000 + ".txt");
- TransposeToByUser.appendStringsToFile(lines, userIDFile);
+ appendStringsToFile(lines, userIDFile);
}
byUserEntryCache.clear();
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java Tue Feb 16 10:41:38 2010
@@ -116,7 +116,7 @@
// you can't instantiate it
analyzerClass.newInstance();
}
- WikipediaDatasetCreatorDriver.runJob(inputPath, outputPath, catFile, cmdLine.hasOption(exactMatchOpt),
+ runJob(inputPath, outputPath, catFile, cmdLine.hasOption(exactMatchOpt),
analyzerClass);
} catch (OptionException e) {
log.error("Exception", e);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/canopy/DisplayCanopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/canopy/DisplayCanopy.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/canopy/DisplayCanopy.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/canopy/DisplayCanopy.java Tue Feb 16 10:41:38 2010
@@ -49,12 +49,12 @@
super.plotSampleData(g);
Graphics2D g2 = (Graphics2D) g;
Vector dv = new DenseVector(2);
- for (Canopy canopy : DisplayCanopy.canopies) {
+ for (Canopy canopy : canopies) {
if (canopy.getNumPoints() > DisplayDirichlet.sampleData.size() * 0.05) {
- dv.assign(DisplayCanopy.t1);
- g2.setColor(DisplayDirichlet.colors[0]);
+ dv.assign(t1);
+ g2.setColor(colors[0]);
DisplayDirichlet.plotEllipse(g2, canopy.getCenter(), dv);
- dv.assign(DisplayCanopy.t2);
+ dv.assign(t2);
DisplayDirichlet.plotEllipse(g2, canopy.getCenter(), dv);
}
}
@@ -113,9 +113,9 @@
RandomUtils.useTestSeed();
DisplayDirichlet.generateSamples();
List<VectorWritable> points = new ArrayList<VectorWritable>();
- points.addAll(DisplayDirichlet.sampleData);
- DisplayCanopy.canopies = DisplayCanopy.populateCanopies(new ManhattanDistanceMeasure(), points,
- DisplayCanopy.t1, DisplayCanopy.t2);
+ points.addAll(sampleData);
+ canopies = populateCanopies(new ManhattanDistanceMeasure(), points,
+ t1, t2);
new DisplayCanopy();
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/Display2dASNDirichlet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/Display2dASNDirichlet.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/Display2dASNDirichlet.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/Display2dASNDirichlet.java Tue Feb 16 10:41:38 2010
@@ -33,7 +33,7 @@
Display2dASNDirichlet() {
initialize();
this.setTitle("Dirichlet Process Clusters - 2-d Asymmetric Sampled Normal Distribution (>"
- + (int) (DisplayDirichlet.significance * 100)
+ + (int) (significance * 100)
+ "% of population)");
}
@@ -44,9 +44,9 @@
Vector dv = new DenseVector(2);
int i = DisplayDirichlet.result.size() - 1;
- for (Model<VectorWritable>[] models : DisplayDirichlet.result) {
+ for (Model<VectorWritable>[] models : result) {
g2.setStroke(new BasicStroke(i == 0 ? 3 : 1));
- g2.setColor(DisplayDirichlet.colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
+ g2.setColor(colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
for (Model<VectorWritable> m : models) {
AsymmetricSampledNormalModel mm = (AsymmetricSampledNormalModel) m;
dv.assign(mm.getStdDev().times(3));
@@ -60,7 +60,7 @@
public static void main(String[] args) {
RandomUtils.useTestSeed();
DisplayDirichlet.generate2dSamples();
- Display2dASNDirichlet.generateResults();
+ generateResults();
new Display2dASNDirichlet();
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNDirichlet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNDirichlet.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNDirichlet.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNDirichlet.java Tue Feb 16 10:41:38 2010
@@ -34,7 +34,7 @@
initialize();
this
.setTitle("Dirichlet Process Clusters - Asymmetric Sampled Normal Distribution (>"
- + (int) (DisplayDirichlet.significance * 100) + "% of population)");
+ + (int) (significance * 100) + "% of population)");
}
@Override
@@ -44,9 +44,9 @@
Vector dv = new DenseVector(2);
int i = DisplayDirichlet.result.size() - 1;
- for (Model<VectorWritable>[] models : DisplayDirichlet.result) {
+ for (Model<VectorWritable>[] models : result) {
g2.setStroke(new BasicStroke(i == 0 ? 3 : 1));
- g2.setColor(DisplayDirichlet.colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
+ g2.setColor(colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
for (Model<VectorWritable> m : models) {
AsymmetricSampledNormalModel mm = (AsymmetricSampledNormalModel) m;
dv.assign(mm.getStdDev().times(3));
@@ -60,7 +60,7 @@
public static void main(String[] args) {
RandomUtils.useTestSeed();
DisplayDirichlet.generateSamples();
- DisplayASNDirichlet.generateResults();
+ generateResults();
new DisplayASNDirichlet();
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNOutputState.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNOutputState.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNOutputState.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayASNOutputState.java Tue Feb 16 10:41:38 2010
@@ -43,7 +43,7 @@
DisplayASNOutputState() {
initialize();
this.setTitle("Dirichlet Process Clusters - Map/Reduce Results (>"
- + (int) (DisplayDirichlet.significance * 100) + "% of population)");
+ + (int) (significance * 100) + "% of population)");
}
@Override
@@ -53,9 +53,9 @@
Vector dv = new DenseVector(2);
int i = DisplayDirichlet.result.size() - 1;
- for (Model<VectorWritable>[] models : DisplayDirichlet.result) {
+ for (Model<VectorWritable>[] models : result) {
g2.setStroke(new BasicStroke(i == 0 ? 3 : 1));
- g2.setColor(DisplayDirichlet.colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
+ g2.setColor(colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
for (Model<VectorWritable> m : models) {
AsymmetricSampledNormalModel mm = (AsymmetricSampledNormalModel) m;
dv.set(0, mm.getStdDev().get(0) * 3);
@@ -87,12 +87,12 @@
private static void getSamples() throws IOException {
File f = new File("input");
for (File g : f.listFiles()) {
- DisplayDirichlet.sampleData.addAll(DisplayASNOutputState.readFile(g.getCanonicalPath()));
+ DisplayDirichlet.sampleData.addAll(readFile(g.getCanonicalPath()));
}
}
private static void getResults() throws IOException, InvocationTargetException, NoSuchMethodException {
- DisplayDirichlet.result = new ArrayList<Model<VectorWritable>[]>();
+ result = new ArrayList<Model<VectorWritable>[]>();
JobConf conf = new JobConf(KMeansDriver.class);
conf
.set(DirichletDriver.MODEL_FACTORY_KEY,
@@ -111,8 +111,8 @@
public static void main(String[] args) throws IOException, InvocationTargetException, NoSuchMethodException {
RandomUtils.useTestSeed();
- DisplayASNOutputState.getSamples();
- DisplayASNOutputState.getResults();
+ getSamples();
+ getResults();
new DisplayASNOutputState();
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayNDirichlet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayNDirichlet.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayNDirichlet.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayNDirichlet.java Tue Feb 16 10:41:38 2010
@@ -33,7 +33,7 @@
DisplayNDirichlet() {
initialize();
this.setTitle("Dirichlet Process Clusters - Normal Distribution (>"
- + (int) (DisplayDirichlet.significance * 100) + "% of population)");
+ + (int) (significance * 100) + "% of population)");
}
@Override
@@ -43,9 +43,9 @@
Vector dv = new DenseVector(2);
int i = DisplayDirichlet.result.size() - 1;
- for (Model<VectorWritable>[] models : DisplayDirichlet.result) {
+ for (Model<VectorWritable>[] models : result) {
g2.setStroke(new BasicStroke(i == 0 ? 3 : 1));
- g2.setColor(DisplayDirichlet.colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
+ g2.setColor(colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
for (Model<VectorWritable> m : models) {
NormalModel mm = (NormalModel) m;
dv.assign(mm.getStdDev() * 3);
@@ -59,7 +59,7 @@
public static void main(String[] args) {
RandomUtils.useTestSeed();
DisplayDirichlet.generateSamples();
- DisplayNDirichlet.generateResults();
+ generateResults();
new DisplayNDirichlet();
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayOutputState.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayOutputState.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayOutputState.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplayOutputState.java Tue Feb 16 10:41:38 2010
@@ -42,7 +42,7 @@
DisplayOutputState() {
initialize();
this.setTitle("Dirichlet Process Clusters - Map/Reduce Results (>"
- + (int) (DisplayDirichlet.significance * 100) + "% of population)");
+ + (int) (significance * 100) + "% of population)");
}
@Override
@@ -52,9 +52,9 @@
Vector dv = new DenseVector(2);
int i = DisplayDirichlet.result.size() - 1;
- for (Model<VectorWritable>[] models : DisplayDirichlet.result) {
+ for (Model<VectorWritable>[] models : result) {
g2.setStroke(new BasicStroke(i == 0 ? 3 : 1));
- g2.setColor(DisplayDirichlet.colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
+ g2.setColor(colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
for (Model<VectorWritable> m : models) {
NormalModel mm = (NormalModel) m;
dv.assign(mm.getStdDev() * 3);
@@ -85,12 +85,12 @@
private static void getSamples() throws IOException {
File f = new File("input");
for (File g : f.listFiles()) {
- DisplayDirichlet.sampleData.addAll(DisplayOutputState.readFile(g.getCanonicalPath()));
+ DisplayDirichlet.sampleData.addAll(readFile(g.getCanonicalPath()));
}
}
private static void getResults() throws IOException, InvocationTargetException, NoSuchMethodException {
- DisplayDirichlet.result = new ArrayList<Model<VectorWritable>[]>();
+ result = new ArrayList<Model<VectorWritable>[]>();
JobConf conf = new JobConf(KMeansDriver.class);
conf.set(DirichletDriver.MODEL_FACTORY_KEY,
"org.apache.mahout.clustering.dirichlet.models.SampledNormalDistribution");
@@ -108,8 +108,8 @@
public static void main(String[] args) throws IOException, InvocationTargetException, NoSuchMethodException {
RandomUtils.useTestSeed();
- DisplayOutputState.getSamples();
- DisplayOutputState.getResults();
+ getSamples();
+ getResults();
new DisplayOutputState();
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplaySNDirichlet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplaySNDirichlet.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplaySNDirichlet.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/dirichlet/DisplaySNDirichlet.java Tue Feb 16 10:41:38 2010
@@ -33,7 +33,7 @@
DisplaySNDirichlet() {
initialize();
this.setTitle("Dirichlet Process Clusters - Sampled Normal Distribution (>"
- + (int) (DisplayDirichlet.significance * 100) + "% of population)");
+ + (int) (significance * 100) + "% of population)");
}
@Override
@@ -43,9 +43,9 @@
Vector dv = new DenseVector(2);
int i = DisplayDirichlet.result.size() - 1;
- for (Model<VectorWritable>[] models : DisplayDirichlet.result) {
+ for (Model<VectorWritable>[] models : result) {
g2.setStroke(new BasicStroke(i == 0 ? 3 : 1));
- g2.setColor(DisplayDirichlet.colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
+ g2.setColor(colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
for (Model<VectorWritable> m : models) {
NormalModel mm = (NormalModel) m;
dv.assign(mm.getStdDev() * 3);
@@ -59,7 +59,7 @@
public static void main(String[] args) {
RandomUtils.useTestSeed();
DisplayDirichlet.generateSamples();
- DisplaySNDirichlet.generateResults();
+ generateResults();
new DisplaySNDirichlet();
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java Tue Feb 16 10:41:38 2010
@@ -51,9 +51,9 @@
Graphics2D g2 = (Graphics2D) g;
Vector dv = new DenseVector(2);
int i = DisplayFuzzyKMeans.clusters.size() - 1;
- for (List<SoftCluster> cls : DisplayFuzzyKMeans.clusters) {
+ for (List<SoftCluster> cls : clusters) {
g2.setStroke(new BasicStroke(i == 0 ? 3 : 1));
- g2.setColor(DisplayDirichlet.colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
+ g2.setColor(colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
for (SoftCluster cluster : cls) {
// if (true || cluster.getWeightedPointTotal().zSum() > sampleData.size() * 0.05) {
dv.assign(cluster.std() * 3);
@@ -78,7 +78,7 @@
next.add(new SoftCluster(c.getCenter()));
}
DisplayFuzzyKMeans.clusters.add(next);
- converged = DisplayFuzzyKMeans.iterateReference(points, DisplayFuzzyKMeans.clusters.get(iteration),
+ converged = iterateReference(points, DisplayFuzzyKMeans.clusters.get(iteration),
clusterer);
}
}
@@ -177,18 +177,18 @@
RandomUtils.useTestSeed();
DisplayDirichlet.generateSamples();
List<VectorWritable> points = new ArrayList<VectorWritable>();
- points.addAll(DisplayDirichlet.sampleData);
- List<Canopy> canopies = DisplayFuzzyKMeans.populateCanopies(new ManhattanDistanceMeasure(), points,
- DisplayFuzzyKMeans.t1, DisplayFuzzyKMeans.t2);
+ points.addAll(sampleData);
+ List<Canopy> canopies = populateCanopies(new ManhattanDistanceMeasure(), points,
+ t1, t2);
DistanceMeasure measure = new ManhattanDistanceMeasure();
- DisplayFuzzyKMeans.clusters = new ArrayList<List<SoftCluster>>();
+ clusters = new ArrayList<List<SoftCluster>>();
DisplayFuzzyKMeans.clusters.add(new ArrayList<SoftCluster>());
for (Canopy canopy : canopies) {
if (canopy.getNumPoints() > 0.05 * DisplayDirichlet.sampleData.size()) {
DisplayFuzzyKMeans.clusters.get(0).add(new SoftCluster(canopy.getCenter()));
}
}
- DisplayFuzzyKMeans.referenceFuzzyKMeans(DisplayDirichlet.sampleData, measure, 0.001, 2, 10);
+ referenceFuzzyKMeans(sampleData, measure, 0.001, 2, 10);
new DisplayFuzzyKMeans();
}
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/kmeans/DisplayKMeans.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/kmeans/DisplayKMeans.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/kmeans/DisplayKMeans.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/kmeans/DisplayKMeans.java Tue Feb 16 10:41:38 2010
@@ -51,9 +51,9 @@
Graphics2D g2 = (Graphics2D) g;
Vector dv = new DenseVector(2);
int i = DisplayKMeans.clusters.size() - 1;
- for (List<Cluster> cls : DisplayKMeans.clusters) {
+ for (List<Cluster> cls : clusters) {
g2.setStroke(new BasicStroke(i == 0 ? 3 : 1));
- g2.setColor(DisplayDirichlet.colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
+ g2.setColor(colors[Math.min(DisplayDirichlet.colors.length - 1, i--)]);
for (Cluster cluster : cls) {
// if (true || cluster.getNumPoints() > sampleData.size() * 0.05) {
dv.assign(cluster.getStd() * 3);
@@ -89,7 +89,7 @@
next.add(new Cluster(c.getCenter()));
}
clusters.add(next);
- converged = DisplayKMeans.iterateReference(points, clusters.get(iteration), measure);
+ converged = iterateReference(points, clusters.get(iteration), measure);
}
}
@@ -190,18 +190,18 @@
RandomUtils.useTestSeed();
DisplayDirichlet.generateSamples();
List<VectorWritable> points = new ArrayList<VectorWritable>();
- points.addAll(DisplayDirichlet.sampleData);
- List<Canopy> canopies = DisplayKMeans.populateCanopies(new ManhattanDistanceMeasure(), points,
- DisplayKMeans.t1, DisplayKMeans.t2);
+ points.addAll(sampleData);
+ List<Canopy> canopies = populateCanopies(new ManhattanDistanceMeasure(), points,
+ t1, t2);
DistanceMeasure measure = new ManhattanDistanceMeasure();
- DisplayKMeans.clusters = new ArrayList<List<Cluster>>();
+ clusters = new ArrayList<List<Cluster>>();
DisplayKMeans.clusters.add(new ArrayList<Cluster>());
for (Canopy canopy : canopies) {
if (canopy.getNumPoints() > 0.05 * DisplayDirichlet.sampleData.size()) {
DisplayKMeans.clusters.get(0).add(new Cluster(canopy.getCenter()));
}
}
- DisplayKMeans.referenceKmeans(DisplayDirichlet.sampleData, DisplayKMeans.clusters, measure, 10);
+ referenceKmeans(sampleData, clusters, measure, 10);
new DisplayKMeans();
}
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java Tue Feb 16 10:41:38 2010
@@ -48,12 +48,12 @@
@Override
public void paint(Graphics g) {
Graphics2D g2 = (Graphics2D) g;
- double sx = (double) res / DisplayDirichlet.ds;
+ double sx = (double) res / ds;
g2.setTransform(AffineTransform.getScaleInstance(sx, sx));
// plot the axes
g2.setColor(Color.BLACK);
- Vector dv = new DenseVector(2).assign(DisplayDirichlet.size / 2.0);
+ Vector dv = new DenseVector(2).assign(size / 2.0);
Vector dv1 = new DenseVector(2).assign(DisplayMeanShift.clusterer.getT1());
Vector dv2 = new DenseVector(2).assign(DisplayMeanShift.clusterer.getT2());
DisplayDirichlet.plotRectangle(g2, new DenseVector(2).assign(2), dv);
@@ -62,13 +62,13 @@
// plot the sample data
g2.setColor(Color.DARK_GRAY);
dv.assign(0.03);
- for (VectorWritable v : DisplayDirichlet.sampleData) {
+ for (VectorWritable v : sampleData) {
DisplayDirichlet.plotRectangle(g2, v.get(), dv);
}
int i = 0;
- for (MeanShiftCanopy canopy : DisplayMeanShift.canopies) {
+ for (MeanShiftCanopy canopy : canopies) {
if (canopy.getBoundPoints().size() > 0.015 * DisplayDirichlet.sampleData.size()) {
- g2.setColor(DisplayDirichlet.colors[Math.min(i++, DisplayDirichlet.colors.length - 1)]);
+ g2.setColor(colors[Math.min(i++, DisplayDirichlet.colors.length - 1)]);
for (Vector v : canopy.getBoundPoints()) {
DisplayDirichlet.plotRectangle(g2, v, dv);
}
@@ -81,30 +81,30 @@
private static void testReferenceImplementation() {
// add all points to the canopies
int nextCanopyId = 0;
- for (VectorWritable aRaw : DisplayDirichlet.sampleData) {
+ for (VectorWritable aRaw : sampleData) {
DisplayMeanShift.clusterer.mergeCanopy(
- new MeanShiftCanopy(aRaw.get(), nextCanopyId++), DisplayMeanShift.canopies);
+ new MeanShiftCanopy(aRaw.get(), nextCanopyId++), canopies);
}
boolean done = false;
while (!done) { // shift canopies to their centroids
done = true;
List<MeanShiftCanopy> migratedCanopies = new ArrayList<MeanShiftCanopy>();
//List<Vector> centers = new ArrayList<Vector>();
- for (MeanShiftCanopy canopy : DisplayMeanShift.canopies) {
+ for (MeanShiftCanopy canopy : canopies) {
//centers.add(canopy.getCenter());
done = DisplayMeanShift.clusterer.shiftToMean(canopy) && done;
DisplayMeanShift.clusterer.mergeCanopy(canopy, migratedCanopies);
}
//iterationCenters.add(centers);
- DisplayMeanShift.canopies = migratedCanopies;
+ canopies = migratedCanopies;
}
}
public static void main(String[] args) {
RandomUtils.useTestSeed();
DisplayDirichlet.generateSamples();
- DisplayMeanShift.testReferenceImplementation();
- for (MeanShiftCanopy canopy : DisplayMeanShift.canopies) {
+ testReferenceImplementation();
+ for (MeanShiftCanopy canopy : canopies) {
System.out.println(canopy.toString());
}
new DisplayMeanShift();
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java Tue Feb 16 10:41:38 2010
@@ -77,7 +77,7 @@
String output = cmdLine.getValue(outputOpt, "output").toString();
String vectorClassName = cmdLine.getValue(vectorOpt,
"org.apache.mahout.math.RandomAccessSparseVector").toString();
- InputDriver.runJob(input, output, vectorClassName);
+ runJob(input, output, vectorClassName);
} catch (OptionException e) {
InputDriver.LOG.error("Exception parsing command line: ", e);
CommandLineUtil.printHelp(group);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java Tue Feb 16 10:41:38 2010
@@ -98,7 +98,7 @@
double t1 = Double.parseDouble(cmdLine.getValue(t1Opt, "80").toString());
double t2 = Double.parseDouble(cmdLine.getValue(t2Opt, "55").toString());
- Job.runJob(input, output, measureClass, t1, t2);
+ runJob(input, output, measureClass, t1, t2);
} catch (OptionException e) {
Job.LOG.error("Exception", e);
CommandLineUtil.printHelp(group);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java Tue Feb 16 10:41:38 2010
@@ -99,7 +99,7 @@
// "org.apache.mahout.math.RandomAccessSparseVector").toString();
// Class<? extends Vector> vectorClass = Class.forName(className).asSubclass(Vector.class);
- Job.runJob(input, output, measureClass, t1, t2, convergenceDelta, maxIterations);
+ runJob(input, output, measureClass, t1, t2, convergenceDelta, maxIterations);
} catch (OptionException e) {
Job.LOG.error("Exception", e);
CommandLineUtil.printHelp(group);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputDriver.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputDriver.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputDriver.java Tue Feb 16 10:41:38 2010
@@ -65,7 +65,7 @@
String input = cmdLine.getValue(inputOpt, "testdata").toString();
String output = cmdLine.getValue(outputOpt, "output").toString();
- InputDriver.runJob(input, output);
+ runJob(input, output);
} catch (OptionException e) {
InputDriver.LOG.error("Exception parsing command line: ", e);
CommandLineUtil.printHelp(group);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java Tue Feb 16 10:41:38 2010
@@ -91,7 +91,7 @@
double t2 = Double.parseDouble(cmdLine.getValue(threshold2Opt, "1").toString());
double convergenceDelta = Double.parseDouble(cmdLine.getValue(convergenceDeltaOpt, "0.5").toString());
int maxIterations = Integer.parseInt(cmdLine.getValue(maxIterOpt, "10").toString());
- Job.runJob(input, output, measureClassName, t1, t2, convergenceDelta, maxIterations);
+ runJob(input, output, measureClassName, t1, t2, convergenceDelta, maxIterations);
} catch (OptionException e) {
Job.LOG.error("Exception parsing command line: ", e);
CommandLineUtil.printHelp(group);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputDriver.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputDriver.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputDriver.java Tue Feb 16 10:41:38 2010
@@ -64,7 +64,7 @@
String input = cmdLine.getValue(inputOpt, "testdata").toString();
String output = cmdLine.getValue(outputOpt, "output").toString();
- OutputDriver.runJob(input, output);
+ runJob(input, output);
} catch (OptionException e) {
OutputDriver.LOG.error("Exception parsing command line: ", e);
CommandLineUtil.printHelp(group);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDCrossover.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDCrossover.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDCrossover.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDCrossover.java Tue Feb 16 10:41:38 2010
@@ -51,7 +51,7 @@
// will result in a meaningful cross-over.
int crossoverIndex = 1 + rng.nextInt(parent1.getNbConditions() - 1);
for (int j = 0; j < crossoverIndex; j++) {
- CDCrossover.swap(offspring1, offspring2, j);
+ swap(offspring1, offspring2, j);
}
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java Tue Feb 16 10:41:38 2010
@@ -148,11 +148,11 @@
long start = System.currentTimeMillis();
- CDGA.runJob(dataset, target, threshold, crosspnts, mutrate, mutrange, mutprec, popSize, genCount);
+ runJob(dataset, target, threshold, crosspnts, mutrate, mutrange, mutprec, popSize, genCount);
long end = System.currentTimeMillis();
- CDGA.printElapsedTime(end - start);
+ printElapsedTime(end - start);
} catch (OptionException e) {
log.error("Error while parsing options", e);
CommandLineUtil.printHelp(group);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDMutation.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDMutation.java?rev=910458&r1=910457&r2=910458&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDMutation.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDMutation.java Tue Feb 16 10:41:38 2010
@@ -90,7 +90,7 @@
rule.setV(condInd, rndDouble(rule.getV(condInd), dataset
.getMin(attrInd), dataset.getMax(attrInd), rng));
} else {
- rule.setV(condInd, CDMutation.rndInt(rule.getV(condInd), dataset
+ rule.setV(condInd, rndInt(rule.getV(condInd), dataset
.getNbValues(attrInd), rng));
}
}