svn commit: r800634 [7/7] - in /lucene/mahout/trunk: core/src/main/java/org/apache/mahout/cf/taste/hadoop/ core/src/main/java/org/apache/mahout/cf/taste/impl/common/ core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/ core/src/main/java/org...

[sr...@apache.org]

Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java?rev=800634&r1=800633&r2=800634&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java Tue Aug  4 00:06:46 2009
@@ -24,15 +24,15 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.io.OutputStreamWriter;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.util.Map;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ArrayList;
-import java.nio.charset.Charset;
+import java.util.Map;
 
 public final class TransposeToByUser {
 

Modified: lucene/mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderServlet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderServlet.java?rev=800634&r1=800633&r2=800634&view=diff
==============================================================================
--- lucene/mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderServlet.java (original)
+++ lucene/mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderServlet.java Tue Aug  4 00:06:46 2009
@@ -18,9 +18,9 @@
 package org.apache.mahout.cf.taste.web;
 
 import org.apache.mahout.cf.taste.common.TasteException;
-import org.apache.mahout.cf.taste.impl.model.ByValuePreferenceComparator;
 import org.apache.mahout.cf.taste.model.DataModel;
 import org.apache.mahout.cf.taste.model.Preference;
+import org.apache.mahout.cf.taste.model.PreferenceArray;
 import org.apache.mahout.cf.taste.recommender.RecommendedItem;
 import org.apache.mahout.cf.taste.recommender.Recommender;
 
@@ -31,8 +31,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -174,22 +172,21 @@
       throws TasteException {
     DataModel dataModel = recommender.getDataModel();
     writer.print("User:");
-    writer.println(dataModel.getUser(userID));
+    writer.println(userID);
     writer.print("Recommender: ");
     writer.println(recommender);
     writer.println();
     writer.print("Top ");
     writer.print(NUM_TOP_PREFERENCES);
     writer.println(" Preferences:");
-    Preference[] rawPrefs = dataModel.getUser(userID).getPreferencesAsArray();
-    int length = rawPrefs.length;
-    Preference[] sortedPrefs = new Preference[length];
-    System.arraycopy(rawPrefs, 0, sortedPrefs, 0, length);
-    Arrays.sort(sortedPrefs, Collections.reverseOrder(ByValuePreferenceComparator.getInstance()));
+    PreferenceArray rawPrefs = dataModel.getPreferencesFromUser(userID);
+    int length = rawPrefs.length();
+    PreferenceArray sortedPrefs = rawPrefs.clone();
+    sortedPrefs.sortByValueReversed();
     // Cap this at NUM_TOP_PREFERENCES just to be brief
     int max = Math.min(NUM_TOP_PREFERENCES, length);
     for (int i = 0; i < max; i++) {
-      Preference pref = sortedPrefs[i];
+      Preference pref = sortedPrefs.get(i);
       writer.print(pref.getValue());
       writer.print('\t');
       writer.println(pref.getItemID());