You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by jm...@apache.org on 2010/03/05 19:54:22 UTC

svn commit: r919540 - in /lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors: VectorDumper.java VectorHelper.java

Author: jmannix
Date: Fri Mar  5 18:54:21 2010
New Revision: 919540

URL: http://svn.apache.org/viewvc?rev=919540&view=rev
Log:
VectorDumper nicer output if no dictionary is specified.  Fixes MAHOUT-315

Modified:
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java
    lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java

Modified: lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java?rev=919540&r1=919539&r2=919540&view=diff
==============================================================================
--- lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java (original)
+++ lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java Fri Mar  5 18:54:21 2010
@@ -133,8 +133,7 @@
           writer = new OutputStreamWriter(System.out);
         }
         boolean printKey = cmdLine.hasOption(printKeyOpt);
-        SeqFileIterator iterator = (SeqFileIterator) vectorIterable
-            .iterator();
+        SeqFileIterator iterator = (SeqFileIterator) vectorIterable.iterator();
         int i = 0;
         while (iterator.hasNext()) {
           Vector vector = iterator.next();
@@ -142,8 +141,7 @@
             writer.write(iterator.key().toString());
             writer.write("\t");
           }
-          String fmtStr = useJSON ? vector.asFormatString() : dictionary != null ? VectorHelper
-              .vectorToString(vector, dictionary) : vector.asFormatString();
+          String fmtStr = useJSON ? vector.asFormatString() : VectorHelper.vectorToString(vector, dictionary);
           writer.write(fmtStr);
           writer.write('\n');
           i++;

Modified: lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java?rev=919540&r1=919539&r2=919540&view=diff
==============================================================================
--- lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java (original)
+++ lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java Fri Mar  5 18:54:21 2010
@@ -66,10 +66,10 @@
         bldr.append(", ");
       }
       Vector.Element elt = iter.next();
-      bldr.append(elt.index()).append(':').append(dictionary[elt.index()]);
+      bldr.append(elt.index()).append(':').append(dictionary != null ? dictionary[elt.index()] : elt.get());
       
     }
-    return bldr.toString();
+    return bldr.append("}").toString();
   }
   
   /**