svn commit: r1440998 - in /mahout/trunk/integration/src: main/java/org/apache/mahout/utils/vectors/VectorHelper.java test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java

[jmannix]

Author: jmannix
Date: Thu Jan 31 14:53:14 2013
New Revision: 1440998

URL: http://svn.apache.org/viewvc?rev=1440998&view=rev
Log:
fixing MAHOUT-1064

Modified:
    
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java
    
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java

Modified: 
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java?rev=1440998&r1=1440997&r2=1440998&view=diff
==============================================================================
--- 
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java
 (original)
+++ 
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java
 Thu Jan 31 14:53:14 2013
@@ -43,6 +43,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Comparator;
 import java.util.regex.Pattern;
 
 public final class VectorHelper {
@@ -95,7 +96,12 @@ public final class VectorHelper {
         entries.add(pair);
       }
     }
-    Collections.sort(entries, Ordering.natural().reverse());
+    Collections.sort(entries, new Comparator<Pair<Integer, Double>>() {
+        @Override
+        public int compare(Pair<Integer, Double> a, Pair<Integer, Double> b) {
+            return b.getSecond().compareTo(a.getSecond());
+        }
+    });
     return entries;
   }
 

Modified: 
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java?rev=1440998&r1=1440997&r2=1440998&view=diff
==============================================================================
--- 
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java
 (original)
+++ 
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java
 Thu Jan 31 14:53:14 2013
@@ -41,6 +41,14 @@ public final class VectorHelperTest exte
         VectorHelper.vectorToJson(v, dictionary, 3, true));
     assertEquals("unsorted form incorrect: ", "{two:3.1,four:1.0}",
         VectorHelper.vectorToJson(v, dictionary, 2, false));
+    assertEquals("sorted json form incorrect: ", 
"{nine:12.2,six:8.1,two:3.1,four:1.0}",
+        VectorHelper.vectorToJson(v, dictionary, 4, true));
+    assertEquals("sorted json form incorrect: ", 
"{nine:12.2,six:8.1,two:3.1,four:1.0,seven:-100.0}",
+        VectorHelper.vectorToJson(v, dictionary, 5, true));
+    assertEquals("sorted json form incorrect: ", "{nine:12.2,six:8.1}",
+        VectorHelper.vectorToJson(v, dictionary, 2, true));
+    assertEquals("unsorted form incorrect: ", "{two:3.1,four:1.0}",
+        VectorHelper.vectorToJson(v, dictionary, 2, false));
   }
 
 }