svn commit: r984133 - in /mahout/trunk/core/src/main/java/org/apache/mahout: clustering/kmeans/Cluster.java math/hadoop/TimesSquaredJob.java

[srowen]

Author: srowen
Date: Tue Aug 10 17:16:24 2010
New Revision: 984133

URL: http://svn.apache.org/viewvc?rev=984133&view=rev
Log:
Oops back out uninentional bad changes from last CL

Modified:
    
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java
    
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/TimesSquaredJob.java

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java?rev=984133&r1=984132&r2=984133&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java
 Tue Aug 10 17:16:24 2010
@@ -114,7 +114,6 @@ public class Cluster extends AbstractClu
   }
 
   @Override
-  @Override
   public String getIdentifier() {
     return (converged ? "VL-" : "CL-") + getId();
   }

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/TimesSquaredJob.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/TimesSquaredJob.java?rev=984133&r1=984132&r2=984133&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/TimesSquaredJob.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/TimesSquaredJob.java
 Tue Aug 10 17:16:24 2010
@@ -81,7 +81,7 @@ public final class TimesSquaredJob {
   public static JobConf createTimesSquaredJobConf(Vector v,
                                                   Path matrixInputPath,
                                                   Path outputVectorPathBase,
-                                                  Class<? extends 
TimesSquaredMapper<?>> mapClass,
+                                                  Class<? extends 
TimesSquaredMapper> mapClass,
                                                   Class<? extends 
VectorSummingReducer> redClass) throws IOException {
     return createTimesSquaredJobConf(v, v.size(), matrixInputPath, 
outputVectorPathBase, mapClass, redClass);
   }
@@ -90,7 +90,7 @@ public final class TimesSquaredJob {
                                                   int outputVectorDim,
                                                   Path matrixInputPath,
                                                   Path outputVectorPathBase,
-                                                  Class<? extends 
TimesSquaredMapper<?>> mapClass,
+                                                  Class<? extends 
TimesSquaredMapper> mapClass,
                                                   Class<? extends 
VectorSummingReducer> redClass) throws IOException {
     JobConf conf = new JobConf(TimesSquaredJob.class);
     conf.setJobName("TimesSquaredJob: " + matrixInputPath);
@@ -143,8 +143,8 @@ public final class TimesSquaredJob {
   public static class TimesSquaredMapper<T extends WritableComparable> extends 
MapReduceBase
       implements Mapper<T,VectorWritable, NullWritable,VectorWritable> {
 
-    private Vector outputVector;
-    private OutputCollector<NullWritable,VectorWritable> out;
+    Vector outputVector;
+    OutputCollector<NullWritable,VectorWritable> out;
     private Vector inputVector;
 
     @Override