svn commit: r960661 - in /mahout/trunk/utils/src: main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java

[gsingers]

Author: gsingers
Date: Mon Jul  5 19:08:47 2010
New Revision: 960661

URL: http://svn.apache.org/viewvc?rev=960661&view=rev
Log:
MAHOUT-434: Fix LuceneIterable to return a named vec. even when normalizing

Modified:
    
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java
    
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java

Modified: 
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java?rev=960661&r1=960660&r2=960661&view=diff
==============================================================================
--- 
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java
 (original)
+++ 
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java
 Mon Jul  5 19:08:47 2010
@@ -124,9 +124,10 @@ public class LuceneIterable implements I
         } else {
           name = String.valueOf(doc);
         }
-        result = new NamedVector(result, name);
         if (normPower != NO_NORMALIZING) {
-          result = result.normalize(normPower);
+          result = new NamedVector(result.normalize(normPower), name);
+        } else {
+          result = new NamedVector(result, name);
         }
       } catch (IOException e) {
         // Log?

Modified: 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java?rev=960661&r1=960660&r2=960661&view=diff
==============================================================================
--- 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
 (original)
+++ 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
 Mon Jul  5 19:08:47 2010
@@ -68,8 +68,9 @@ public class LuceneIterableTest extends 
     Weight weight = new TFIDF();
     TermInfo termInfo = new CachedTermInfo(reader, "content", 1, 100);
     VectorMapper mapper = new TFDFMapper(reader, weight, termInfo);
-    LuceneIterable iterable = new LuceneIterable(reader, "id", "content", 
mapper);
-    
+    LuceneIterable iterable;
+    iterable = new LuceneIterable(reader, "id", "content", mapper);
+
     //TODO: do something more meaningful here
     for (Vector vector : iterable) {
       Assert.assertNotNull(vector);
@@ -77,6 +78,17 @@ public class LuceneIterableTest extends 
       Assert.assertTrue("vector Size: " + vector.size() + " is not greater 
than: " + 0, vector.size() > 0);
       assertTrue(((NamedVector)vector).getName().startsWith("doc_"));
     }
+
+    iterable = new LuceneIterable(reader, "id", "content", mapper, 3);
+
+    //TODO: do something more meaningful here
+    for (Vector vector : iterable) {
+      Assert.assertNotNull(vector);
+      Assert.assertTrue("vector is not an instanceof " + NamedVector.class, 
vector instanceof NamedVector);
+      Assert.assertTrue("vector Size: " + vector.size() + " is not greater 
than: " + 0, vector.size() > 0);
+      assertTrue(((NamedVector)vector).getName().startsWith("doc_"));
+    }
+
   }