You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2009/08/19 13:07:26 UTC
svn commit: r805747 - in
/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste: eval/
impl/common/ impl/common/jdbc/ impl/eval/ impl/model/ impl/model/jdbc/
impl/recommender/ impl/recommender/slopeone/ impl/similarity/
Author: srowen
Date: Wed Aug 19 11:07:25 2009
New Revision: 805747
URL: http://svn.apache.org/viewvc?rev=805747&view=rev
Log:
Misc cleanup and refactoring in CF... taking the liberty of just modifying 'my' code at will here.
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/eval/DataModelBuilder.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/AbstractJDBCComponent.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/LoadEvaluator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractIDMigrator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractJDBCIDMigrator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/FarthestNeighborClusterSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorage.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarity.java
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/eval/DataModelBuilder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/eval/DataModelBuilder.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/eval/DataModelBuilder.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/eval/DataModelBuilder.java Wed Aug 19 11:07:25 2009
@@ -39,6 +39,6 @@
* @return {@link DataModel} based upon the given data
* @throws TasteException if an error occurs while accessing the {@link DataModel}
*/
- DataModel buildDataModel(FastByIDMap<PreferenceArray> trainingData) throws TasteException;
+ DataModel buildDataModel(FastByIDMap<PreferenceArray> trainingData);
}
\ No newline at end of file
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastByIDMap.java Wed Aug 19 11:07:25 2009
@@ -291,6 +291,23 @@
return clone;
}
+ @Override
+ public String toString() {
+ if (isEmpty()) {
+ return "{}";
+ }
+ StringBuilder result = new StringBuilder();
+ result.append('{');
+ for (int i = 0; i < keys.length; i++) {
+ long key = keys[i];
+ if (key != NULL && key != REMOVED) {
+ result.append(key).append('=').append(values[i]).append(',');
+ }
+ }
+ result.setCharAt(result.length() - 1, '}');
+ return result.toString();
+ }
+
private final class KeyIterator implements LongPrimitiveIterator {
private int position;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java Wed Aug 19 11:07:25 2009
@@ -256,6 +256,22 @@
return clone;
}
+ @Override
+ public String toString() {
+ if (isEmpty()) {
+ return "[]";
+ }
+ StringBuilder result = new StringBuilder();
+ result.append('[');
+ for (long key : keys) {
+ if (key != NULL && key != REMOVED) {
+ result.append(key).append(',');
+ }
+ }
+ result.setCharAt(result.length() - 1, ']');
+ return result.toString();
+ }
+
private final class KeyIterator implements LongPrimitiveIterator {
private int position;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java Wed Aug 19 11:07:25 2009
@@ -327,6 +327,23 @@
return clone;
}
+ @Override
+ public String toString() {
+ if (isEmpty()) {
+ return "{}";
+ }
+ StringBuilder result = new StringBuilder();
+ result.append('{');
+ for (int i = 0; i < keys.length; i++) {
+ K key = keys[i];
+ if (key != null && key != REMOVED) {
+ result.append(key).append('=').append(values[i]).append(',');
+ }
+ }
+ result.setCharAt(result.length() - 1, '}');
+ return result.toString();
+ }
+
private final class EntrySet extends AbstractSet<Entry<K, V>> {
@Override
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/AbstractJDBCComponent.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/AbstractJDBCComponent.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/AbstractJDBCComponent.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/jdbc/AbstractJDBCComponent.java Wed Aug 19 11:07:25 2009
@@ -35,7 +35,7 @@
private static final Logger log = LoggerFactory.getLogger(AbstractJDBCComponent.class);
- public static final String DEFAULT_DATASOURCE_NAME = "jdbc/taste";
+ protected static final String DEFAULT_DATASOURCE_NAME = "jdbc/taste";
private static final int DEFAULT_FETCH_SIZE = 1000; // A max, "big" number of rows to buffer at once
protected static void checkNotNullAndLog(String argName, Object value) {
@@ -63,7 +63,7 @@
* @return {@link DataSource} under that JNDI name
* @throws TasteException if a JNDI error occurs
*/
- public static DataSource lookupDataSource(String dataSourceName) throws TasteException {
+ protected static DataSource lookupDataSource(String dataSourceName) throws TasteException {
Context context = null;
try {
context = new InitialContext();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/LoadEvaluator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/LoadEvaluator.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/LoadEvaluator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/LoadEvaluator.java Wed Aug 19 11:07:25 2009
@@ -31,7 +31,10 @@
private static final Logger log = LoggerFactory.getLogger(LoadEvaluator.class);
- public void runLoad(Recommender recommender) throws TasteException {
+ private LoadEvaluator() {
+ }
+
+ public static void runLoad(Recommender recommender) throws TasteException {
DataModel dataModel = recommender.getDataModel();
int numUsers = dataModel.getNumUsers();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractIDMigrator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractIDMigrator.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractIDMigrator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractIDMigrator.java Wed Aug 19 11:07:25 2009
@@ -68,7 +68,4 @@
protected abstract void storeMapping(long longID, String stringID) throws TasteException;
- @Override
- public abstract String toStringID(long longID) throws TasteException;
-
}
\ No newline at end of file
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractJDBCIDMigrator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractJDBCIDMigrator.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractJDBCIDMigrator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/AbstractJDBCIDMigrator.java Wed Aug 19 11:07:25 2009
@@ -36,9 +36,9 @@
private final String getStringIDSQL;
private final String storeMappingSQL;
- public AbstractJDBCIDMigrator(DataSource dataSource,
- String getStringIDSQL,
- String storeMappingSQL) {
+ protected AbstractJDBCIDMigrator(DataSource dataSource,
+ String getStringIDSQL,
+ String storeMappingSQL) {
this.dataSource = dataSource;
this.getStringIDSQL = getStringIDSQL;
this.storeMappingSQL = storeMappingSQL;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanItemPreferenceArray.java Wed Aug 19 11:07:25 2009
@@ -20,7 +20,6 @@
import org.apache.mahout.cf.taste.model.Preference;
import org.apache.mahout.cf.taste.model.PreferenceArray;
-import java.io.Serializable;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -34,7 +33,7 @@
* @see BooleanUserPreferenceArray
* @see GenericItemPreferenceArray
*/
-public final class BooleanItemPreferenceArray implements PreferenceArray, Serializable {
+public final class BooleanItemPreferenceArray implements PreferenceArray {
private final long[] IDs;
private long id;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserPreferenceArray.java Wed Aug 19 11:07:25 2009
@@ -20,7 +20,6 @@
import org.apache.mahout.cf.taste.model.Preference;
import org.apache.mahout.cf.taste.model.PreferenceArray;
-import java.io.Serializable;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -34,7 +33,7 @@
* @see BooleanItemPreferenceArray
* @see GenericUserPreferenceArray
*/
-public final class BooleanUserPreferenceArray implements PreferenceArray, Serializable {
+public final class BooleanUserPreferenceArray implements PreferenceArray {
private final long[] IDs;
private long id;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericDataModel.java Wed Aug 19 11:07:25 2009
@@ -236,12 +236,12 @@
}
@Override
- public void removePreference(long userID, long itemID) throws NoSuchUserException {
+ public void removePreference(long userID, long itemID) {
throw new UnsupportedOperationException();
}
@Override
- public void setPreference(long userID, long itemID, float value) throws NoSuchUserException {
+ public void setPreference(long userID, long itemID, float value) {
throw new UnsupportedOperationException();
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericItemPreferenceArray.java Wed Aug 19 11:07:25 2009
@@ -20,7 +20,6 @@
import org.apache.mahout.cf.taste.model.Preference;
import org.apache.mahout.cf.taste.model.PreferenceArray;
-import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
@@ -33,7 +32,7 @@
* @see GenericUserPreferenceArray
* @see GenericPreference
*/
-public final class GenericItemPreferenceArray implements PreferenceArray, Serializable {
+public final class GenericItemPreferenceArray implements PreferenceArray {
private static final int USER = 0;
private static final int VALUE = 2;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericUserPreferenceArray.java Wed Aug 19 11:07:25 2009
@@ -20,7 +20,6 @@
import org.apache.mahout.cf.taste.model.Preference;
import org.apache.mahout.cf.taste.model.PreferenceArray;
-import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
@@ -34,7 +33,7 @@
* @see GenericItemPreferenceArray
* @see GenericPreference
*/
-public final class GenericUserPreferenceArray implements PreferenceArray, Serializable {
+public final class GenericUserPreferenceArray implements PreferenceArray {
private static final int ITEM = 1;
private static final int VALUE = 2;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java Wed Aug 19 11:07:25 2009
@@ -64,7 +64,7 @@
*/
public abstract class AbstractJDBCDataModel extends AbstractJDBCComponent implements JDBCDataModel {
- static final Logger log = LoggerFactory.getLogger(AbstractJDBCDataModel.class);
+ private static final Logger log = LoggerFactory.getLogger(AbstractJDBCDataModel.class);
public static final String DEFAULT_PREFERENCE_TABLE = "taste_preferences";
public static final String DEFAULT_USER_ID_COLUMN = "user_id";
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/FarthestNeighborClusterSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/FarthestNeighborClusterSimilarity.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/FarthestNeighborClusterSimilarity.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/FarthestNeighborClusterSimilarity.java Wed Aug 19 11:07:25 2009
@@ -81,7 +81,7 @@
}
// We skipped everything? well, at least try comparing the first Users to get some value
if (leastSimilarity == Double.POSITIVE_INFINITY) {
- return similarity.userSimilarity((Long) cluster1.iterator().next(), (Long) cluster2.iterator().next());
+ return similarity.userSimilarity(cluster1.iterator().next(), cluster2.iterator().next());
}
return leastSimilarity;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java Wed Aug 19 11:07:25 2009
@@ -59,10 +59,11 @@
*/
public final class TreeClusteringRecommender extends AbstractRecommender implements ClusteringRecommender {
- private static final Random r = RandomUtils.getRandom();
-
private static final Logger log = LoggerFactory.getLogger(TreeClusteringRecommender.class);
+ private static final FastIDSet[] NO_CLUSTERS = new FastIDSet[0];
+ private static final Random r = RandomUtils.getRandom();
+
private final ClusterSimilarity clusterSimilarity;
private final int numClusters;
private final double clusteringThreshold;
@@ -280,7 +281,7 @@
} else {
topRecsByUserID = new FastByIDMap<List<RecommendedItem>>();
clustersByUserID = new FastByIDMap<FastIDSet>();
- allClusters = new FastIDSet[0];
+ allClusters = NO_CLUSTERS;
}
clustersBuilt = true;
} finally {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorage.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorage.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorage.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorage.java Wed Aug 19 11:07:25 2009
@@ -143,8 +143,7 @@
}
@Override
- public RunningAverage[] getDiffs(long userID, long itemID, PreferenceArray prefs)
- throws TasteException {
+ public RunningAverage[] getDiffs(long userID, long itemID, PreferenceArray prefs) {
try {
buildAverageDiffsLock.readLock().lock();
int size = prefs.length();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarity.java Wed Aug 19 11:07:25 2009
@@ -60,10 +60,10 @@
return Double.NaN;
}
int numItems = dataModel.getNumItems();
- double logLikelihood = LogLikelihoodSimilarity.twoLogLambda(intersectionSize,
- prefs1Size - intersectionSize,
- prefs2Size,
- numItems - prefs2Size);
+ double logLikelihood = twoLogLambda(intersectionSize,
+ prefs1Size - intersectionSize,
+ prefs2Size,
+ numItems - prefs2Size);
return 1.0 - 1.0 / (1.0 + logLikelihood);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarity.java?rev=805747&r1=805746&r2=805747&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarity.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarity.java Wed Aug 19 11:07:25 2009
@@ -36,7 +36,7 @@
private final DataModel dataModel;
- public SpearmanCorrelationSimilarity(DataModel dataModel) throws TasteException {
+ public SpearmanCorrelationSimilarity(DataModel dataModel) {
if (dataModel == null) {
throw new IllegalArgumentException("dataModel is null");
}