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 2011/04/02 11:26:17 UTC

svn commit: r1087985 [1/2] - in /mahout/trunk: core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ core/src/...

Author: srowen
Date: Sat Apr  2 09:26:16 2011
New Revision: 1087985

URL: http://svn.apache.org/viewvc?rev=1087985&view=rev
Log:
More from a run of the style checker / FindBugs / PMD / etc

Modified:
    mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJob.java
    mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/CountUsersMapper.java
    mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizer.java
    mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/AbstractFactorizer.java
    mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingItemSimilarity.java
    mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingUserSimilarity.java
    mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
    mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/DistanceMeasureClusterDistribution.java
    mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/GaussianClusterDistribution.java
    mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModelDistribution.java
    mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/SampledNormalDistribution.java
    mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java
    mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java
    mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/RowSimilarityJob.java
    mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/BBtJob.java
    mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/DenseBlockWritable.java
    mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/Omega.java
    mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/QJob.java
    mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/UJob.java
    mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/UpperTriangular.java
    mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/VJob.java
    mahout/trunk/core/src/main/java/org/apache/mahout/math/stats/GroupedOnlineAuc.java
    mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/FeatureVectorWithRatingWritableTest.java
    mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/PredictionJobTest.java
    mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJobTest.java
    mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizerTest.java
    mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommenderTest.java
    mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java
    mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverTest.java
    mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDPrototypeTest.java
    mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Recommender.java
    mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
    mahout/trunk/math/src/main/java/org/apache/mahout/math/ssvd/EigenSolverWrapper.java
    mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineExponentialAverage.java
    mahout/trunk/math/src/test/java/org/apache/mahout/math/MahoutTestCase.java
    mahout/trunk/math/src/test/java/org/apache/mahout/math/MatrixTest.java
    mahout/trunk/math/src/test/java/org/apache/mahout/math/VectorTest.java
    mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/DistributionChecks.java
    mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/LogLikelihoodTest.java
    mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/OnlineExponentialAverageTest.java
    mahout/trunk/utils/src/main/java/org/apache/mahout/text/MailArchivesClusteringAnalyzer.java
    mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/csv/CSVVectorIterable.java
    mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/JWriterVectorWriter.java
    mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java
    mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/VectorWriter.java
    mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
    mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
    mahout/trunk/utils/src/test/java/org/apache/mahout/text/MailArchivesClusteringAnalyzerTest.java

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJob.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJob.java Sat Apr  2 09:26:16 2011
@@ -35,7 +35,14 @@ import org.apache.mahout.cf.taste.hadoop
 import org.apache.mahout.cf.taste.impl.common.FullRunningAverage;
 import org.apache.mahout.cf.taste.impl.common.RunningAverage;
 import org.apache.mahout.common.AbstractJob;
-import org.apache.mahout.math.*;
+import org.apache.mahout.common.RandomUtils;
+import org.apache.mahout.math.DenseVector;
+import org.apache.mahout.math.RandomAccessSparseVector;
+import org.apache.mahout.math.SequentialAccessSparseVector;
+import org.apache.mahout.math.VarIntWritable;
+import org.apache.mahout.math.VarLongWritable;
+import org.apache.mahout.math.Vector;
+import org.apache.mahout.math.VectorWritable;
 import org.apache.mahout.math.als.AlternateLeastSquaresSolver;
 
 import java.io.IOException;
@@ -44,8 +51,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import java.util.SortedMap;
-import java.util.TreeMap;
 
 /**
  * <p>MapReduce implementation of the factorization algorithm described in "Large-scale Parallel Collaborative Filtering for the Netflix Prize"
@@ -207,7 +212,7 @@ public class ParallelALSFactorizationJob
       Map<Integer,Float> ratings = new HashMap<Integer,Float>();
       for (FeatureVectorWithRatingWritable value : values) {
         if (value.getFeatureVector() == null) {
-          ratings.put(value.getIDIndex(), new Float(value.getRating()));
+          ratings.put(value.getIDIndex(), value.getRating());
         } else {
           featureVector = value.getFeatureVector().clone();          
         }
@@ -268,7 +273,7 @@ public class ParallelALSFactorizationJob
       extends Reducer<VarLongWritable,FloatWritable,VarIntWritable,FeatureVectorWithRatingWritable> {
 
     private int numFeatures;
-    private static final Random random = new Random();
+    private static final Random random = RandomUtils.getRandom();
 
     @Override
     protected void setup(Context ctx) throws IOException, InterruptedException {

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/CountUsersMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/CountUsersMapper.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/CountUsersMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/CountUsersMapper.java Sat Apr  2 09:26:16 2011
@@ -19,10 +19,7 @@ package org.apache.mahout.cf.taste.hadoo
 
 import java.io.IOException;
 
-import org.apache.hadoop.io.LongWritable;
-import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.mahout.cf.taste.hadoop.TasteHadoopUtils;
 import org.apache.mahout.math.VarLongWritable;
 import org.apache.mahout.math.VectorWritable;
 

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizer.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizer.java Sat Apr  2 09:26:16 2011
@@ -69,8 +69,8 @@ public class ALSWRFactorizer extends Abs
     private final DataModel dataModel;
     private final int numFeatures;
 
-    private double[][] M;
-    private double[][] U;
+    private final double[][] M;
+    private final double[][] U;
 
     Features(ALSWRFactorizer factorizer) throws TasteException {
       this.dataModel = factorizer.dataModel;

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/AbstractFactorizer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/AbstractFactorizer.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/AbstractFactorizer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/AbstractFactorizer.java Sat Apr  2 09:26:16 2011
@@ -47,7 +47,7 @@ public abstract class AbstractFactorizer
     return itemIDMapping.get(itemID);
   }
 
-  private FastByIDMap<Integer> createIDMapping(int size, LongPrimitiveIterator idIterator) {
+  private static FastByIDMap<Integer> createIDMapping(int size, LongPrimitiveIterator idIterator) {
     FastByIDMap<Integer> mapping = new FastByIDMap<Integer>(size);
     int index = 0;
     while (idIterator.hasNext()) {

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingItemSimilarity.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingItemSimilarity.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingItemSimilarity.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingItemSimilarity.java Sat Apr  2 09:26:16 2011
@@ -39,7 +39,7 @@ public final class CachingItemSimilarity
   private final RefreshHelper refreshHelper;
 
   /**
-   * Creates a {@link CachingItemSimilarity} on top of the given {@link ItemSimilarity}.
+   * Creates this on top of the given {@link ItemSimilarity}.
    * The cache is sized according to properties of the given {@link DataModel}.
    */
   public CachingItemSimilarity(ItemSimilarity similarity, DataModel dataModel) throws TasteException {
@@ -47,7 +47,7 @@ public final class CachingItemSimilarity
   }
 
   /**
-   * Creates a {@link CachingItemSimilarity} on top of the given {@link ItemSimilarity}.
+   * Creates this on top of the given {@link ItemSimilarity}.
    * The cache size is capped by the given size.
    */
   public CachingItemSimilarity(ItemSimilarity similarity, int maxCacheSize) {

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingUserSimilarity.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingUserSimilarity.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingUserSimilarity.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingUserSimilarity.java Sat Apr  2 09:26:16 2011
@@ -42,7 +42,7 @@ public final class CachingUserSimilarity
   private final RefreshHelper refreshHelper;
 
   /**
-   * Creates a {@link CachingUserSimilarity} on top of the given {@link UserSimilarity}.
+   * Creates this on top of the given {@link UserSimilarity}.
    * The cache is sized according to properties of the given {@link DataModel}.
    */
   public CachingUserSimilarity(UserSimilarity similarity, DataModel dataModel) throws TasteException {
@@ -50,7 +50,7 @@ public final class CachingUserSimilarity
   }
 
   /**
-   * Creates a {@link CachingUserSimilarity} on top of the given {@link UserSimilarity}.
+   * Creates this on top of the given {@link UserSimilarity}.
    * The cache size is capped by the given size.
    */
   public CachingUserSimilarity(UserSimilarity similarity, int maxCacheSize) {

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java Sat Apr  2 09:26:16 2011
@@ -135,13 +135,14 @@ public class ConfusionMatrix implements 
     returnString.append("Confusion Matrix\n");
     returnString.append("-------------------------------------------------------").append('\n');
     
-    for (String correctLabel : this.labelMap.keySet()) {
-      returnString.append(StringUtils.rightPad(getSmallLabel(labelMap.get(correctLabel)), 5)).append('\t');
+    for (Map.Entry<String,Integer> entry : this.labelMap.entrySet()) {
+      returnString.append(StringUtils.rightPad(getSmallLabel(entry.getValue()), 5)).append('\t');
     }
     
     returnString.append("<--Classified as").append('\n');
     
-    for (String correctLabel : this.labelMap.keySet()) {
+    for (Map.Entry<String,Integer> entry : this.labelMap.entrySet()) {
+      String correctLabel = entry.getKey();
       int labelTotal = 0;
       for (String classifiedLabel : this.labelMap.keySet()) {
         returnString.append(
@@ -149,7 +150,7 @@ public class ConfusionMatrix implements 
         labelTotal += getCount(correctLabel, classifiedLabel);
       }
       returnString.append(" |  ").append(StringUtils.rightPad(String.valueOf(labelTotal), 6)).append('\t')
-          .append(StringUtils.rightPad(getSmallLabel(labelMap.get(correctLabel)), 5))
+          .append(StringUtils.rightPad(getSmallLabel(entry.getValue()), 5))
           .append(" = ").append(correctLabel).append('\n');
     }
     returnString.append("Default Category: ").append(defaultLabel).append(": ").append(

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/DistanceMeasureClusterDistribution.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/DistanceMeasureClusterDistribution.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/DistanceMeasureClusterDistribution.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/DistanceMeasureClusterDistribution.java Sat Apr  2 09:26:16 2011
@@ -59,8 +59,7 @@ public class DistanceMeasureClusterDistr
   public Model<VectorWritable>[] sampleFromPosterior(Model<VectorWritable>[] posterior) {
     Model<VectorWritable>[] result = new DistanceMeasureCluster[posterior.length];
     for (int i = 0; i < posterior.length; i++) {
-      DistanceMeasureCluster m = (DistanceMeasureCluster) posterior[i];
-      result[i] = m.sampleFromPosterior();
+      result[i] = posterior[i].sampleFromPosterior();
     }
     return result;
   }

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/GaussianClusterDistribution.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/GaussianClusterDistribution.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/GaussianClusterDistribution.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/GaussianClusterDistribution.java Sat Apr  2 09:26:16 2011
@@ -58,8 +58,7 @@ public class GaussianClusterDistribution
   public Model<VectorWritable>[] sampleFromPosterior(Model<VectorWritable>[] posterior) {
     Model<VectorWritable>[] result = new GaussianCluster[posterior.length];
     for (int i = 0; i < posterior.length; i++) {
-      GaussianCluster m = (GaussianCluster) posterior[i];
-      result[i] = m.sampleFromPosterior();
+      result[i] = posterior[i].sampleFromPosterior();
     }
     return result;
   }

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModelDistribution.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModelDistribution.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModelDistribution.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/NormalModelDistribution.java Sat Apr  2 09:26:16 2011
@@ -48,8 +48,7 @@ public class NormalModelDistribution ext
   public Model<VectorWritable>[] sampleFromPosterior(Model<VectorWritable>[] posterior) {
     Model<VectorWritable>[] result = new NormalModel[posterior.length];
     for (int i = 0; i < posterior.length; i++) {
-      NormalModel m = (NormalModel) posterior[i];
-      result[i] = m.sampleFromPosterior();
+      result[i] = posterior[i].sampleFromPosterior();
     }
     return result;
   }

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/SampledNormalDistribution.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/SampledNormalDistribution.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/SampledNormalDistribution.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/models/SampledNormalDistribution.java Sat Apr  2 09:26:16 2011
@@ -56,8 +56,7 @@ public class SampledNormalDistribution e
   public Model<VectorWritable>[] sampleFromPosterior(Model<VectorWritable>[] posterior) {
     Model<VectorWritable>[] result = new SampledNormalModel[posterior.length];
     for (int i = 0; i < posterior.length; i++) {
-      SampledNormalModel m = (SampledNormalModel) posterior[i];
-      result[i] = m.sampleFromPosterior();
+      result[i] = posterior[i].sampleFromPosterior();
     }
     return result;
   }

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/common/IOUtils.java Sat Apr  2 09:26:16 2011
@@ -177,7 +177,7 @@ public final class IOUtils {
    */
   public static class DeleteFileOnClose implements Closeable {
 
-    private File file;
+    private final File file;
 
     public DeleteFileOnClose(File file) {
       this.file = file;
@@ -185,8 +185,9 @@ public final class IOUtils {
 
     @Override
     public void close() throws IOException {
-      if (file.isFile())
+      if (file.isFile()) {
         file.delete();
+      }
     }
 
   }

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java Sat Apr  2 09:26:16 2011
@@ -46,7 +46,7 @@ public final class VectorWritable extend
   }
 
   /**
-   * @return {@link Vector} that this {@link VectorWritable} is to write, or has
+   * @return {@link Vector} that this is to write, or has
    *  just read
    */
   public Vector get() {
@@ -58,7 +58,7 @@ public final class VectorWritable extend
   }
 
   /**
-   * @return true if this {@link VectorWritable} is allowed to encode {@link Vector}
+   * @return true if this is allowed to encode {@link Vector}
    *  values using fewer bytes, possibly losing precision. In particular this means
    *  that floating point values will be encoded as floats, not doubles.
    */

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/RowSimilarityJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/RowSimilarityJob.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/RowSimilarityJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/RowSimilarityJob.java Sat Apr  2 09:26:16 2011
@@ -81,7 +81,7 @@ public class RowSimilarityJob extends Ab
 
   private static final int DEFAULT_MAX_SIMILARITIES_PER_ROW = 100;
 
-  public static enum Counter {
+  public enum Counter {
     COOCCURRENCES, SIMILAR_ROWS
   }
 

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/BBtJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/BBtJob.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/BBtJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/BBtJob.java Sat Apr  2 09:26:16 2011
@@ -45,6 +45,9 @@ public class BBtJob {
 
   public static final String OUTPUT_BBT = "part";
 
+  private BBtJob() {
+  }
+
   public static void run(Configuration conf, Path btPath, Path outputPath,
       int numReduceTasks) throws IOException, ClassNotFoundException,
       InterruptedException {
@@ -72,16 +75,15 @@ public class BBtJob {
     FileOutputFormat.setOutputPath(job, outputPath);
     SequenceFileOutputFormat.setOutputCompressionType(job,
         CompressionType.BLOCK);
-    SequenceFileOutputFormat.setOutputCompressorClass(job, DefaultCodec.class);
+    FileOutputFormat.setOutputCompressorClass(job, DefaultCodec.class);
     job.getConfiguration().set("mapreduce.output.basename", OUTPUT_BBT);
 
     // run
     job.submit();
     job.waitForCompletion(false);
-    if (!job.isSuccessful())
+    if (!job.isSuccessful()) {
       throw new IOException("BBt job failed.");
-    return;
-
+    }
   }
 
   // actually, B*Bt matrix is small enough so that we don't need to rely on
@@ -89,8 +91,8 @@ public class BBtJob {
   public static class BBtMapper extends
       Mapper<IntWritable, VectorWritable, IntWritable, VectorWritable> {
 
-    private VectorWritable vw = new VectorWritable();
-    private IntWritable iw = new IntWritable();
+    private final VectorWritable vw = new VectorWritable();
+    private final IntWritable iw = new IntWritable();
     private UpperTriangular bbtPartial; // are all partial BBt products
                                           // symmetrical as well? yes.
 
@@ -105,9 +107,10 @@ public class BBtJob {
       for (int i = 0; i < kp; i++) {
         // this approach should reduce GC churn rate
         double mul = btVec.getQuick(i);
-        for (int j = i; j < kp; j++)
+        for (int j = i; j < kp; j++) {
           bbtPartial.setQuick(i, j,
-              bbtPartial.getQuick(i, j) + mul * btVec.getQuick(j));
+                              bbtPartial.getQuick(i, j) + mul * btVec.getQuick(j));
+        }
       }
     }
 
@@ -132,9 +135,10 @@ public class BBtJob {
     protected void cleanup(Context context) throws IOException,
         InterruptedException {
       try {
-        if (accum != null)
+        if (accum != null) {
           context.write(new IntWritable(), new VectorWritable(new DenseVector(
               accum, true)));
+        }
       } finally {
         super.cleanup(context);
       }
@@ -149,8 +153,9 @@ public class BBtJob {
         accum = new double[bbtPartial.size()];
       }
       do {
-        for (int i = 0; i < accum.length; i++)
+        for (int i = 0; i < accum.length; i++) {
           accum[i] += bbtPartial.getQuick(i);
+        }
       } while (vwIter.hasNext() && null != (bbtPartial = vwIter.next().get()));
     }
 

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/DenseBlockWritable.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/DenseBlockWritable.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/DenseBlockWritable.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/DenseBlockWritable.java Sat Apr  2 09:26:16 2011
@@ -39,11 +39,7 @@ import org.apache.mahout.math.MatrixWrit
  * 
  */
 public class DenseBlockWritable implements Writable {
-  double[][] block;
-
-  public DenseBlockWritable() {
-    super();
-  }
+  private double[][] block;
 
   public void setBlock(double[][] block) {
     this.block = block;
@@ -57,15 +53,18 @@ public class DenseBlockWritable implemen
   public void readFields(DataInput in) throws IOException {
     int m = in.readInt();
     int n = in.readInt();
-    if (block == null)
+    if (block == null) {
       block = new double[m][0];
-    else if (block.length != m)
+    } else if (block.length != m) {
       block = Arrays.copyOf(block, m);
+    }
     for (int i = 0; i < m; i++) {
-      if (block[i] == null || block[i].length != n)
+      if (block[i] == null || block[i].length != n) {
         block[i] = new double[n];
-      for (int j = 0; j < n; j++)
+      }
+      for (int j = 0; j < n; j++) {
         block[i][j] = in.readDouble();
+      }
 
     }
   }
@@ -77,9 +76,11 @@ public class DenseBlockWritable implemen
 
     out.writeInt(m);
     out.writeInt(n);
-    for (int i = 0; i < m; i++)
-      for (int j = 0; j < n; j++)
+    for (int i = 0; i < m; i++) {
+      for (int j = 0; j < n; j++) {
         out.writeDouble(block[i][j]);
+      }
+    }
   }
 
 }

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/Omega.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/Omega.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/Omega.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/Omega.java Sat Apr  2 09:26:16 2011
@@ -31,12 +31,12 @@ import org.apache.mahout.math.Vector.Ele
  */
 public class Omega {
 
-  private long seed;
-  private Random rnd = new Random();
-  private int kp;
+  private final long seed;
+  // TODO find way to make the test pass while using RandomUtils.getRandom()
+  private final Random rnd = new Random();
+  private final int kp;
 
   public Omega(long seed, int k, int p) {
-    super();
     this.seed = seed;
     kp = k + p;
 
@@ -44,8 +44,9 @@ public class Omega {
 
   public void accumDots(int aIndex, double aElement, double[] yRow) {
     rnd.setSeed(getOmegaRowSeed(aIndex, seed, rnd));
-    for (int i = 0; i < kp; i++)
+    for (int i = 0; i < kp; i++) {
       yRow[i] += rnd.nextGaussian() * aElement;
+    }
   }
 
   /**
@@ -70,8 +71,9 @@ public class Omega {
       
     } else {
       int n = aRow.size();
-      for (int j = 0; j < n; j++)
+      for (int j = 0; j < n; j++) {
         accumDots(j, aRow.getQuick(j), yRow);
+      }
     }
 
   }
@@ -105,9 +107,9 @@ public class Omega {
       h ^= k;
       h *= m;
     }
-    long k = 0;
 
     if (offset < len) {
+      long k = 0;
       for (; offset < len; offset++) {
         k <<= 8;
         k |= val[offset] & 0xff;

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/QJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/QJob.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/QJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/QJob.java Sat Apr  2 09:26:16 2011
@@ -309,13 +309,13 @@ public class QJob {
     job.setInputFormatClass(SequenceFileInputFormat.class);
     FileInputFormat.setInputPaths(job, inputPaths);
     if (minSplitSize > 0) {
-      SequenceFileInputFormat.setMinInputSplitSize(job, minSplitSize);
+      FileInputFormat.setMinInputSplitSize(job, minSplitSize);
     }
 
     FileOutputFormat.setOutputPath(job, outputPath);
 
-    SequenceFileOutputFormat.setCompressOutput(job, true);
-    SequenceFileOutputFormat.setOutputCompressorClass(job, DefaultCodec.class);
+    FileOutputFormat.setCompressOutput(job, true);
+    FileOutputFormat.setOutputCompressorClass(job, DefaultCodec.class);
     SequenceFileOutputFormat.setOutputCompressionType(job,
         CompressionType.BLOCK);
 

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/UJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/UJob.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/UJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/UJob.java Sat Apr  2 09:26:16 2011
@@ -67,11 +67,9 @@ public class UJob {
 
     // Warn: tight hadoop integration here:
     job.getConfiguration().set("mapreduce.output.basename", OUTPUT_U);
-    SequenceFileOutputFormat.setCompressOutput(job, true);
-    SequenceFileOutputFormat
-        .setOutputCompressorClass(job, DefaultCodec.class);
-    SequenceFileOutputFormat.setOutputCompressionType(job,
-        CompressionType.BLOCK);
+    FileOutputFormat.setCompressOutput(job, true);
+    FileOutputFormat.setOutputCompressorClass(job, DefaultCodec.class);
+    SequenceFileOutputFormat.setOutputCompressionType(job, CompressionType.BLOCK);
 
     job.setMapperClass(UMapper.class);
     job.setMapOutputKeyClass(IntWritable.class);
@@ -82,8 +80,9 @@ public class UJob {
 
     job.getConfiguration().set(PROP_UHAT_PATH, inputUHatPath.toString());
     job.getConfiguration().set(PROP_SIGMA_PATH, sigmaPath.toString());
-    if (uHalfSigma)
+    if (uHalfSigma) {
       job.getConfiguration().set(PROP_U_HALFSIGMA, "y");
+    }
     job.getConfiguration().setInt(PROP_K, k);
     job.setNumReduceTasks(0);
     job.submit();
@@ -94,8 +93,9 @@ public class UJob {
       InterruptedException {
     job.waitForCompletion(false);
 
-    if (!job.isSuccessful())
+    if (!job.isSuccessful()) {
       throw new IOException("U job unsuccessful.");
+    }
 
   }
 
@@ -146,8 +146,9 @@ public class UJob {
       if (context.getConfiguration().get(PROP_U_HALFSIGMA) != null) {
         sValues = new DenseVector(SSVDSolver.loadDistributedRowMatrix(fs,
             sigmaPath, context.getConfiguration())[0], true);
-        for (int i = 0; i < k; i++)
+        for (int i = 0; i < k; i++) {
           sValues.setQuick(i, Math.sqrt(sValues.getQuick(i)));
+        }
       }
 
     }

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/UpperTriangular.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/UpperTriangular.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/UpperTriangular.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/UpperTriangular.java Sat Apr  2 09:26:16 2011
@@ -29,7 +29,7 @@ import org.apache.mahout.math.Vector;
  */
 public class UpperTriangular extends AbstractMatrix {
 
-  private static final double EPSILON = 1e-12; // assume anything less than
+  private static final double EPSILON = 1.0e-12; // assume anything less than
                                                  // that to be 0 during
                                                  // non-upper assignments
 
@@ -43,8 +43,6 @@ public class UpperTriangular extends Abs
    */
 
   public UpperTriangular(int n) {
-    super();
-
     values = new double[n * (n + 1) / 2];
     this.n = n;
     cardinality[0] = cardinality[1] = n;
@@ -59,14 +57,15 @@ public class UpperTriangular extends Abs
     // ((DenseVector)data).
     // system.arraycopy would've been much faster, but this way it's a drag
     // on B-t job.
-    for (int i = 0; i < n; i++)
+    for (int i = 0; i < n; i++) {
       values[i] = data.getQuick(i);
+    }
   }
 
   public UpperTriangular(double[] data, boolean shallow) {
-    super();
-    if (data == null)
+    if (data == null) {
       throw new IllegalArgumentException("data");
+    }
     values = shallow ? data : data.clone();
     n = (int) Math.round((-1 + Math.sqrt(1 + 8 * data.length)) / 2);
     cardinality[0] = cardinality[1] = n;
@@ -85,11 +84,14 @@ public class UpperTriangular extends Abs
 
   @Override
   public Matrix assignRow(int row, Vector other) {
-    for (int i = 0; i < row; i++)
-      if (other.getQuick(i) > EPSILON)
-        throw new RuntimeException("non-triangular source");
-    for (int i = row; i < n; i++)
+    for (int i = 0; i < row; i++) {
+      if (other.getQuick(i) > EPSILON) {
+        throw new IllegalArgumentException("non-triangular source");
+      }
+    }
+    for (int i = row; i < n; i++) {
       setQuick(row, i, other.get(i));
+    }
     return this;
   }
 
@@ -110,8 +112,9 @@ public class UpperTriangular extends Abs
 
   @Override
   public double getQuick(int row, int column) {
-    if (row > column)
+    if (row > column) {
       return 0;
+    }
     return values[getL(row, column)];
   }
 

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/VJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/VJob.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/VJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/VJob.java Sat Apr  2 09:26:16 2011
@@ -67,11 +67,9 @@ public class VJob {
 
     // Warn: tight hadoop integration here:
     job.getConfiguration().set("mapreduce.output.basename", OUTPUT_V);
-    SequenceFileOutputFormat.setCompressOutput(job, true);
-    SequenceFileOutputFormat
-        .setOutputCompressorClass(job, DefaultCodec.class);
-    SequenceFileOutputFormat.setOutputCompressionType(job,
-        CompressionType.BLOCK);
+    FileOutputFormat.setCompressOutput(job, true);
+    FileOutputFormat.setOutputCompressorClass(job, DefaultCodec.class);
+    SequenceFileOutputFormat.setOutputCompressionType(job, CompressionType.BLOCK);
 
     job.setMapOutputKeyClass(IntWritable.class);
     job.setMapOutputValueClass(VectorWritable.class);
@@ -83,8 +81,9 @@ public class VJob {
 
     job.getConfiguration().set(PROP_UHAT_PATH, inputUHatPath.toString());
     job.getConfiguration().set(PROP_SIGMA_PATH, inputSigmaPath.toString());
-    if (vHalfSigma)
+    if (vHalfSigma) {
       job.getConfiguration().set(PROP_V_HALFSIGMA, "y");
+    }
     job.getConfiguration().setInt(PROP_K, k);
     job.setNumReduceTasks(0);
     job.submit();
@@ -95,8 +94,9 @@ public class VJob {
       InterruptedException {
     job.waitForCompletion(false);
 
-    if (!job.isSuccessful())
+    if (!job.isSuccessful()) {
       throw new IOException("V job unsuccessful.");
+    }
 
   }
 
@@ -114,9 +114,10 @@ public class VJob {
     protected void map(IntWritable key, VectorWritable value, Context context)
       throws IOException, InterruptedException {
       Vector qRow = value.get();
-      for (int i = 0; i < k; i++)
+      for (int i = 0; i < k; i++) {
         vRow.setQuick(i,
-            qRow.dot(uHat.getColumn(i)) / sValues.getQuick(i));
+                      qRow.dot(uHat.getColumn(i)) / sValues.getQuick(i));
+      }
       context.write(key, vRowWritable); // U inherits original A row labels.
     }
 
@@ -139,9 +140,11 @@ public class VJob {
 
       sValues = new DenseVector(SSVDSolver.loadDistributedRowMatrix(fs,
           sigmaPath, context.getConfiguration())[0], true);
-      if (context.getConfiguration().get(PROP_V_HALFSIGMA) != null)
-        for (int i = 0; i < k; i++)
+      if (context.getConfiguration().get(PROP_V_HALFSIGMA) != null) {
+        for (int i = 0; i < k; i++) {
           sValues.setQuick(i, Math.sqrt(sValues.getQuick(i)));
+        }
+      }
 
     }
 

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/stats/GroupedOnlineAuc.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/stats/GroupedOnlineAuc.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/stats/GroupedOnlineAuc.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/stats/GroupedOnlineAuc.java Sat Apr  2 09:26:16 2011
@@ -91,9 +91,9 @@ public class GroupedOnlineAuc implements
   @Override
   public void write(DataOutput out) throws IOException {
     out.writeInt(map.size());
-    for (String key : map.keySet()) {
-      out.writeUTF(key);
-      PolymorphicWritable.write(out, map.get(key));
+    for (Map.Entry<String,OnlineAuc> entry : map.entrySet()) {
+      out.writeUTF(entry.getKey());
+      PolymorphicWritable.write(out, entry.getValue());
     }
     out.writeInt(policy.ordinal());
     out.writeInt(windowSize);

Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/FeatureVectorWithRatingWritableTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/FeatureVectorWithRatingWritableTest.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/FeatureVectorWithRatingWritableTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/FeatureVectorWithRatingWritableTest.java Sat Apr  2 09:26:16 2011
@@ -34,12 +34,12 @@ public class FeatureVectorWithRatingWrit
   @Test
   public void rating() throws Exception {
 
-    FeatureVectorWithRatingWritable rating = new FeatureVectorWithRatingWritable(1, 3f);
+    FeatureVectorWithRatingWritable rating = new FeatureVectorWithRatingWritable(1, 3.0f);
 
     assertTrue(rating.containsRating());
     assertFalse(rating.containsFeatureVector());
     assertEquals(1, rating.getIDIndex());
-    assertEquals(3f, rating.getRating(), 0f);
+    assertEquals(3.0f, rating.getRating(), 0.0f);
     assertNull(rating.getFeatureVector());
 
     FeatureVectorWithRatingWritable clonedRating = recreate(FeatureVectorWithRatingWritable.class, rating);
@@ -48,7 +48,7 @@ public class FeatureVectorWithRatingWrit
     assertTrue(clonedRating.containsRating());
     assertFalse(clonedRating.containsFeatureVector());
     assertEquals(1, clonedRating.getIDIndex());
-    assertEquals(3f, clonedRating.getRating(), 0f);
+    assertEquals(3.0f, clonedRating.getRating(), 0.0f);
     assertNull(clonedRating.getFeatureVector());    
   }
 

Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/PredictionJobTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/PredictionJobTest.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/PredictionJobTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/PredictionJobTest.java Sat Apr  2 09:26:16 2011
@@ -62,11 +62,11 @@ public class PredictionJobTest extends T
         "--tempDir", tempDir.getAbsolutePath() });
 
     FileDataModel dataModel = new FileDataModel(new File(outputDir, "part-r-00000"));
-    assertEquals(dataModel.getNumUsers(), 3);
-    assertEquals(dataModel.getNumItems(), 2);
-    assertEquals(dataModel.getPreferenceValue(0, 0), 2.45, EPSILON);
-    assertEquals(dataModel.getPreferenceValue(2, 1), -6.6, EPSILON);
-    assertEquals(dataModel.getPreferenceValue(1, 0), -0.61, EPSILON);
+    assertEquals(3, dataModel.getNumUsers());
+    assertEquals(2, dataModel.getNumItems());
+    assertEquals(2.45f, dataModel.getPreferenceValue(0, 0), EPSILON);
+    assertEquals(-6.6f, dataModel.getPreferenceValue(2, 1), EPSILON);
+    assertEquals(-0.61f, dataModel.getPreferenceValue(1, 0), EPSILON);
   }
 
 }

Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJobTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJobTest.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJobTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/similarity/item/ItemSimilarityJobTest.java Sat Apr  2 09:26:16 2011
@@ -30,9 +30,7 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.DoubleWritable;
 import org.apache.hadoop.io.IntWritable;
-import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapreduce.Mapper;
 import org.apache.hadoop.mapreduce.Reducer;
 import org.apache.mahout.cf.taste.hadoop.EntityEntityWritable;

Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizerTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizerTest.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizerTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizerTest.java Sat Apr  2 09:26:16 2011
@@ -37,8 +37,8 @@ import java.util.Arrays;
 
 public class ALSWRFactorizerTest extends TasteTestCase {
 
-  ALSWRFactorizer factorizer;
-  DataModel dataModel;
+  private ALSWRFactorizer factorizer;
+  private DataModel dataModel;
 
   /**
    *  rating-matrix
@@ -55,23 +55,23 @@ public class ALSWRFactorizerTest extends
     super.setUp();
     FastByIDMap<PreferenceArray> userData = new FastByIDMap<PreferenceArray>();
 
-    userData.put(1l, new GenericUserPreferenceArray(Arrays.asList(new Preference[] {
-        new GenericPreference(1l, 1l, 5f),
-        new GenericPreference(1l, 2l, 5f),
-        new GenericPreference(1l, 3l, 2f) })));
-
-    userData.put(2l, new GenericUserPreferenceArray(Arrays.asList(new Preference[] {
-        new GenericPreference(2l, 1l, 2f),
-        new GenericPreference(2l, 3l, 3f),
-        new GenericPreference(2l, 4l, 5f) })));
-
-    userData.put(3l, new GenericUserPreferenceArray(Arrays.asList(new Preference[] {
-        new GenericPreference(3l, 2l, 5f),
-        new GenericPreference(3l, 4l, 3f) })));
-
-    userData.put(4l, new GenericUserPreferenceArray(Arrays.asList(new Preference[] {
-        new GenericPreference(4l, 1l, 3f),
-        new GenericPreference(4l, 4l, 5f) })));
+    userData.put(1L, new GenericUserPreferenceArray(Arrays.asList(new Preference[] {
+        new GenericPreference(1L, 1L, 5.0f),
+        new GenericPreference(1L, 2L, 5.0f),
+        new GenericPreference(1L, 3L, 2.0f) })));
+
+    userData.put(2L, new GenericUserPreferenceArray(Arrays.asList(new Preference[] {
+        new GenericPreference(2L, 1L, 2.0f),
+        new GenericPreference(2L, 3L, 3.0f),
+        new GenericPreference(2L, 4L, 5.0f) })));
+
+    userData.put(3L, new GenericUserPreferenceArray(Arrays.asList(new Preference[] {
+        new GenericPreference(3L, 2L, 5.0f),
+        new GenericPreference(3L, 4L, 3.0f) })));
+
+    userData.put(4L, new GenericUserPreferenceArray(Arrays.asList(new Preference[] {
+        new GenericPreference(4L, 1L, 3.0f),
+        new GenericPreference(4L, 4L, 5.0f) })));
 
     dataModel = new GenericDataModel(userData);
     factorizer = new ALSWRFactorizer(dataModel, 3, 0.065, 10);
@@ -106,7 +106,7 @@ public class ALSWRFactorizerTest extends
   @Test
   public void averageRating() throws Exception {
     ALSWRFactorizer.Features features = new ALSWRFactorizer.Features(factorizer);
-    assertEquals(2.5, features.averateRating(3l), EPSILON);
+    assertEquals(2.5, features.averateRating(3L), EPSILON);
   }
 
   @Test

Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommenderTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommenderTest.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommenderTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommenderTest.java Sat Apr  2 09:26:16 2011
@@ -73,9 +73,9 @@ public class SVDRecommenderTest extends 
     List<RecommendedItem> recommendedItems = svdRecommender.recommend(1L, 5);
     assertEquals(2, recommendedItems.size());
     assertEquals(3L, recommendedItems.get(0).getItemID());
-    assertEquals(2f, recommendedItems.get(0).getValue(), EPSILON);
+    assertEquals(2.0f, recommendedItems.get(0).getValue(), EPSILON);
     assertEquals(5L, recommendedItems.get(1).getItemID());
-    assertEquals(1f, recommendedItems.get(1).getValue(), EPSILON);
+    assertEquals(1.0f, recommendedItems.get(1).getValue(), EPSILON);
 
     EasyMock.verify(dataModel, candidateItemsStrategy, factorizer, factorization);
   }

Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java Sat Apr  2 09:26:16 2011
@@ -28,6 +28,7 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.DataInputBuffer;
 import org.apache.hadoop.io.DataOutputBuffer;
 import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableComparable;
 import org.apache.hadoop.mapreduce.Mapper;
 import org.apache.hadoop.mapreduce.RecordWriter;
@@ -36,6 +37,7 @@ import org.apache.hadoop.util.ToolRunner
 import org.apache.mahout.clustering.Cluster;
 import org.apache.mahout.clustering.ClusteringTestUtils;
 import org.apache.mahout.clustering.Model;
+import org.apache.mahout.clustering.ModelDistribution;
 import org.apache.mahout.clustering.dirichlet.models.AbstractVectorModelDistribution;
 import org.apache.mahout.clustering.dirichlet.models.AsymmetricSampledNormalModel;
 import org.apache.mahout.clustering.dirichlet.models.DistanceMeasureClusterDistribution;
@@ -320,7 +322,8 @@ public final class TestMapReduce extends
     generate4Datasets();
     // Now run the driver
     int maxIterations = 3;
-    AbstractVectorModelDistribution modelDistribution = new SampledNormalDistribution(new VectorWritable(new DenseVector(2)));
+    ModelDistribution<VectorWritable> modelDistribution =
+        new SampledNormalDistribution(new VectorWritable(new DenseVector(2)));
     Configuration conf = new Configuration();
     DirichletDriver.run(conf,
                         getTestTempDirPath("input"),
@@ -334,7 +337,7 @@ public final class TestMapReduce extends
                         0,
                         false);
     // and inspect results
-    List<List<DirichletCluster>> clusters = new ArrayList<List<DirichletCluster>>();
+    Collection<List<DirichletCluster>> clusters = new ArrayList<List<DirichletCluster>>();
     conf.set(DirichletDriver.MODEL_DISTRIBUTION_KEY, modelDistribution.asJsonString());
     conf.set(DirichletDriver.NUM_CLUSTERS_KEY, "20");
     conf.set(DirichletDriver.ALPHA_0_KEY, "1.0");
@@ -352,19 +355,18 @@ public final class TestMapReduce extends
     generateAsymmetricSamples(100, 0, 3, 0.3, 4.0);
     ClusteringTestUtils.writePointsToFile(sampleData, getTestTempFilePath("input/data.txt"), fs, conf);
     // Now run the driver using the run() method. Others can use runJob() as before
-    Integer maxIterations = 5;
     MahalanobisDistanceMeasure measure = new MahalanobisDistanceMeasure();
     AbstractVectorModelDistribution modelDistribution = new DistanceMeasureClusterDistribution(new VectorWritable(new DenseVector(2)), measure);
     
     Vector meanVector = new DenseVector(new double [] {0.0, 0.0});
-    ((MahalanobisDistanceMeasure)measure).setMeanVector(meanVector);
+    measure.setMeanVector(meanVector);
     Matrix m= new DenseMatrix(new double [][] {{0.5, 0.0}, {0.0, 4.0}});
-    ((MahalanobisDistanceMeasure)measure).setCovarianceMatrix(m);
+    measure.setCovarianceMatrix(m);
     
     Path inverseCovarianceFile = new Path(getTestTempDirPath("mahalanobis"), "MahalanobisDistanceMeasureInverseCovarianceFile");
     conf.set("MahalanobisDistanceMeasure.inverseCovarianceFile", inverseCovarianceFile.toString());
     FileSystem fs = FileSystem.get(inverseCovarianceFile.toUri(), conf);
-    MatrixWritable inverseCovarianceMatrix = new MatrixWritable(((MahalanobisDistanceMeasure)measure).getInverseCovarianceMatrix());
+    MatrixWritable inverseCovarianceMatrix = new MatrixWritable(measure.getInverseCovarianceMatrix());
     DataOutputStream out = fs.create(inverseCovarianceFile);
     try {
       inverseCovarianceMatrix.write(out);
@@ -385,7 +387,8 @@ public final class TestMapReduce extends
     
     conf.set("MahalanobisDistanceMeasure.maxtrixClass", MatrixWritable.class.getName());
     conf.set("MahalanobisDistanceMeasure.vectorClass", VectorWritable.class.getName());
-    
+
+    Integer maxIterations = 5;
     String[] args = { optKey(DefaultOptionCreator.INPUT_OPTION), getTestTempDirPath("input").toString(),
         optKey(DefaultOptionCreator.OUTPUT_OPTION), getTestTempDirPath("output").toString(),
         optKey(DirichletDriver.MODEL_DISTRIBUTION_CLASS_OPTION), modelDistribution.getClass().getName(),
@@ -418,20 +421,19 @@ public final class TestMapReduce extends
     generateAsymmetricSamples(100, 0, 3, 0.3, 4.0);
     ClusteringTestUtils.writePointsToFile(sampleData, getTestTempFilePath("input/data.txt"), fs, conf);
     // Now run the driver using the run() method. Others can use runJob() as before
-    Integer maxIterations = 5;
-    
+
     MahalanobisDistanceMeasure measure = new MahalanobisDistanceMeasure();
     AbstractVectorModelDistribution modelDistribution = new DistanceMeasureClusterDistribution(new VectorWritable(new DenseVector(2)), measure);
     
     Vector meanVector = new DenseVector(new double [] {0.0, 0.0});
-    ((MahalanobisDistanceMeasure)measure).setMeanVector(meanVector);
+    measure.setMeanVector(meanVector);
     Matrix m= new DenseMatrix(new double [][] {{0.5, 0.0}, {0.0, 4.0}});
-    ((MahalanobisDistanceMeasure)measure).setCovarianceMatrix(m);
+    measure.setCovarianceMatrix(m);
     
     Path inverseCovarianceFile = new Path(getTestTempDirPath("mahalanobis"), "MahalanobisDistanceMeasureInverseCovarianceFile");
     conf.set("MahalanobisDistanceMeasure.inverseCovarianceFile", inverseCovarianceFile.toString());
     FileSystem fs = FileSystem.get(inverseCovarianceFile.toUri(), conf);
-    MatrixWritable inverseCovarianceMatrix = new MatrixWritable(((MahalanobisDistanceMeasure)measure).getInverseCovarianceMatrix());
+    MatrixWritable inverseCovarianceMatrix = new MatrixWritable(measure.getInverseCovarianceMatrix());
     DataOutputStream out = fs.create(inverseCovarianceFile);
     try {
       inverseCovarianceMatrix.write(out);
@@ -452,7 +454,8 @@ public final class TestMapReduce extends
     
     conf.set("MahalanobisDistanceMeasure.maxtrixClass", MatrixWritable.class.getName());
     conf.set("MahalanobisDistanceMeasure.vectorClass", VectorWritable.class.getName());
-    
+
+    Integer maxIterations = 5;
     String[] args = { optKey(DefaultOptionCreator.INPUT_OPTION), getTestTempDirPath("input").toString(),
         optKey(DefaultOptionCreator.OUTPUT_OPTION), getTestTempDirPath("output").toString(),
         optKey(DirichletDriver.MODEL_DISTRIBUTION_CLASS_OPTION), modelDistribution.getClass().getName(),
@@ -494,10 +497,10 @@ public final class TestMapReduce extends
   @Test
   public void testNormalModelWritableSerialization() throws Exception {
     double[] m = { 1.1, 2.2, 3.3 };
-    Model<?> model = new NormalModel(5, new DenseVector(m), 3.3);
+    Writable model = new NormalModel(5, new DenseVector(m), 3.3);
     DataOutputBuffer out = new DataOutputBuffer();
     model.write(out);
-    Model<?> model2 = new NormalModel();
+    Writable model2 = new NormalModel();
     DataInputBuffer in = new DataInputBuffer();
     in.reset(out.getData(), out.getLength());
     model2.readFields(in);
@@ -507,10 +510,10 @@ public final class TestMapReduce extends
   @Test
   public void testSampledNormalModelWritableSerialization() throws Exception {
     double[] m = { 1.1, 2.2, 3.3 };
-    Model<?> model = new SampledNormalModel(5, new DenseVector(m), 3.3);
+    Writable model = new SampledNormalModel(5, new DenseVector(m), 3.3);
     DataOutputBuffer out = new DataOutputBuffer();
     model.write(out);
-    Model<?> model2 = new SampledNormalModel();
+    Writable model2 = new SampledNormalModel();
     DataInputBuffer in = new DataInputBuffer();
     in.reset(out.getData(), out.getLength());
     model2.readFields(in);
@@ -521,10 +524,10 @@ public final class TestMapReduce extends
   public void testAsymmetricSampledNormalModelWritableSerialization() throws Exception {
     double[] m = { 1.1, 2.2, 3.3 };
     double[] s = { 3.3, 4.4, 5.5 };
-    Model<?> model = new AsymmetricSampledNormalModel(5, new DenseVector(m), new DenseVector(s));
+    Writable model = new AsymmetricSampledNormalModel(5, new DenseVector(m), new DenseVector(s));
     DataOutputBuffer out = new DataOutputBuffer();
     model.write(out);
-    Model<?> model2 = new AsymmetricSampledNormalModel();
+    Writable model2 = new AsymmetricSampledNormalModel();
     DataInputBuffer in = new DataInputBuffer();
     in.reset(out.getData(), out.getLength());
     model2.readFields(in);

Modified: mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverTest.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverTest.java Sat Apr  2 09:26:16 2011
@@ -19,6 +19,7 @@ package org.apache.mahout.math.hadoop.st
 
 import java.io.Closeable;
 import java.io.File;
+import java.util.Deque;
 import java.util.LinkedList;
 import java.util.Random;
 
@@ -30,8 +31,10 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.IntWritable;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.io.SequenceFile.CompressionType;
+import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.compress.DefaultCodec;
 import org.apache.mahout.common.MahoutTestCase;
+import org.apache.mahout.common.RandomUtils;
 import org.apache.mahout.math.DenseMatrix;
 import org.apache.mahout.math.DenseVector;
 import org.apache.mahout.math.SingularValueDecomposition;
@@ -61,11 +64,8 @@ public class LocalSSVDSolverTest extends
     // conf.set("mapred.job.tracker","localhost:11011");
     // conf.set("fs.default.name","hdfs://localhost:11010/");
 
-    LinkedList<Closeable> closeables = new LinkedList<Closeable>();
-    Random rnd = new Random();
-    int m = 1000, n = 100, k = 40, p = 60, ablockRows = 251;
-
-    double muAmplitude = 5e+1;
+    Deque<Closeable> closeables = new LinkedList<Closeable>();
+    Random rnd = RandomUtils.getRandom();
 
     File tmpDir = getTestTempDir("svdtmp");
     conf.set("hadoop.tmp.dir", tmpDir.getAbsolutePath());
@@ -78,14 +78,18 @@ public class LocalSSVDSolverTest extends
         VectorWritable.class, CompressionType.BLOCK, new DefaultCodec());
     closeables.addFirst(w);
 
+    int n = 100;
     double[] row = new double[n];
     DenseVector dv = new DenseVector(row, true);
-    VectorWritable vw = new VectorWritable(dv);
+    Writable vw = new VectorWritable(dv);
     IntWritable roww = new IntWritable();
 
+    double muAmplitude = 50.0;
+    int m = 1000;
     for (int i = 0; i < m; i++) {
-      for (int j = 0; j < n; j++)
+      for (int j = 0; j < n; j++) {
         row[j] = muAmplitude * (rnd.nextDouble() - 0.5);
+      }
       roww.set(i);
       w.append(roww, vw);
     }
@@ -103,6 +107,9 @@ public class LocalSSVDSolverTest extends
     // make sure we wipe out previous test results, just a convenience
     fs.delete(svdOutPath, true);
 
+    int ablockRows = 251;
+    int p = 60;
+    int k = 40;
     SSVDSolver ssvd = new SSVDSolver(conf, new Path[] { aPath }, svdOutPath,
         ablockRows, k, p, 3);
     // ssvd.setcUHalfSigma(true);
@@ -128,21 +135,19 @@ public class LocalSSVDSolverTest extends
     double[] svalues2 = svd2.getSingularValues();
     dumpSv(svalues2);
 
-    for (int i = 0; i < k + p; i++)
-      Assert
-          .assertTrue(Math.abs(svalues2[i] - stochasticSValues[i]) <= s_epsilon);
+    for (int i = 0; i < k + p; i++) {
+      Assert.assertTrue(Math.abs(svalues2[i] - stochasticSValues[i]) <= s_epsilon);
+    }
 
     double[][] q = SSVDSolver.loadDistributedRowMatrix(fs, new Path(svdOutPath,
         "Bt-job/" + BtJob.OUTPUT_Q + "-*"), conf);
 
-    SSVDPrototypeTest
-        .assertOrthonormality(new DenseMatrix(q), false, s_epsilon);
+    SSVDPrototypeTest.assertOrthonormality(new DenseMatrix(q), false, s_epsilon);
 
     double[][] u = SSVDSolver.loadDistributedRowMatrix(fs, new Path(svdOutPath,
-        "U/[^_]*"), conf);
+                                                                    "U/[^_]*"), conf);
 
-    SSVDPrototypeTest
-        .assertOrthonormality(new DenseMatrix(u), false, s_epsilon);
+    SSVDPrototypeTest.assertOrthonormality(new DenseMatrix(u), false, s_epsilon);
     double[][] v = SSVDSolver.loadDistributedRowMatrix(fs, new Path(svdOutPath,
         "V/[^_]*"), conf);
 
@@ -152,16 +157,18 @@ public class LocalSSVDSolverTest extends
 
   static void dumpSv(double[] s) {
     System.out.printf("svs: ");
-    for (int i = 0; i < s.length; i++)
-      System.out.printf("%f  ", s[i]);
+    for (double value : s) {
+      System.out.printf("%f  ", value);
+    }
     System.out.println();
 
   }
 
   static void dump(double[][] matrix) {
-    for (int i = 0; i < matrix.length; i++) {
-      for (int j = 0; j < matrix[i].length; j++)
-        System.out.printf("%f  ", matrix[i][j]);
+    for (double[] aMatrix : matrix) {
+      for (double anAMatrix : aMatrix) {
+        System.out.printf("%f  ", anAMatrix);
+      }
       System.out.println();
     }
   }

Modified: mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDPrototypeTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDPrototypeTest.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDPrototypeTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDPrototypeTest.java Sat Apr  2 09:26:16 2011
@@ -22,6 +22,7 @@ import java.util.Random;
 import junit.framework.Assert;
 
 import org.apache.mahout.common.MahoutTestCase;
+import org.apache.mahout.common.RandomUtils;
 import org.apache.mahout.math.DenseMatrix;
 import org.apache.mahout.math.Matrix;
 import org.apache.mahout.math.Vector;
@@ -37,8 +38,8 @@ import org.junit.Test;
  */
 public class SSVDPrototypeTest extends MahoutTestCase {
 
-  private static double s_scale = 1000;
-  private static double s_epsilon = 1e-10;
+  private static final double SCALE = 1000;
+  private static final double SVD_EPSILON = 1.0e-10;
 
   public void testSSVDPrototype() throws Exception {
     SSVDPrototype.main(null);
@@ -47,14 +48,12 @@ public class SSVDPrototypeTest extends M
   @Test
   public void testGivensQR() throws Exception {
     // DenseMatrix m = new DenseMatrix(dims<<2,dims);
-    DenseMatrix m = new DenseMatrix(3, 3);
+    Matrix m = new DenseMatrix(3, 3);
     m.assign(new DoubleFunction() {
-
-      Random m_rnd = new Random();
-
+      private final Random rnd = RandomUtils.getRandom();
       @Override
       public double apply(double arg0) {
-        return m_rnd.nextDouble() * s_scale;
+        return rnd.nextDouble() * SCALE;
       }
     });
 
@@ -68,13 +67,12 @@ public class SSVDPrototypeTest extends M
     m.setQuick(2, 1, 8);
     m.setQuick(2, 2, 9);
 
-    GivensThinSolver qrSolver = new GivensThinSolver(m.rowSize(),
-        m.columnSize());
+    GivensThinSolver qrSolver = new GivensThinSolver(m.rowSize(), m.columnSize());
     qrSolver.solve(m);
 
     Matrix qtm = new DenseMatrix(qrSolver.getThinQtTilde());
 
-    assertOrthonormality(qtm.transpose(), false, s_epsilon);
+    assertOrthonormality(qtm.transpose(), false, SVD_EPSILON);
 
     Matrix aClone = new DenseMatrix(qrSolver.getThinQtTilde()).transpose()
         .times(qrSolver.getRTilde());
@@ -83,29 +81,28 @@ public class SSVDPrototypeTest extends M
 
   }
 
-  public static void assertOrthonormality(Matrix mtx, boolean insufficientRank,
-      double epsilon) {
+  public static void assertOrthonormality(Matrix mtx, boolean insufficientRank, double epsilon) {
     int n = mtx.columnSize();
     int rank = 0;
     for (int i = 0; i < n; i++) {
-      Vector e_i = mtx.getColumn(i);
+      Vector ei = mtx.getColumn(i);
 
-      double norm = e_i.norm(2);
+      double norm = ei.norm(2);
 
-      if (Math.abs(1 - norm) < epsilon)
+      if (Math.abs(1 - norm) < epsilon) {
         rank++;
-      else
+      } else {
         Assert.assertTrue(Math.abs(norm) < epsilon);
+      }
 
       for (int j = 0; j <= i; j++) {
         Vector e_j = mtx.getColumn(j);
-        double dot = e_i.dot(e_j);
+        double dot = ei.dot(e_j);
         Assert
             .assertTrue(Math.abs((i == j && rank > j ? 1 : 0) - dot) < epsilon);
       }
     }
-    Assert.assertTrue((!insufficientRank && rank == n)
-        || (insufficientRank && rank < n));
+    Assert.assertTrue((!insufficientRank && rank == n) || (insufficientRank && rank < n));
 
   }
 

Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Recommender.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Recommender.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Recommender.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Recommender.java Sat Apr  2 09:26:16 2011
@@ -23,8 +23,6 @@ import java.util.List;
 import org.apache.mahout.cf.taste.common.Refreshable;
 import org.apache.mahout.cf.taste.common.TasteException;
 import org.apache.mahout.cf.taste.impl.recommender.GenericItemBasedRecommender;
-import org.apache.mahout.cf.taste.impl.similarity.CachingItemSimilarity;
-import org.apache.mahout.cf.taste.impl.similarity.LogLikelihoodSimilarity;
 import org.apache.mahout.cf.taste.impl.similarity.UncenteredCosineSimilarity;
 import org.apache.mahout.cf.taste.model.DataModel;
 import org.apache.mahout.cf.taste.recommender.IDRescorer;

Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java Sat Apr  2 09:26:16 2011
@@ -127,7 +127,7 @@ public final class Job extends AbstractJ
                   double t2,
                   double convergenceDelta,
                   int maxIterations)
-    throws IOException, InterruptedException, ClassNotFoundException, InstantiationException, IllegalAccessException {
+    throws IOException, InterruptedException, ClassNotFoundException {
     Path directoryContainingConvertedInput = new Path(output, DIRECTORY_CONTAINING_CONVERTED_INPUT);
     InputDriver.runJob(input, directoryContainingConvertedInput);
     new MeanShiftCanopyDriver().run(conf,

Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/ssvd/EigenSolverWrapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/ssvd/EigenSolverWrapper.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/ssvd/EigenSolverWrapper.java (original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/ssvd/EigenSolverWrapper.java Sat Apr  2 09:26:16 2011
@@ -17,6 +17,7 @@
 package org.apache.mahout.math.ssvd;
 
 import org.apache.commons.math.linear.Array2DRowRealMatrix;
+import org.apache.commons.math.linear.EigenDecomposition;
 import org.apache.commons.math.linear.EigenDecompositionImpl;
 import org.apache.commons.math.linear.RealMatrix;
 
@@ -38,19 +39,19 @@ import org.apache.commons.math.linear.Re
  */
 public class EigenSolverWrapper {
 
-  private double[] eigenvalues;
+  private final double[] eigenvalues;
   private double[][] uHat;
 
   public EigenSolverWrapper(double[][] bbt) {
-    super();
     int dim = bbt.length;
-    EigenDecompositionImpl evd2 = new EigenDecompositionImpl(
+    EigenDecomposition evd2 = new EigenDecompositionImpl(
         new Array2DRowRealMatrix(bbt), 0);
     eigenvalues = evd2.getRealEigenvalues();
     RealMatrix uHatrm = evd2.getV();
     uHat = new double[dim][];
-    for (int i = 0; i < dim; i++)
+    for (int i = 0; i < dim; i++) {
       uHat[i] = uHatrm.getRow(i);
+    }
   }
 
   public double[][] getUHat() {

Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineExponentialAverage.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineExponentialAverage.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineExponentialAverage.java (original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineExponentialAverage.java Sat Apr  2 09:26:16 2011
@@ -21,7 +21,7 @@ package org.apache.mahout.math.stats;
  * Computes an online average that is exponentially weighted toward recent time-embedded samples.
  */
 public class OnlineExponentialAverage {
-  private double alpha;
+  private final double alpha;
   private double lastT = 0;
   private double s = 0;
   private double w = 0;

Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/MahoutTestCase.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/MahoutTestCase.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/MahoutTestCase.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/MahoutTestCase.java Sat Apr  2 09:26:16 2011
@@ -80,6 +80,7 @@ public abstract class MahoutTestCase ext
   }
 
   private static class DeletingVisitor implements FileFilter {
+    @Override
     public boolean accept(File f) {
       if (!f.isFile()) {
         f.listFiles(this);

Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/MatrixTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/MatrixTest.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/MatrixTest.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/MatrixTest.java Sat Apr  2 09:26:16 2011
@@ -294,6 +294,7 @@ public abstract class MatrixTest extends
   @Test
   public void testAggregateRows() {
     Vector v = test.aggregateRows(new VectorFunction() {
+      @Override
       public double apply(Vector v) {
         return v.zSum();
       }
@@ -307,6 +308,7 @@ public abstract class MatrixTest extends
   @Test
   public void testAggregateCols() {
     Vector v = test.aggregateColumns(new VectorFunction() {
+      @Override
       public double apply(Vector v) {
         return v.zSum();
       }
@@ -321,6 +323,7 @@ public abstract class MatrixTest extends
   public void testAggregate() {
     double total = test.aggregate(Functions.PLUS, Functions.IDENTITY);
     assertEquals(test.aggregateRows(new VectorFunction() {
+      @Override
       public double apply(Vector v) {
         return v.zSum();
       }

Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/VectorTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/VectorTest.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/VectorTest.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/VectorTest.java Sat Apr  2 09:26:16 2011
@@ -504,14 +504,14 @@ public final class VectorTest extends Ma
       0.2672612419124244, 0.4235990463273581, 0.5345224838248488
     });
 
-    assertVectorEquals(expected, norm, 1e-15);
-    assertVectorEquals(expected, norm2, 1e-15);
+    assertVectorEquals(expected, norm, 1.0e-15);
+    assertVectorEquals(expected, norm2, 1.0e-15);
 
     norm = vec1.logNormalize(2);
-    assertVectorEquals(expected, norm, 1e-15);
+    assertVectorEquals(expected, norm, 1.0e-15);
     
     norm2 = vec2.logNormalize(2);
-    assertVectorEquals(expected, norm2, 1e-15);
+    assertVectorEquals(expected, norm2, 1.0e-15);
     
     try {
       vec1.logNormalize(1);
@@ -535,7 +535,7 @@ public final class VectorTest extends Ma
     }  
   }
 
-  private void assertVectorEquals(Vector expected, Vector actual, double epsilon) {
+  private static void assertVectorEquals(Vector expected, Vector actual, double epsilon) {
     assertEquals(expected.size(), actual.size());
     for (Vector.Element x : expected) {
       assertEquals(x.get(), actual.get(x.index()), epsilon);

Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/DistributionChecks.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/DistributionChecks.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/DistributionChecks.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/jet/random/DistributionChecks.java Sat Apr  2 09:26:16 2011
@@ -81,6 +81,7 @@ public final class DistributionChecks {
     UnivariateRealIntegrator integrator = new RombergIntegrator();
     for (int i = 0; i < xs.length - 1; i++) {
       double delta = integrator.integrate(new UnivariateRealFunction() {
+        @Override
         public double value(double v) {
           return dist.pdf(v);
         }

Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/LogLikelihoodTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/LogLikelihoodTest.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/LogLikelihoodTest.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/LogLikelihoodTest.java Sat Apr  2 09:26:16 2011
@@ -79,6 +79,7 @@ public final class LogLikelihoodTest ext
     // this will have lots of little positive values and a few big ones
     Vector p1 = new DenseVector(25)
       .assign(new DoubleFunction() {
+        @Override
         public double apply(double arg1) {
           return -Math.log(1 - rand.nextDouble());
         }

Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/OnlineExponentialAverageTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/OnlineExponentialAverageTest.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/OnlineExponentialAverageTest.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/OnlineExponentialAverageTest.java Sat Apr  2 09:26:16 2011
@@ -17,14 +17,14 @@
 
 package org.apache.mahout.math.stats;
 
-import junit.framework.TestCase;
 import org.apache.mahout.common.RandomUtils;
+import org.apache.mahout.math.MahoutTestCase;
 import org.apache.mahout.math.jet.random.Poisson;
 import org.junit.Test;
 
 import java.util.Random;
 
-public class OnlineExponentialAverageTest extends TestCase {
+public class OnlineExponentialAverageTest extends MahoutTestCase {
   @Test
   public void testAverage() {
     double[] t = {11.35718, 21.54637, 28.91061, 33.03586, 39.57767};
@@ -35,7 +35,7 @@ public class OnlineExponentialAverageTes
 
     for (int i = 0; i < t.length; i++) {
       averager.add(t[i], x[i]);
-      assertEquals("Step " + i, m[i], averager.mean(), 1e-6);
+      assertEquals("Step " + i, m[i], averager.mean(), 1.0e-6);
     }
   }
 
@@ -54,7 +54,7 @@ public class OnlineExponentialAverageTes
       t[i] = lastT + dt;
 
       // at those points, we get a Poisson count
-      k[i] = p.nextInt(dt * .2);
+      k[i] = p.nextInt(dt * 0.2);
       lastT = t[i];
     }
 
@@ -64,6 +64,6 @@ public class OnlineExponentialAverageTes
       averager.add(t[i], k[i]);
     }
 
-    assertEquals("Expected rate", .2, averager.meanRate(), 0.01);
+    assertEquals("Expected rate", 0.2, averager.meanRate(), 0.01);
   }
 }

Modified: mahout/trunk/utils/src/main/java/org/apache/mahout/text/MailArchivesClusteringAnalyzer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/text/MailArchivesClusteringAnalyzer.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/text/MailArchivesClusteringAnalyzer.java (original)
+++ mahout/trunk/utils/src/main/java/org/apache/mahout/text/MailArchivesClusteringAnalyzer.java Sat Apr  2 09:26:16 2011
@@ -17,14 +17,12 @@
 package org.apache.mahout.text;
 
 import java.io.IOException;
-import java.io.StringReader;
 import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.ASCIIFoldingFilter;
 import org.apache.lucene.analysis.CharArraySet;
-import org.apache.lucene.analysis.LengthFilter;
 import org.apache.lucene.analysis.LowerCaseFilter;
 import org.apache.lucene.analysis.PorterStemFilter;
 import org.apache.lucene.analysis.StopFilter;
@@ -45,7 +43,7 @@ public class MailArchivesClusteringAnaly
   // extended set of stop words composed of common mail terms like "hi",
   // HTML tags, and Java keywords asmany of the messages in the archives
   // are subversion check-in notifications
-	private static final String[] STOP_WORDS = new String[] {
+	private static final String[] STOP_WORDS = {
 	  "3d","7bit","a0","about","above","abstract","across","additional","after",
 	  "afterwards","again","against","align","all","almost","alone","along",
 	  "already","also","although","always","am","among","amongst","amoungst",
@@ -106,11 +104,12 @@ public class MailArchivesClusteringAnaly
 
 	public MailArchivesClusteringAnalyzer() {
 		stopSet = (CharArraySet)StopFilter.makeStopSet(Arrays.asList(STOP_WORDS));
-		java.util.TreeSet<String> tmp = new java.util.TreeSet<String>();
-		java.util.Iterator iter = stopSet.iterator();
-		while (iter.hasNext()) {
-		  tmp.add((String)iter.next());
-		}
+    /*
+		Collection<String> tmp = new java.util.TreeSet<String>();
+    for (Object entry : stopSet) {
+      tmp.add(entry.toString());
+    }
+     */
 	}
 
 	public MailArchivesClusteringAnalyzer(CharArraySet stopSet) {
@@ -132,12 +131,12 @@ public class MailArchivesClusteringAnaly
   /**
    * Matches alpha-numeric tokens between 2 and 40 chars long.
    */
-	class AlphaNumericMaxLengthFilter extends TokenFilter {
-    private TermAttribute termAtt;
+  static class AlphaNumericMaxLengthFilter extends TokenFilter {
+    private final TermAttribute termAtt;
     private final char[] output = new char[28];
-    private Matcher matcher;
+    private final Matcher matcher;
 
-	  public AlphaNumericMaxLengthFilter(TokenStream in) {
+	  AlphaNumericMaxLengthFilter(TokenStream in) {
 	    super(in);
 	    termAtt = addAttribute(TermAttribute.class);
 	    matcher = alphaNumeric.matcher("foo");
@@ -147,17 +146,17 @@ public class MailArchivesClusteringAnaly
 	  public final boolean incrementToken() throws IOException {
 	    // return the first alpha-numeric token between 2 and 40 length
 	    while (input.incrementToken()) {
-	      final int length = termAtt.termLength();
+	      int length = termAtt.termLength();
 	      if (length >= 2 && length <= 28) {
-	        final char[] buf = termAtt.termBuffer();
+	        char[] buf = termAtt.termBuffer();
 	        int at = 0;
 	        for (int c=0; c < length; c++) {
-	          final char ch = buf[c];
+	          char ch = buf[c];
 	          if (ch != '\'') {
 	            output[at++] = ch;
 	          }
 	        }
-	        final String term = new String(output, 0, at);
+	        String term = new String(output, 0, at);
 	        matcher.reset(term);
 	        if (matcher.matches() && !term.startsWith("a0")) {
             termAtt.setTermBuffer(term);

Modified: mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/csv/CSVVectorIterable.java
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/csv/CSVVectorIterable.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/csv/CSVVectorIterable.java (original)
+++ mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/csv/CSVVectorIterable.java Sat Apr  2 09:26:16 2011
@@ -21,10 +21,10 @@ import org.apache.commons.csv.CSVStrateg
 import org.apache.mahout.math.DenseVector;
 import org.apache.mahout.math.Vector;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 
 /**
@@ -35,12 +35,11 @@ import java.util.Iterator;
  * Assumes DenseVector for now, but in the future may have the option of mapping columns to sparse format
  * <p/>
  * The Iterator is not thread-safe.
- *
- *
- **/
+ */
 public class CSVVectorIterable implements Iterable<Vector> {
-  protected CSVParser parser;
-  protected String [] line;
+
+  private final CSVParser parser;
+  private String [] line;
 
   public CSVVectorIterable(Reader reader) throws IOException {
     parser = new CSVParser(reader);
@@ -52,7 +51,6 @@ public class CSVVectorIterable implement
     line = parser.getLine();
   }
 
-
   @Override
   public Iterator<Vector> iterator() {
     return new CSVIterator();
@@ -60,10 +58,6 @@ public class CSVVectorIterable implement
 
   private class CSVIterator implements Iterator<Vector>{
 
-
-    public CSVIterator() {
-    }
-
     @Override
     public boolean hasNext() {
       return line != null;
@@ -72,8 +66,11 @@ public class CSVVectorIterable implement
     @Override
     public Vector next() {
 
-      Vector result = null;
-      result = new DenseVector(line.length);
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+
+      Vector result = new DenseVector(line.length);
       for (int i = 0; i < line.length; i++) {
         result.setQuick(i, Double.parseDouble(line[i]));
       }
@@ -81,7 +78,7 @@ public class CSVVectorIterable implement
       try {
         line = parser.getLine();
       } catch (IOException e) {
-        throw new RuntimeException(e);
+        throw new IllegalStateException(e);
       }
       return result;
     }

Modified: mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/JWriterVectorWriter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/JWriterVectorWriter.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/JWriterVectorWriter.java (original)
+++ mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/JWriterVectorWriter.java Sat Apr  2 09:26:16 2011
@@ -25,7 +25,7 @@ import org.apache.mahout.math.Vector;
 /**
  * Write out the vectors to any {@link java.io.Writer} using {@link org.apache.mahout.math.Vector#asFormatString()}.
  */
-public class JWriterVectorWriter extends VectorWriter {
+public class JWriterVectorWriter implements VectorWriter {
   protected final Writer writer;
   
   public JWriterVectorWriter(Writer writer) {

Modified: mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java (original)
+++ mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java Sat Apr  2 09:26:16 2011
@@ -30,9 +30,9 @@ import org.apache.mahout.math.VectorWrit
  *
  * Closes the writer when done
  */
-public class SequenceFileVectorWriter extends VectorWriter {
+public class SequenceFileVectorWriter implements VectorWriter {
   private final SequenceFile.Writer writer;
-  long recNum = 0;
+  private long recNum = 0;
   public SequenceFileVectorWriter(SequenceFile.Writer writer) {
     this.writer = writer;
   }

Modified: mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/VectorWriter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/VectorWriter.java?rev=1087985&r1=1087984&r2=1087985&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/VectorWriter.java (original)
+++ mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/VectorWriter.java Sat Apr  2 09:26:16 2011
@@ -17,11 +17,12 @@
 
 package org.apache.mahout.utils.vectors.io;
 
+import java.io.Closeable;
 import java.io.IOException;
 
 import org.apache.mahout.math.Vector;
 
-public abstract class VectorWriter {
+public interface VectorWriter extends Closeable {
   /**
    * Write all values in the Iterable to the output
    * @param iterable The {@link Iterable} to loop over
@@ -29,7 +30,7 @@ public abstract class VectorWriter {
    * @throws IOException if there was a problem writing
    *
    */
-  public abstract long write(Iterable<Vector> iterable) throws IOException;
+  long write(Iterable<Vector> iterable) throws IOException;
 
   /**
    * Write out a vector
@@ -37,7 +38,7 @@ public abstract class VectorWriter {
    * @param vector The {@link org.apache.mahout.math.Vector} to write
    * @throws IOException
    */
-  public abstract void write(Vector vector) throws IOException;
+  void write(Vector vector) throws IOException;
   
   /**
    * Write the first <code>maxDocs</code> to the output.
@@ -46,12 +47,6 @@ public abstract class VectorWriter {
    * @return The number of docs written
    * @throws IOException if there was a problem writing
    */
-  public abstract long write(Iterable<Vector> iterable, long maxDocs) throws IOException;
-  
-  /**
-   * Close any internally held resources.  If external Writers are passed in, the implementation should indicate
-   * whether it also closes them
-   * @throws IOException if there was an issue closing the item
-   */
-  public abstract void close() throws IOException;
+  long write(Iterable<Vector> iterable, long maxDocs) throws IOException;
+
 }