svn commit: r1561948 - in /mahout/trunk/core/src: main/java/org/apache/mahout/clustering/classify/ test/java/org/apache/mahout/clustering/classify/

[sm...@apache.org]

Author: smarthi
Date: Tue Jan 28 05:55:25 2014
New Revision: 1561948

URL: http://svn.apache.org/r1561948
Log:
MAHOUT-1410: Committing updated patch.

Modified:
    mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationDriver.java
    mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java
    mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationDriver.java?rev=1561948&r1=1561947&r2=1561948&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationDriver.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationDriver.java Tue Jan 28 05:55:25 2014
@@ -204,13 +204,13 @@ public final class ClusterClassification
         PathFilters.logsCRCFilter(), conf)) {
       // Converting to NamedVectors to preserve the vectorId else its not obvious as to which point
       // belongs to which cluster - fix for MAHOUT-1410
-      Writable key = vw.getFirst();
+      Class<? extends Writable> keyClass = vw.getFirst().getClass();
       Vector vector = vw.getSecond().get();
-      if (!(vector instanceof NamedVector)) {
-        if (key instanceof Text) {
-          vector = new NamedVector(vector, key.toString());
-        } else if (key instanceof IntWritable) {
-          vector = new NamedVector(vector, Integer.toString(((IntWritable) key).get()));
+      if (!keyClass.equals(NamedVector.class)) {
+        if (keyClass.equals(Text.class)) {
+          vector = new NamedVector(vector, vw.getFirst().toString());
+        } else if (keyClass.equals(IntWritable.class)) {
+          vector = new NamedVector(vector, Integer.toString(((IntWritable) vw.getFirst()).get()));
         }
       }
       Vector pdfPerCluster = clusterClassifier.classify(vector);

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java?rev=1561948&r1=1561947&r2=1561948&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java Tue Jan 28 05:55:25 2014
@@ -86,11 +86,12 @@ public class ClusterClassificationMapper
     if (!clusterModels.isEmpty()) {
       // Converting to NamedVectors to preserve the vectorId else its not obvious as to which point
       // belongs to which cluster - fix for MAHOUT-1410
+      Class<? extends Vector> vectorClass = vw.get().getClass();
       Vector vector = vw.get();
-      if (!(vector instanceof NamedVector)) {
-        if (key instanceof Text) {
+      if (!vectorClass.equals(NamedVector.class)) {
+        if (key.getClass().equals(Text.class)) {
           vector = new NamedVector(vector, key.toString());
-        } else if (key instanceof IntWritable) {
+        } else if (key.getClass().equals(IntWritable.class)) {
           vector = new NamedVector(vector, Integer.toString(((IntWritable) key).get()));
         }
       }

Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java?rev=1561948&r1=1561947&r2=1561948&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java Tue Jan 28 05:55:25 2014
@@ -236,11 +236,11 @@ public class ClusterClassificationDriver
       } else {
         singletonCnt++;
         assertEquals("expecting only singleton clusters; got size=" + vList.size(), 1, vList.size());
-        if (vList.get(0) instanceof NamedVector) {
+        if (vList.get(0).getClass().equals(NamedVector.class)) {
           Assert.assertTrue("not expecting cluster:" + ((NamedVector) vList.get(0)).getDelegate().asFormatString(),
                   reference.contains(((NamedVector)  vList.get(0)).getDelegate().asFormatString()));
           reference.remove(((NamedVector)vList.get(0)).getDelegate().asFormatString());
-        } else if (vList.get(0) instanceof RandomAccessSparseVector) {
+        } else if (vList.get(0).getClass().equals(RandomAccessSparseVector.class)) {
           Assert.assertTrue("not expecting cluster:" + vList.get(0).asFormatString(),
                   reference.contains(vList.get(0).asFormatString()));
           reference.remove(vList.get(0).asFormatString());