svn commit: r1087055 - in /mahout/trunk/core/src/main/java/org/apache/mahout: cf/taste/impl/similarity/LogLikelihoodSimilarity.java math/hadoop/similarity/vector/DistributedLoglikelihoodVectorSimilarity.java

[ssc]

Author: ssc
Date: Wed Mar 30 19:36:37 2011
New Revision: 1087055

URL: http://svn.apache.org/viewvc?rev=1087055&view=rev
Log:
MAHOUT-643 Wrong parameter order in LoglikelihoodSimilarity and 
DistributedLoglikelihoodVectorSimilarity

Modified:
    
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java
    
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/vector/DistributedLoglikelihoodVectorSimilarity.java

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java?rev=1087055&r1=1087054&r2=1087055&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java
 Wed Mar 30 19:36:37 2011
@@ -67,8 +67,8 @@ public final class LogLikelihoodSimilari
     int numItems = dataModel.getNumItems();
     double logLikelihood =
         LogLikelihood.logLikelihoodRatio(intersectionSize,
-                                         prefs1Size - intersectionSize,
                                          prefs2Size - intersectionSize,
+                                         prefs1Size - intersectionSize,
                                          numItems - prefs1Size - prefs2Size + 
intersectionSize);
     return 1.0 - 1.0 / (1.0 + logLikelihood);
   }
@@ -100,8 +100,8 @@ public final class LogLikelihoodSimilari
     int preferring2 = dataModel.getNumUsersWithPreferenceFor(itemID2);
     double logLikelihood =
         LogLikelihood.logLikelihoodRatio(preferring1and2,
-                                         preferring1 - preferring1and2,
                                          preferring2 - preferring1and2,
+                                         preferring1 - preferring1and2,
                                          numUsers - preferring1 - preferring2 
+ preferring1and2);
     return 1.0 - 1.0 / (1.0 + logLikelihood);
   }

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/vector/DistributedLoglikelihoodVectorSimilarity.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/vector/DistributedLoglikelihoodVectorSimilarity.java?rev=1087055&r1=1087054&r2=1087055&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/vector/DistributedLoglikelihoodVectorSimilarity.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/vector/DistributedLoglikelihoodVectorSimilarity.java
 Wed Mar 30 19:36:37 2011
@@ -41,8 +41,8 @@ public class DistributedLoglikelihoodVec
 
     double logLikelihood =
         LogLikelihood.logLikelihoodRatio(cooccurrenceCount,
-                                         occurrencesA - cooccurrenceCount,
                                          occurrencesB - cooccurrenceCount,
+                                         occurrencesA - cooccurrenceCount,
                                          numberOfColumns - occurrencesA - 
occurrencesB + cooccurrenceCount);
 
     return 1.0 - 1.0 / (1.0 + logLikelihood);