svn commit: r661894 - in /lucene/mahout/trunk/core/src: main/java/org/apache/mahout/cf/taste/impl/correlation/ main/java/org/apache/mahout/cf/taste/impl/transforms/ main/java/org/apache/mahout/cf/taste/transforms/ test/java/org/apache/mahout/cf/taste/i...

[sr...@apache.org]

Author: srowen
Date: Fri May 30 15:07:43 2008
New Revision: 661894

URL: http://svn.apache.org/viewvc?rev=661894&view=rev
Log:
Rename PreferenceTransform2 to PreferenceTransform since the original deprecated version was long since removed. Time for a fresh start in Mahout.

Added:
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/transforms/PreferenceTransform.java
      - copied, changed from r657697, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/transforms/PreferenceTransform2.java
Modified:
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/correlation/AbstractCorrelation.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequency.java
    lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/ZScore.java
    lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/ZScoreTest.java

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/correlation/AbstractCorrelation.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/correlation/AbstractCorrelation.java?rev=661894&r1=661893&r2=661894&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/correlation/AbstractCorrelation.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/correlation/AbstractCorrelation.java Fri May 30 15:07:43 2008
@@ -25,7 +25,7 @@
 import org.apache.mahout.cf.taste.model.Preference;
 import org.apache.mahout.cf.taste.model.Item;
 import org.apache.mahout.cf.taste.transforms.CorrelationTransform;
-import org.apache.mahout.cf.taste.transforms.PreferenceTransform2;
+import org.apache.mahout.cf.taste.transforms.PreferenceTransform;
 import org.apache.mahout.cf.taste.common.TasteException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@
 
   private final DataModel dataModel;
   private PreferenceInferrer inferrer;
-  private PreferenceTransform2 prefTransform;
+  private PreferenceTransform prefTransform;
   private CorrelationTransform<Object> correlationTransform;
   private boolean weighted;
 
@@ -83,11 +83,11 @@
     this.inferrer = inferrer;
   }
 
-  public final PreferenceTransform2 getPrefTransform() {
+  public final PreferenceTransform getPrefTransform() {
     return prefTransform;
   }
 
-  public final void setPrefTransform(PreferenceTransform2 prefTransform) {
+  public final void setPrefTransform(PreferenceTransform prefTransform) {
     this.prefTransform = prefTransform;
   }
 

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequency.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequency.java?rev=661894&r1=661893&r2=661894&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequency.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequency.java Fri May 30 15:07:43 2008
@@ -22,7 +22,7 @@
 import org.apache.mahout.cf.taste.model.Item;
 import org.apache.mahout.cf.taste.model.Preference;
 import org.apache.mahout.cf.taste.model.User;
-import org.apache.mahout.cf.taste.transforms.PreferenceTransform2;
+import org.apache.mahout.cf.taste.transforms.PreferenceTransform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +45,7 @@
  * number of users who express a preference for each item in your model. If each item has about 100 preferences
  * on average, 100.0 is a good log base.</p>
  */
-public final class InverseUserFrequency implements PreferenceTransform2 {
+public final class InverseUserFrequency implements PreferenceTransform {
 
   private static final Logger log = LoggerFactory.getLogger(InverseUserFrequency.class);
 

Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/ZScore.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/ZScore.java?rev=661894&r1=661893&r2=661894&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/ZScore.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/ZScore.java Fri May 30 15:07:43 2008
@@ -23,7 +23,7 @@
 import org.apache.mahout.cf.taste.impl.common.SoftCache;
 import org.apache.mahout.cf.taste.model.Preference;
 import org.apache.mahout.cf.taste.model.User;
-import org.apache.mahout.cf.taste.transforms.PreferenceTransform2;
+import org.apache.mahout.cf.taste.transforms.PreferenceTransform;
 
 /**
  * <p>Normalizes preference values for a {@link User} by converting them to
@@ -36,7 +36,7 @@
  * transform normalizes away the difference in scale used by the two users so that both
  * have a mean preference of 0.0 and a standard deviation of 1.0.</p>
  */
-public final class ZScore implements PreferenceTransform2 {
+public final class ZScore implements PreferenceTransform {
 
   private final SoftCache<User, RunningAverageAndStdDev> meanAndStdevs;
 

Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/transforms/PreferenceTransform.java (from r657697, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/transforms/PreferenceTransform2.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/transforms/PreferenceTransform.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/transforms/PreferenceTransform.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/transforms/PreferenceTransform2.java&r1=657697&r2=661894&rev=661894&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/transforms/PreferenceTransform2.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/transforms/PreferenceTransform.java Fri May 30 15:07:43 2008
@@ -26,12 +26,8 @@
  * typically applied to values before they are used to compute a correlation value. They are typically not
  * applied elsewhere; in particular {@link org.apache.mahout.cf.taste.model.DataModel}s no longer use a transform
  * like this to transform all of their preference values at the source.</p>
- *
- * <p>This class sort of replaces the <code>PreferenceTransform</code> interface. It operates similarly, but
- * is applied a bit differently within the framework. As such I wanted to make this an entirely new interface,
- * but couldn't pick a name that seemed as applicable. Hence the simplistic name.</p>
  */
-public interface PreferenceTransform2 extends Refreshable {
+public interface PreferenceTransform extends Refreshable {
 
   double getTransformedValue(Preference pref) throws TasteException;
 

Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/ZScoreTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/ZScoreTest.java?rev=661894&r1=661893&r2=661894&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/ZScoreTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/ZScoreTest.java Fri May 30 15:07:43 2008
@@ -18,7 +18,7 @@
 package org.apache.mahout.cf.taste.impl.transforms;
 
 import org.apache.mahout.cf.taste.model.User;
-import org.apache.mahout.cf.taste.transforms.PreferenceTransform2;
+import org.apache.mahout.cf.taste.transforms.PreferenceTransform;
 
 /**
  * <p>Tests {@link ZScore}.</p>
@@ -27,13 +27,13 @@
 
   public void testOnePref() throws Exception {
     User user = getUser("test", 1.0);
-    PreferenceTransform2 zScore = new ZScore();
+    PreferenceTransform zScore = new ZScore();
     assertEquals(0.0, zScore.getTransformedValue(user.getPreferenceFor("0")), EPSILON);
   }
 
   public void testAllSame() throws Exception {
     User user = getUser("test", 1.0, 1.0, 1.0);
-    PreferenceTransform2 zScore = new ZScore();
+    PreferenceTransform zScore = new ZScore();
     assertEquals(0.0, zScore.getTransformedValue(user.getPreferenceFor("0")), EPSILON);
     assertEquals(0.0, zScore.getTransformedValue(user.getPreferenceFor("1")), EPSILON);
     assertEquals(0.0, zScore.getTransformedValue(user.getPreferenceFor("2")), EPSILON);
@@ -41,14 +41,14 @@
 
   public void testStdev() throws Exception {
     User user = getUser("test", -1.0, -2.0);
-    PreferenceTransform2 zScore = new ZScore();
+    PreferenceTransform zScore = new ZScore();
     assertEquals(0.707107, zScore.getTransformedValue(user.getPreferenceFor("0")), EPSILON);
     assertEquals(-0.707107, zScore.getTransformedValue(user.getPreferenceFor("1")), EPSILON);
   }
 
   public void testExample() throws Exception {
     User user = getUser("test", 5.0, 7.0, 9.0);
-    PreferenceTransform2 zScore = new ZScore();
+    PreferenceTransform zScore = new ZScore();
     assertEquals(-1.0, zScore.getTransformedValue(user.getPreferenceFor("0")), EPSILON);
     assertEquals(0.0, zScore.getTransformedValue(user.getPreferenceFor("1")), EPSILON);
     assertEquals(1.0, zScore.getTransformedValue(user.getPreferenceFor("2")), EPSILON);