cleanups to make Jenkins a little happier

git-svn-id: https://svn.apache.org/repos/asf/mahout/trunk@1295424 13f79535-47bb-0310-9956-ffa450edef68
mt3 · Mar 1, 2012 · 59404a5 · 59404a5
1 parent 634993a
commit 59404a5
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 112 deletions.
diff --git a/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/MultiTransactionTreeIterator.java b/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/MultiTransactionTreeIterator.java
@@ -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;

diff --git a/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java b/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java
@@ -21,15 +21,11 @@
 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;

diff --git a/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthCombiner.java b/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthCombiner.java
@@ -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;
 

diff --git a/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthMapper.java b/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthMapper.java
@@ -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.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 extends Mapper<LongWritable,Text,IntWritable
 
   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 @@ protected void setup(Context context) throws IOException, InterruptedException {
     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));
   }
 }
diff --git a/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthReducer.java b/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthReducer.java
@@ -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.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 @@ protected void setup(Context context) throws IOException, InterruptedException {
     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());

diff --git a/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java b/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
@@ -20,9 +20,6 @@
 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 TransactionTree getCompressedTree() {
     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()) {

diff --git a/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeIterator.java b/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeIterator.java
@@ -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;
 
 /**

diff --git a/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTest2.java b/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTest2.java
@@ -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 void update(String status) {}
 
   }
 
-  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;
-  }
-
 }
diff --git a/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTestVs.java b/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthRetailDataTestVs.java
@@ -31,7 +31,6 @@
 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;
 

diff --git a/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTest2.java b/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTest2.java
@@ -39,7 +39,6 @@
 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;

diff --git a/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTestVs.java b/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthRetailDataTestVs.java
@@ -52,30 +52,6 @@ public final class PFPGrowthRetailDataTestVs extends MahoutTestCase {
   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();

diff --git a/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthSynthDataTest2.java b/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthSynthDataTest2.java
@@ -32,7 +32,6 @@
 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.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 void setUp() throws Exception {
     }
   }
 
-
-  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 {
 

diff --git a/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java b/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java
@@ -85,7 +85,6 @@ public void setUp() throws Exception {
    */ 
   @Test
   public void testStartParallelFPGrowth() throws Exception {
-    Configuration conf = new Configuration();
     PFPGrowth.runPFPGrowth(params);
 
     List<Pair<String,TopKStringPatterns>> frequentPatterns = PFPGrowth.readFrequentPattern(params);

diff --git a/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest2.java b/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest2.java
@@ -86,7 +86,6 @@ public void setUp() throws Exception {
    */ 
   @Test
   public void testStartParallelFPGrowth() throws Exception {
-    Configuration conf = new Configuration();
     PFPGrowth.runPFPGrowth(params);
 
     List<Pair<String,TopKStringPatterns>> frequentPatterns = PFPGrowth.readFrequentPattern(params);

diff --git a/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java b/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java
@@ -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;