You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by tc...@apache.org on 2012/03/01 07:01:07 UTC
svn commit: r1295424 - in /mahout/trunk/core/src:
main/java/org/apache/mahout/fpm/pfpgrowth/
test/java/org/apache/mahout/fpm/pfpgrowth/
Author: tcp
Date: Thu Mar 1 06:01:06 2012
New Revision: 1295424
URL: http://svn.apache.org/viewvc?rev=1295424&view=rev
Log:
cleanups to make Jenkins a little happier
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/MultiTransactionTreeIterator.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthCombiner.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeIterator.java
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTest2.java
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTestVs.java
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTest2.java
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTestVs.java
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthSynthDataTest2.java
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest2.java
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/MultiTransactionTreeIterator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/MultiTransactionTreeIterator.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/MultiTransactionTreeIterator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/MultiTransactionTreeIterator.java Thu Mar 1 06:01:06 2012
@@ -18,7 +18,6 @@
package org.apache.mahout.fpm.pfpgrowth;
import java.util.Iterator;
-import java.util.List;
import com.google.common.collect.AbstractIterator;
import org.apache.mahout.common.Pair;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java Thu Mar 1 06:01:06 2012
@@ -21,15 +21,11 @@ import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Comparator;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
import java.util.PriorityQueue;
import java.util.regex.Pattern;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.fs.FileStatus;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthCombiner.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthCombiner.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthCombiner.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthCombiner.java Thu Mar 1 06:01:06 2012
@@ -18,7 +18,6 @@
package org.apache.mahout.fpm.pfpgrowth;
import java.io.IOException;
-import java.util.List;
import org.apache.mahout.math.list.IntArrayList;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthMapper.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthMapper.java Thu Mar 1 06:01:06 2012
@@ -18,13 +18,8 @@
package org.apache.mahout.fpm.pfpgrowth;
import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map.Entry;
import java.util.regex.Pattern;
-import com.google.common.collect.Lists;
-
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
@@ -33,7 +28,6 @@ import org.apache.mahout.common.Pair;
import org.apache.mahout.common.Parameters;
import org.apache.mahout.math.list.IntArrayList;
-import org.apache.mahout.math.map.OpenIntLongHashMap;
import org.apache.mahout.math.map.OpenObjectIntHashMap;
import org.apache.mahout.math.set.OpenIntHashSet;
@@ -51,7 +45,6 @@ public class ParallelFPGrowthMapper exte
private final OpenObjectIntHashMap<String> fMap = new OpenObjectIntHashMap<String>();
private Pattern splitter;
- private int numGroups;
private int maxPerGroup;
private IntWritable wGroupID= new IntWritable();
@@ -107,8 +100,6 @@ public class ParallelFPGrowthMapper exte
splitter = Pattern.compile(params.get(PFPGrowth.SPLIT_PATTERN,
PFPGrowth.SPLITTER.toString()));
- numGroups = Integer.valueOf(params.getInt(PFPGrowth.NUM_GROUPS,
- PFPGrowth.NUM_GROUPS_DEFAULT));
maxPerGroup = Integer.valueOf(params.getInt(PFPGrowth.MAX_PER_GROUP, 0));
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthReducer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthReducer.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthReducer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthReducer.java Thu Mar 1 06:01:06 2012
@@ -18,12 +18,10 @@
package org.apache.mahout.fpm.pfpgrowth;
import java.io.IOException;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Map.Entry;
import com.google.common.collect.Lists;
@@ -40,8 +38,6 @@ import org.apache.mahout.fpm.pfpgrowth.c
import org.apache.mahout.fpm.pfpgrowth.fpgrowth.FPGrowth;
import org.apache.mahout.math.list.IntArrayList;
import org.apache.mahout.math.list.LongArrayList;
-import org.apache.mahout.math.map.OpenLongObjectHashMap;
-import org.apache.mahout.math.map.OpenObjectIntHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -144,7 +140,6 @@ public class ParallelFPGrowthReducer ext
super.setup(context);
Parameters params = new Parameters(context.getConfiguration().get(PFPGrowth.PFP_PARAMETERS, ""));
- int i = 0;
for (Pair<String,Long> e : PFPGrowth.readFList(context.getConfiguration())) {
featureReverseMap.add(e.getFirst());
freqList.add(e.getSecond());
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java Thu Mar 1 06:01:06 2012
@@ -20,9 +20,6 @@ package org.apache.mahout.fpm.pfpgrowth;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -200,12 +197,6 @@ public final class TransactionTree imple
Iterator<Pair<IntArrayList,Long>> it = iterator();
final Map<Integer,MutableLong> fList = generateFList();
int node = 0;
- Comparator<Integer> comparator = new Comparator<Integer>() {
- @Override
- public int compare(Integer o1, Integer o2) {
- return fList.get(o2).compareTo(fList.get(o1));
- }
- };
int size = 0;
List<Pair<IntArrayList,Long>> compressedTransactionSet = Lists.newArrayList();
while (it.hasNext()) {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeIterator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeIterator.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeIterator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeIterator.java Thu Mar 1 06:01:06 2012
@@ -18,13 +18,11 @@
package org.apache.mahout.fpm.pfpgrowth;
import java.util.Iterator;
-import java.util.List;
import java.util.Stack;
import org.apache.mahout.math.list.IntArrayList;
import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Lists;
import org.apache.mahout.common.Pair;
/**
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTest2.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTest2.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTest2.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTest2.java Thu Mar 1 06:01:06 2012
@@ -18,7 +18,6 @@
package org.apache.mahout.fpm.pfpgrowth;
import java.io.IOException;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -86,28 +85,4 @@ public final class FPGrowthRetailDataTes
}
- private long bestResults(Map<Set<String>, Long> res, Set<String> feats) {
- Long best = res.get(feats);
- if (best != null)
- return best;
- else
- best = -1L;
- for (Map.Entry<Set<String>, Long> ent : res.entrySet()) {
- Set<String> r = ent.getKey();
- Long supp = ent.getValue();
- if (supp <= best)
- continue;
- boolean hasAll = true;
- for (String f : feats) {
- if (!r.contains(f)) {
- hasAll = false;
- break;
- }
- }
- if (hasAll)
- best = supp;
- }
- return best;
- }
-
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTestVs.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTestVs.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTestVs.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTestVs.java Thu Mar 1 06:01:06 2012
@@ -31,7 +31,6 @@ import org.apache.mahout.common.Pair;
import org.apache.mahout.common.iterator.FileLineIterable;
import org.apache.mahout.common.iterator.StringRecordIterator;
import org.apache.mahout.fpm.pfpgrowth.convertors.StatusUpdater;
-import org.apache.mahout.fpm.pfpgrowth.fpgrowth.FPGrowth;
import org.apache.mahout.fpm.pfpgrowth.fpgrowth2.FPGrowthObj;
import org.junit.Test;
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTest2.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTest2.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTest2.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTest2.java Thu Mar 1 06:01:06 2012
@@ -39,7 +39,6 @@ import org.apache.mahout.common.Paramete
import org.apache.mahout.common.iterator.FileLineIterable;
import org.apache.mahout.common.iterator.StringRecordIterator;
import org.apache.mahout.fpm.pfpgrowth.convertors.string.TopKStringPatterns;
-import org.apache.mahout.fpm.pfpgrowth.PFPGrowth;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTestVs.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTestVs.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTestVs.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTestVs.java Thu Mar 1 06:01:06 2012
@@ -52,30 +52,6 @@ public final class PFPGrowthRetailDataTe
private final Parameters paramsImpl2 = new Parameters();
private static final Logger log = LoggerFactory.getLogger(PFPGrowthRetailDataTestVs.class);
- private static long bestResults(Map<Set<String>, Long> res, Set<String> feats) {
- Long best = res.get(feats);
- if (best != null)
- return best;
- else
- best = -1L;
- for (Map.Entry<Set<String>, Long> ent : res.entrySet()) {
- Set<String> r = ent.getKey();
- Long supp = ent.getValue();
- if (supp <= best)
- continue;
- boolean hasAll = true;
- for (String f : feats) {
- if (!r.contains(f)) {
- hasAll = false;
- break;
- }
- }
- if (hasAll)
- best = supp;
- }
- return best;
- }
-
@Override
public void setUp() throws Exception {
super.setUp();
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthSynthDataTest2.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthSynthDataTest2.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthSynthDataTest2.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthSynthDataTest2.java Thu Mar 1 06:01:06 2012
@@ -32,7 +32,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.io.Closeables;
import com.google.common.io.Files;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.Pair;
@@ -41,7 +40,6 @@ import org.apache.mahout.common.iterator
import org.apache.mahout.common.iterator.StringRecordIterator;
import org.apache.mahout.fpm.pfpgrowth.convertors.StatusUpdater;
import org.apache.mahout.fpm.pfpgrowth.convertors.string.TopKStringPatterns;
-import org.apache.mahout.fpm.pfpgrowth.PFPGrowth;
import org.apache.mahout.fpm.pfpgrowth.fpgrowth2.FPGrowthObj;
import org.junit.Test;
import org.slf4j.Logger;
@@ -93,31 +91,6 @@ public class PFPGrowthSynthDataTest2 ext
}
}
-
- private long highestSupport(Map<Set<String>, Long> res, Set<String> feats) {
- Long best= res.get(feats);
- if (best != null)
- return best;
- else
- best= -1L;
- for (Map.Entry<Set<String>, Long> ent : res.entrySet()) {
- Set<String> r= ent.getKey();
- Long supp= ent.getValue();
- if (supp <= best)
- continue;
- boolean hasAll= true;
- for (String f : feats) {
- if (!r.contains(f)) {
- hasAll= false;
- break;
- }
- }
- if (hasAll)
- best= supp;
- }
- return best;
- }
-
@Test
public void testVsSequential() throws Exception {
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java Thu Mar 1 06:01:06 2012
@@ -85,7 +85,6 @@ public final class PFPGrowthTest extends
*/
@Test
public void testStartParallelFPGrowth() throws Exception {
- Configuration conf = new Configuration();
PFPGrowth.runPFPGrowth(params);
List<Pair<String,TopKStringPatterns>> frequentPatterns = PFPGrowth.readFrequentPattern(params);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest2.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest2.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest2.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest2.java Thu Mar 1 06:01:06 2012
@@ -86,7 +86,6 @@ public final class PFPGrowthTest2 extend
*/
@Test
public void testStartParallelFPGrowth() throws Exception {
- Configuration conf = new Configuration();
PFPGrowth.runPFPGrowth(params);
List<Pair<String,TopKStringPatterns>> frequentPatterns = PFPGrowth.readFrequentPattern(params);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java?rev=1295424&r1=1295423&r2=1295424&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java Thu Mar 1 06:01:06 2012
@@ -18,7 +18,6 @@
package org.apache.mahout.fpm.pfpgrowth;
import java.util.Iterator;
-import java.util.List;
import java.util.Random;
import org.apache.mahout.common.MahoutTestCase;