svn commit: r1042853 - in /mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste: hadoop/ impl/common/ impl/recommender/ recommender/

[srowen]

Author: srowen
Date: Mon Dec  6 23:25:10 2010
New Revision: 1042853

URL: http://svn.apache.org/viewvc?rev=1042853&view=rev
Log:
Tiny utility changes

Modified:
    
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/EntityPrefWritableArrayWritable.java
    
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java
    
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefItemBasedRecommender.java
    
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/recommender/CandidateItemsStrategy.java

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/EntityPrefWritableArrayWritable.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/EntityPrefWritableArrayWritable.java?rev=1042853&r1=1042852&r2=1042853&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/EntityPrefWritableArrayWritable.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/EntityPrefWritableArrayWritable.java
 Mon Dec  6 23:25:10 2010
@@ -17,6 +17,8 @@
 
 package org.apache.mahout.cf.taste.hadoop;
 
+import java.util.Arrays;
+
 import org.apache.hadoop.io.ArrayWritable;
 
 /**
@@ -35,4 +37,10 @@ public class EntityPrefWritableArrayWrit
   public EntityPrefWritable[] getPrefs() {
     return (EntityPrefWritable[]) toArray();
   }
+
+  @Override
+  public String toString() {
+    return Arrays.toString(toStrings());
+  }
+
 }

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java?rev=1042853&r1=1042852&r2=1042853&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java
 Mon Dec  6 23:25:10 2010
@@ -29,7 +29,7 @@ import com.google.common.base.Preconditi
 /**
  * @see FastByIDMap
  */
-public final class FastIDSet implements Serializable, Cloneable {
+public final class FastIDSet implements Serializable, Cloneable, 
Iterable<Long> {
   
   private static final double ALLOWED_LOAD_FACTOR = 1.5;
   

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefItemBasedRecommender.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefItemBasedRecommender.java?rev=1042853&r1=1042852&r2=1042853&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefItemBasedRecommender.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefItemBasedRecommender.java
 Mon Dec  6 23:25:10 2010
@@ -20,6 +20,7 @@ package org.apache.mahout.cf.taste.impl.
 import org.apache.mahout.cf.taste.common.TasteException;
 import org.apache.mahout.cf.taste.model.DataModel;
 import org.apache.mahout.cf.taste.model.PreferenceArray;
+import org.apache.mahout.cf.taste.recommender.CandidateItemsStrategy;
 import org.apache.mahout.cf.taste.similarity.ItemSimilarity;
 
 /**
@@ -33,6 +34,12 @@ public final class GenericBooleanPrefIte
   public GenericBooleanPrefItemBasedRecommender(DataModel dataModel, 
ItemSimilarity similarity) {
     super(dataModel, similarity);
   }
+
+  public GenericBooleanPrefItemBasedRecommender(DataModel dataModel,
+                                                ItemSimilarity similarity,
+                                                CandidateItemsStrategy 
candidateItemsStrategy) {
+    super(dataModel, similarity, candidateItemsStrategy);
+  }
   
   /**
    * This computation is in a technical sense, wrong, since in the domain of 
"boolean preference users" where

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/recommender/CandidateItemsStrategy.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/recommender/CandidateItemsStrategy.java?rev=1042853&r1=1042852&r2=1042853&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/recommender/CandidateItemsStrategy.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/recommender/CandidateItemsStrategy.java
 Mon Dec  6 23:25:10 2010
@@ -27,7 +27,7 @@ import org.apache.mahout.cf.taste.model.
 public interface CandidateItemsStrategy {
 
   /**
-   * #return IDs of all items that could be recommended to the user
+   * @return IDs of all items that could be recommended to the user
    */
   FastIDSet getCandidateItems(long userID, DataModel dataModel) throws 
TasteException;