Author: srowen
Date: Mon Nov 3 01:42:36 2008
New Revision: 710031
URL: http://svn.apache.org/viewvc?rev=710031&view=rev
Log:
Rename remaining 'correlation' methods to 'similarity'
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.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/GenericItemBasedRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NearestNeighborClusterSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingItemSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingUserSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarity.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
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/TanimotoCoefficientSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/similarity/ItemSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/similarity/UserSimilarity.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/DummySimilarity.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/EuclideanDistanceSimilarityTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarityTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarityTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/PearsonCorrelationSimilarityTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarityTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/TanimotoCoefficientSimilarityTest.java
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java
Mon Nov 3 01:42:36 2008
@@ -85,7 +85,7 @@
boolean full = false;
for (User user : dataModel.getUsers()) {
if (sampleForUser() && !userID.equals(user.getID())) {
- double theCorrelation = userSimilarityImpl.userCorrelation(theUser,
user);
+ double theCorrelation = userSimilarityImpl.userSimilarity(theUser,
user);
if (!Double.isNaN(theCorrelation) && (!full || theCorrelation >
queue.getLast().theCorrelation)) {
ListIterator<UserCorrelationPair> iterator =
queue.listIterator(queue.size());
while (iterator.hasPrevious()) {
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdUserNeighborhood.java
Mon Nov 3 01:42:36 2008
@@ -88,7 +88,7 @@
while (users.hasNext()) {
User user = users.next();
if (sampleForUser() && !userID.equals(user.getID())) {
- double theCorrelation = userSimilarityImpl.userCorrelation(theUser,
user);
+ double theCorrelation = userSimilarityImpl.userSimilarity(theUser,
user);
if (!Double.isNaN(theCorrelation) && theCorrelation >= threshold) {
neighborhood.add(user);
}
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=710031&r1=710030&r2=710031&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
Mon Nov 3 01:42:36 2008
@@ -73,7 +73,7 @@
for (User user1 : cluster1) {
if (samplingPercentage >= 1.0 || random.nextDouble() <
samplingPercentage) {
for (User user2 : cluster2) {
- double theCorrelation = similarity.userCorrelation(user1, user2);
+ double theCorrelation = similarity.userSimilarity(user1, user2);
if (theCorrelation < leastCorrelation) {
leastCorrelation = theCorrelation;
}
@@ -82,7 +82,7 @@
}
// We skipped everything? well, at least try comparing the first Users to
get some value
if (leastCorrelation == Double.POSITIVE_INFINITY) {
- return similarity.userCorrelation(cluster1.iterator().next(),
cluster2.iterator().next());
+ return similarity.userSimilarity(cluster1.iterator().next(),
cluster2.iterator().next());
}
return leastCorrelation;
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommender.java
Mon Nov 3 01:42:36 2008
@@ -203,7 +203,7 @@
Preference[] prefs = theUser.getPreferencesAsArray();
for (int i = 0; i < prefs.length; i++) {
Preference pref = prefs[i];
- double theCorrelation = similarity.itemCorrelation(item, pref.getItem());
+ double theCorrelation = similarity.itemSimilarity(item, pref.getItem());
if (!Double.isNaN(theCorrelation)) {
// Why + 1.0? similarity ranges from -1.0 to 1.0, and we want to use
it as a simple
// weight. To avoid negative values, we add 1.0 to put it in
@@ -248,7 +248,7 @@
if (rescorer.isFiltered(pair)) {
return Double.NaN;
}
- double originalEstimate = similarity.itemCorrelation(toItem, item);
+ double originalEstimate = similarity.itemSimilarity(toItem, item);
return rescorer.rescore(pair, originalEstimate);
}
}
@@ -287,7 +287,7 @@
if (rescorer.isFiltered(pair)) {
continue;
}
- double estimate = similarity.itemCorrelation(toItem, item);
+ double estimate = similarity.itemSimilarity(toItem, item);
estimate = rescorer.rescore(pair, estimate);
average.addDatum(estimate);
}
@@ -314,7 +314,7 @@
if (pref == null) {
return Double.NaN;
}
- double correlationValue = similarity.itemCorrelation(recommendedItem,
item);
+ double correlationValue = similarity.itemSimilarity(recommendedItem,
item);
return (1.0 + correlationValue) * pref.getValue();
}
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommender.java
Mon Nov 3 01:42:36 2008
@@ -152,7 +152,7 @@
// See GenericItemBasedRecommender.doEstimatePreference() too
Preference pref = user.getPreferenceFor(item.getID());
if (pref != null) {
- double theCorrelation = similarity.userCorrelation(theUser, user) +
1.0;
+ double theCorrelation = similarity.userSimilarity(theUser, user) +
1.0;
if (!Double.isNaN(theCorrelation)) {
preference += theCorrelation * pref.getValue();
totalCorrelation += theCorrelation;
@@ -206,7 +206,7 @@
if (rescorer.isFiltered(pair)) {
return Double.NaN;
}
- double originalEstimate = similarity.userCorrelation(toUser, user);
+ double originalEstimate = similarity.userSimilarity(toUser, user);
return rescorer.rescore(pair, originalEstimate);
}
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NearestNeighborClusterSimilarity.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NearestNeighborClusterSimilarity.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NearestNeighborClusterSimilarity.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NearestNeighborClusterSimilarity.java
Mon Nov 3 01:42:36 2008
@@ -73,7 +73,7 @@
for (User user1 : cluster1) {
if (samplingPercentage >= 1.0 || random.nextDouble() <
samplingPercentage) {
for (User user2 : cluster2) {
- double theCorrelation = similarity.userCorrelation(user1, user2);
+ double theCorrelation = similarity.userSimilarity(user1, user2);
if (theCorrelation > greatestCorrelation) {
greatestCorrelation = theCorrelation;
}
@@ -82,7 +82,7 @@
}
// We skipped everything? well, at least try comparing the first Users to
get some value
if (greatestCorrelation == Double.NEGATIVE_INFINITY) {
- return similarity.userCorrelation(cluster1.iterator().next(),
cluster2.iterator().next());
+ return similarity.userSimilarity(cluster1.iterator().next(),
cluster2.iterator().next());
}
return greatestCorrelation;
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java
Mon Nov 3 01:42:36 2008
@@ -139,7 +139,7 @@
*/
abstract double computeResult(int n, double sumXY, double sumX2, double
sumY2, double sumXYdiff2);
- public double userCorrelation(User user1, User user2) throws TasteException {
+ public double userSimilarity(User user1, User user2) throws TasteException {
if (user1 == null || user2 == null) {
throw new IllegalArgumentException("user1 or user2 is null");
@@ -258,7 +258,7 @@
return result;
}
- public final double itemCorrelation(Item item1, Item item2) throws
TasteException {
+ public final double itemSimilarity(Item item1, Item item2) throws
TasteException {
if (item1 == null || item2 == null) {
throw new IllegalArgumentException("item1 or item2 is null");
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingItemSimilarity.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingItemSimilarity.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingItemSimilarity.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingItemSimilarity.java
Mon Nov 3 01:42:36 2008
@@ -46,7 +46,7 @@
this.correlationCache = new Cache<Pair<Item, Item>, Double>(new
CorrelationRetriever(similarity), maxCacheSize);
}
- public double itemCorrelation(Item item1, Item item2) throws TasteException {
+ public double itemSimilarity(Item item1, Item item2) throws TasteException {
Pair<Item, Item> key;
if (item1.compareTo(item2) < 0) {
key = new Pair<Item, Item>(item1, item2);
@@ -69,7 +69,7 @@
this.similarity = similarity;
}
public Double get(Pair<Item, Item> key) throws TasteException {
- return similarity.itemCorrelation(key.getFirst(), key.getSecond());
+ return similarity.itemSimilarity(key.getFirst(), key.getSecond());
}
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingUserSimilarity.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingUserSimilarity.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingUserSimilarity.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/CachingUserSimilarity.java
Mon Nov 3 01:42:36 2008
@@ -47,7 +47,7 @@
this.correlationCache = new Cache<Pair<User, User>, Double>(new
CorrelationRetriever(similarity), maxCacheSize);
}
- public double userCorrelation(User user1, User user2) throws TasteException {
+ public double userSimilarity(User user1, User user2) throws TasteException {
Pair<User, User> key;
if (user1.compareTo(user2) < 0) {
key = new Pair<User, User>(user1, user2);
@@ -75,7 +75,7 @@
this.similarity = similarity;
}
public Double get(Pair<User, User> key) throws TasteException {
- return similarity.userCorrelation(key.getFirst(), key.getSecond());
+ return similarity.userSimilarity(key.getFirst(), key.getSecond());
}
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarity.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarity.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarity.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarity.java
Mon Nov 3 01:42:36 2008
@@ -153,7 +153,7 @@
* @param item2 second item
* @return correlation between the two
*/
- public double itemCorrelation(Item item1, Item item2) {
+ public double itemSimilarity(Item item1, Item item2) {
int compare = item1.compareTo(item2);
if (compare == 0) {
return 1.0;
@@ -257,7 +257,7 @@
Item item2 = items.get(j);
double correlation;
try {
- correlation = otherSimilarity.itemCorrelation(item1, item2);
+ correlation = otherSimilarity.itemSimilarity(item1, item2);
} catch (TasteException te) {
// ugly:
throw new RuntimeException(te);
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=710031&r1=710030&r2=710031&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
Mon Nov 3 01:42:36 2008
@@ -37,7 +37,7 @@
this.dataModel = dataModel;
}
- public final double itemCorrelation(Item item1, Item item2) throws
TasteException {
+ public final double itemSimilarity(Item item1, Item item2) throws
TasteException {
if (item1 == null || item2 == null) {
throw new IllegalArgumentException("item1 or item2 is null");
}
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=710031&r1=710030&r2=710031&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
Mon Nov 3 01:42:36 2008
@@ -56,11 +56,11 @@
this.rankingUserSimilarity = rankingUserSimilarity;
}
- public double userCorrelation(User user1, User user2) throws TasteException {
+ public double userSimilarity(User user1, User user2) throws TasteException {
if (user1 == null || user2 == null) {
throw new IllegalArgumentException("user1 or user2 is null");
}
- return rankingUserSimilarity.userCorrelation(new
RankedPreferenceUser(user1),
+ return rankingUserSimilarity.userSimilarity(new
RankedPreferenceUser(user1),
new
RankedPreferenceUser(user2));
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/TanimotoCoefficientSimilarity.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/TanimotoCoefficientSimilarity.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/TanimotoCoefficientSimilarity.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/TanimotoCoefficientSimilarity.java
Mon Nov 3 01:42:36 2008
@@ -60,7 +60,7 @@
throw new UnsupportedOperationException();
}
- public final double userCorrelation(User user1, User user2) throws
TasteException {
+ public final double userSimilarity(User user1, User user2) throws
TasteException {
if (user1 == null || user2 == null) {
throw new IllegalArgumentException("user1 or user2 is null");
@@ -115,7 +115,7 @@
return result;
}
- public final double itemCorrelation(Item item1, Item item2) throws
TasteException {
+ public final double itemSimilarity(Item item1, Item item2) throws
TasteException {
if (item1 == null || item2 == null) {
throw new IllegalArgumentException("item1 or item2 is null");
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/similarity/ItemSimilarity.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/similarity/ItemSimilarity.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/similarity/ItemSimilarity.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/similarity/ItemSimilarity.java
Mon Nov 3 01:42:36 2008
@@ -22,23 +22,23 @@
import org.apache.mahout.cf.taste.model.Item;
/**
- * <p>Implementations of this interface define a notion of itemCorrelation
between two
- * [EMAIL PROTECTED] org.apache.mahout.cf.taste.model.Item}s. Implementations
should return values in the range -1.0 to 1.0, with
- * 1.0 representing perfect correlation.</p>
+ * <p>Implementations of this interface define a notion of similarity between
two
+ * [EMAIL PROTECTED] Item}s. Implementations should return values in the range
-1.0 to 1.0, with
+ * 1.0 representing perfect similarity.</p>
*
* @see UserSimilarity
*/
public interface ItemSimilarity extends Refreshable {
/**
- * <p>Returns the "itemCorrelation", or degree of similarity, of two [EMAIL
PROTECTED] org.apache.mahout.cf.taste.model.Item}s, based
+ * <p>Returns the degree of similarity, of two [EMAIL PROTECTED] Item}s,
based
* on the preferences that [EMAIL PROTECTED]
org.apache.mahout.cf.taste.model.User}s have expressed for the items.</p>
*
* @param item1 first item
* @param item2 second item
- * @return itemCorrelation between the [EMAIL PROTECTED]
org.apache.mahout.cf.taste.model.Item}s
+ * @return similarity between the [EMAIL PROTECTED] Item}s, in [-1,1]
* @throws TasteException if an error occurs while accessing the data
*/
- double itemCorrelation(Item item1, Item item2) throws TasteException;
+ double itemSimilarity(Item item1, Item item2) throws TasteException;
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/similarity/UserSimilarity.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/similarity/UserSimilarity.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/similarity/UserSimilarity.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/similarity/UserSimilarity.java
Mon Nov 3 01:42:36 2008
@@ -22,24 +22,24 @@
import org.apache.mahout.cf.taste.model.User;
/**
- * <p>Implementations of this interface define a notion of itemCorrelation
between two
+ * <p>Implementations of this interface define a notion of similarity between
two
* [EMAIL PROTECTED] User}s. Implementations should return values in the range
-1.0 to 1.0, with
- * 1.0 representing perfect correlation.</p>
+ * 1.0 representing perfect similarity.</p>
*
* @see ItemSimilarity
*/
public interface UserSimilarity extends Refreshable {
/**
- * <p>Returns the "itemCorrelation", or degree of similarity, of two [EMAIL
PROTECTED] User}s, based
+ * <p>Returns the degree of similarity, of two [EMAIL PROTECTED] User}s,
based
* on the their preferences.</p>
*
* @param user1 first user
* @param user2 second user
- * @return itemCorrelation between the two users
+ * @return similarity between the two users, in [-1,1]
* @throws TasteException if an error occurs while accessing the data
*/
- double userCorrelation(User user1, User user2) throws TasteException;
+ double userSimilarity(User user1, User user2) throws TasteException;
/**
* <p>Attaches a [EMAIL PROTECTED] PreferenceInferrer} to the [EMAIL
PROTECTED] UserSimilarity} implementation.</p>
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/DummySimilarity.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/DummySimilarity.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/DummySimilarity.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/DummySimilarity.java
Mon Nov 3 01:42:36 2008
@@ -28,12 +28,12 @@
final class DummySimilarity implements UserSimilarity, ItemSimilarity {
- public double userCorrelation(User user1, User user2) {
+ public double userSimilarity(User user1, User user2) {
return 1.0 / Math.abs(user1.getPreferencesAsArray()[0].getValue() -
user2.getPreferencesAsArray()[0].getValue());
}
- public double itemCorrelation(Item item1, Item item2) {
+ public double itemSimilarity(Item item1, Item item2) {
// Make up something wacky
return (double) (item1.hashCode() - item2.hashCode());
}
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/EuclideanDistanceSimilarityTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/EuclideanDistanceSimilarityTest.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/EuclideanDistanceSimilarityTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/EuclideanDistanceSimilarityTest.java
Mon Nov 3 01:42:36 2008
@@ -38,7 +38,7 @@
User user1 = getUser("test1", 3.0, -2.0);
User user2 = getUser("test2", 3.0, -2.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
EuclideanDistanceSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
EuclideanDistanceSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(1.0, correlation);
}
@@ -46,7 +46,7 @@
User user1 = getUser("test1", 3.0, -2.0);
User user2 = getUser("test2", 3.0, -2.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new EuclideanDistanceSimilarity(dataModel,
Weighting.WEIGHTED).userCorrelation(user1, user2);
+ double correlation = new EuclideanDistanceSimilarity(dataModel,
Weighting.WEIGHTED).userSimilarity(user1, user2);
assertCorrelationEquals(1.0, correlation);
}
@@ -54,7 +54,7 @@
User user1 = getUser("test1", 3.0, 3.0);
User user2 = getUser("test2", 3.0, 3.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
EuclideanDistanceSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
EuclideanDistanceSimilarity(dataModel).userSimilarity(user1, user2);
assertTrue(Double.isNaN(correlation));
}
@@ -62,7 +62,7 @@
User user1 = getUser("test1", 3.0, -2.0);
User user2 = getUser("test2", -3.0, 2.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
EuclideanDistanceSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
EuclideanDistanceSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(0.424465381883345, correlation);
}
@@ -70,7 +70,7 @@
User user1 = getUser("test1", 3.0, -2.0);
User user2 = getUser("test2", -3.0, 2.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new EuclideanDistanceSimilarity(dataModel,
Weighting.WEIGHTED).userCorrelation(user1, user2);
+ double correlation = new EuclideanDistanceSimilarity(dataModel,
Weighting.WEIGHTED).userSimilarity(user1, user2);
assertCorrelationEquals(0.8081551272944483, correlation);
}
@@ -80,7 +80,7 @@
Preference pref2 = new GenericPreference(null, new
GenericItem<String>("2"), 1.0);
GenericUser<String> user2 = new GenericUser<String>("test2",
Collections.singletonList(pref2));
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
EuclideanDistanceSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
EuclideanDistanceSimilarity(dataModel).userSimilarity(user1, user2);
assertTrue(Double.isNaN(correlation));
}
@@ -88,7 +88,7 @@
User user1 = getUser("test1", 90.0, 80.0, 70.0);
User user2 = getUser("test2", 70.0, 80.0, 90.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
EuclideanDistanceSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
EuclideanDistanceSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(0.3606507916004517, correlation);
}
@@ -96,7 +96,7 @@
User user1 = getUser("test1", 1.0, 2.0, 3.0);
User user2 = getUser("test2", 2.0, 5.0, 6.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
EuclideanDistanceSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
EuclideanDistanceSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(0.5896248568217328, correlation);
}
@@ -104,7 +104,7 @@
User user1 = getUser("test1", 1.0, 2.0, 3.0);
User user2 = getUser("test2", 2.0, 5.0, 6.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new EuclideanDistanceSimilarity(dataModel,
Weighting.WEIGHTED).userCorrelation(user1, user2);
+ double correlation = new EuclideanDistanceSimilarity(dataModel,
Weighting.WEIGHTED).userSimilarity(user1, user2);
assertCorrelationEquals(0.8974062142054332, correlation);
}
@@ -113,7 +113,7 @@
User user2 = getUser("test2", -2.0, -2.0);
DataModel dataModel = getDataModel(user1, user2);
double correlation =
- new
EuclideanDistanceSimilarity(dataModel).itemCorrelation(dataModel.getItem("0"),
dataModel.getItem("1"));
+ new
EuclideanDistanceSimilarity(dataModel).itemSimilarity(dataModel.getItem("0"),
dataModel.getItem("1"));
assertCorrelationEquals(1.0, correlation);
}
@@ -122,7 +122,7 @@
User user2 = getUser("test2", 3.0, 3.0);
DataModel dataModel = getDataModel(user1, user2);
double correlation =
- new
EuclideanDistanceSimilarity(dataModel).itemCorrelation(dataModel.getItem("0"),
dataModel.getItem("1"));
+ new
EuclideanDistanceSimilarity(dataModel).itemSimilarity(dataModel.getItem("0"),
dataModel.getItem("1"));
// Yeah, undefined in this case
assertTrue(Double.isNaN(correlation));
}
@@ -132,7 +132,7 @@
User user2 = getUser("test2", -2.0, 2.0);
DataModel dataModel = getDataModel(user1, user2);
double correlation =
- new
EuclideanDistanceSimilarity(dataModel).itemCorrelation(dataModel.getItem("0"),
dataModel.getItem("1"));
+ new
EuclideanDistanceSimilarity(dataModel).itemSimilarity(dataModel.getItem("0"),
dataModel.getItem("1"));
assertCorrelationEquals(0.424465381883345, correlation);
}
@@ -143,7 +143,7 @@
GenericUser<String> user2 = new GenericUser<String>("test2",
Collections.singletonList(pref2));
DataModel dataModel = getDataModel(user1, user2);
double correlation =
- new
EuclideanDistanceSimilarity(dataModel).itemCorrelation(dataModel.getItem("1"),
dataModel.getItem("2"));
+ new
EuclideanDistanceSimilarity(dataModel).itemSimilarity(dataModel.getItem("1"),
dataModel.getItem("2"));
assertTrue(Double.isNaN(correlation));
}
@@ -153,7 +153,7 @@
User user3 = getUser("test3", 70.0, 90.0);
DataModel dataModel = getDataModel(user1, user2, user3);
double correlation =
- new
EuclideanDistanceSimilarity(dataModel).itemCorrelation(dataModel.getItem("0"),
dataModel.getItem("1"));
+ new
EuclideanDistanceSimilarity(dataModel).itemSimilarity(dataModel.getItem("0"),
dataModel.getItem("1"));
assertCorrelationEquals(0.3606507916004517, correlation);
}
@@ -163,7 +163,7 @@
User user3 = getUser("test3", 3.0, 6.0);
DataModel dataModel = getDataModel(user1, user2, user3);
double correlation =
- new
EuclideanDistanceSimilarity(dataModel).itemCorrelation(dataModel.getItem("0"),
dataModel.getItem("1"));
+ new
EuclideanDistanceSimilarity(dataModel).itemSimilarity(dataModel.getItem("0"),
dataModel.getItem("1"));
assertCorrelationEquals(0.5896248568217328, correlation);
}
@@ -173,7 +173,7 @@
User user3 = getUser("test3", 3.0, 6.0);
DataModel dataModel = getDataModel(user1, user2, user3);
ItemSimilarity itemSimilarity = new EuclideanDistanceSimilarity(dataModel,
Weighting.WEIGHTED);
- double correlation =
itemSimilarity.itemCorrelation(dataModel.getItem("0"), dataModel.getItem("1"));
+ double correlation = itemSimilarity.itemSimilarity(dataModel.getItem("0"),
dataModel.getItem("1"));
assertCorrelationEquals(0.8974062142054332, correlation);
}
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarityTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarityTest.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarityTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/GenericItemSimilarityTest.java
Mon Nov 3 01:42:36 2008
@@ -42,11 +42,11 @@
correlations.add(new GenericItemSimilarity.ItemItemCorrelation(item1,
item1, 0.5));
correlations.add(new GenericItemSimilarity.ItemItemCorrelation(item1,
item3, 0.3));
GenericItemSimilarity itemCorrelation = new
GenericItemSimilarity(correlations);
- assertEquals(1.0, itemCorrelation.itemCorrelation(item1, item1));
- assertEquals(0.6, itemCorrelation.itemCorrelation(item1, item2));
- assertEquals(0.6, itemCorrelation.itemCorrelation(item2, item1));
- assertEquals(0.3, itemCorrelation.itemCorrelation(item1, item3));
- assertTrue(Double.isNaN(itemCorrelation.itemCorrelation(item3, item4)));
+ assertEquals(1.0, itemCorrelation.itemSimilarity(item1, item1));
+ assertEquals(0.6, itemCorrelation.itemSimilarity(item1, item2));
+ assertEquals(0.6, itemCorrelation.itemSimilarity(item2, item1));
+ assertEquals(0.3, itemCorrelation.itemSimilarity(item1, item3));
+ assertTrue(Double.isNaN(itemCorrelation.itemSimilarity(item3, item4)));
}
public void testFromCorrelation() throws Exception {
@@ -57,9 +57,9 @@
ItemSimilarity otherSimilarity = new
PearsonCorrelationSimilarity(dataModel);
ItemSimilarity itemSimilarity = new GenericItemSimilarity(otherSimilarity,
dataModel);
assertCorrelationEquals(1.0,
-
itemSimilarity.itemCorrelation(dataModel.getItem("0"), dataModel.getItem("0")));
+
itemSimilarity.itemSimilarity(dataModel.getItem("0"), dataModel.getItem("0")));
assertCorrelationEquals(0.960768922830523,
-
itemSimilarity.itemCorrelation(dataModel.getItem("0"), dataModel.getItem("1")));
+
itemSimilarity.itemSimilarity(dataModel.getItem("0"), dataModel.getItem("1")));
}
}
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarityTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarityTest.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarityTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/LogLikelihoodSimilarityTest.java
Mon Nov 3 01:42:36 2008
@@ -34,27 +34,27 @@
DataModel dataModel = getDataModel(user1, user2, user3, user4, user5);
double correlation = new LogLikelihoodSimilarity(dataModel).
- itemCorrelation(dataModel.getItem("1"), dataModel.getItem("0"));
+ itemSimilarity(dataModel.getItem("1"), dataModel.getItem("0"));
assertCorrelationEquals(0.12160727029227925, correlation);
correlation = new LogLikelihoodSimilarity(dataModel).
- itemCorrelation(dataModel.getItem("0"), dataModel.getItem("1"));
+ itemSimilarity(dataModel.getItem("0"), dataModel.getItem("1"));
assertCorrelationEquals(0.12160727029227925, correlation);
correlation = new LogLikelihoodSimilarity(dataModel).
- itemCorrelation(dataModel.getItem("2"), dataModel.getItem("1"));
+ itemSimilarity(dataModel.getItem("2"), dataModel.getItem("1"));
assertCorrelationEquals(0.5423213660693733, correlation);
correlation = new LogLikelihoodSimilarity(dataModel).
- itemCorrelation(dataModel.getItem("2"), dataModel.getItem("3"));
+ itemSimilarity(dataModel.getItem("2"), dataModel.getItem("3"));
assertCorrelationEquals(0.6905400104897509, correlation);
correlation = new LogLikelihoodSimilarity(dataModel).
- itemCorrelation(dataModel.getItem("3"), dataModel.getItem("4"));
+ itemSimilarity(dataModel.getItem("3"), dataModel.getItem("4"));
assertCorrelationEquals(0.8706358464330881, correlation);
correlation = new LogLikelihoodSimilarity(dataModel).
- itemCorrelation(dataModel.getItem("4"), dataModel.getItem("3"));
+ itemSimilarity(dataModel.getItem("4"), dataModel.getItem("3"));
assertCorrelationEquals(0.8706358464330881, correlation);
}
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/PearsonCorrelationSimilarityTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/PearsonCorrelationSimilarityTest.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/PearsonCorrelationSimilarityTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/PearsonCorrelationSimilarityTest.java
Mon Nov 3 01:42:36 2008
@@ -37,7 +37,7 @@
User user1 = getUser("test1", 3.0, -2.0);
User user2 = getUser("test2", 3.0, -2.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
PearsonCorrelationSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
PearsonCorrelationSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(1.0, correlation);
}
@@ -45,7 +45,7 @@
User user1 = getUser("test1", 3.0, -2.0);
User user2 = getUser("test2", 3.0, -2.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new PearsonCorrelationSimilarity(dataModel,
Weighting.WEIGHTED).userCorrelation(user1, user2);
+ double correlation = new PearsonCorrelationSimilarity(dataModel,
Weighting.WEIGHTED).userSimilarity(user1, user2);
assertCorrelationEquals(1.0, correlation);
}
@@ -53,7 +53,7 @@
User user1 = getUser("test1", 3.0, 3.0);
User user2 = getUser("test2", 3.0, 3.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
PearsonCorrelationSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
PearsonCorrelationSimilarity(dataModel).userSimilarity(user1, user2);
// Yeah, undefined in this case
assertTrue(Double.isNaN(correlation));
}
@@ -62,7 +62,7 @@
User user1 = getUser("test1", 3.0, -2.0);
User user2 = getUser("test2", -3.0, 2.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
PearsonCorrelationSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
PearsonCorrelationSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(-1.0, correlation);
}
@@ -70,7 +70,7 @@
User user1 = getUser("test1", 3.0, -2.0);
User user2 = getUser("test2", -3.0, 2.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new PearsonCorrelationSimilarity(dataModel,
Weighting.WEIGHTED).userCorrelation(user1, user2);
+ double correlation = new PearsonCorrelationSimilarity(dataModel,
Weighting.WEIGHTED).userSimilarity(user1, user2);
assertCorrelationEquals(-1.0, correlation);
}
@@ -80,7 +80,7 @@
Preference pref2 = new GenericPreference(null, new
GenericItem<String>("2"), 1.0);
GenericUser<String> user2 = new GenericUser<String>("test2",
Collections.singletonList(pref2));
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
PearsonCorrelationSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
PearsonCorrelationSimilarity(dataModel).userSimilarity(user1, user2);
assertTrue(Double.isNaN(correlation));
}
@@ -88,7 +88,7 @@
User user1 = getUser("test1", 90.0, 80.0, 70.0);
User user2 = getUser("test2", 70.0, 80.0, 90.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
PearsonCorrelationSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
PearsonCorrelationSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(-1.0, correlation);
}
@@ -96,7 +96,7 @@
User user1 = getUser("test1", 1.0, 2.0, 3.0);
User user2 = getUser("test2", 2.0, 5.0, 6.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
PearsonCorrelationSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
PearsonCorrelationSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(0.9607689228305227, correlation);
}
@@ -104,7 +104,7 @@
User user1 = getUser("test1", 1.0, 2.0, 3.0);
User user2 = getUser("test2", 2.0, 5.0, 6.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new PearsonCorrelationSimilarity(dataModel,
Weighting.WEIGHTED).userCorrelation(user1, user2);
+ double correlation = new PearsonCorrelationSimilarity(dataModel,
Weighting.WEIGHTED).userSimilarity(user1, user2);
assertCorrelationEquals(0.9901922307076306, correlation);
}
@@ -113,7 +113,7 @@
User user2 = getUser("test2", -2.0, -2.0);
DataModel dataModel = getDataModel(user1, user2);
double correlation =
- new
PearsonCorrelationSimilarity(dataModel).itemCorrelation(dataModel.getItem("0"),
dataModel.getItem("1"));
+ new
PearsonCorrelationSimilarity(dataModel).itemSimilarity(dataModel.getItem("0"),
dataModel.getItem("1"));
assertCorrelationEquals(1.0, correlation);
}
@@ -122,7 +122,7 @@
User user2 = getUser("test2", 3.0, 3.0);
DataModel dataModel = getDataModel(user1, user2);
double correlation =
- new
PearsonCorrelationSimilarity(dataModel).itemCorrelation(dataModel.getItem("0"),
dataModel.getItem("1"));
+ new
PearsonCorrelationSimilarity(dataModel).itemSimilarity(dataModel.getItem("0"),
dataModel.getItem("1"));
// Yeah, undefined in this case
assertTrue(Double.isNaN(correlation));
}
@@ -132,7 +132,7 @@
User user2 = getUser("test2", -2.0, 2.0);
DataModel dataModel = getDataModel(user1, user2);
double correlation =
- new
PearsonCorrelationSimilarity(dataModel).itemCorrelation(dataModel.getItem("0"),
dataModel.getItem("1"));
+ new
PearsonCorrelationSimilarity(dataModel).itemSimilarity(dataModel.getItem("0"),
dataModel.getItem("1"));
assertCorrelationEquals(-1.0, correlation);
}
@@ -143,7 +143,7 @@
GenericUser<String> user2 = new GenericUser<String>("test2",
Collections.singletonList(pref2));
DataModel dataModel = getDataModel(user1, user2);
double correlation =
- new
PearsonCorrelationSimilarity(dataModel).itemCorrelation(dataModel.getItem("1"),
dataModel.getItem("2"));
+ new
PearsonCorrelationSimilarity(dataModel).itemSimilarity(dataModel.getItem("1"),
dataModel.getItem("2"));
assertTrue(Double.isNaN(correlation));
}
@@ -153,7 +153,7 @@
User user3 = getUser("test3", 70.0, 90.0);
DataModel dataModel = getDataModel(user1, user2, user3);
double correlation =
- new
PearsonCorrelationSimilarity(dataModel).itemCorrelation(dataModel.getItem("0"),
dataModel.getItem("1"));
+ new
PearsonCorrelationSimilarity(dataModel).itemSimilarity(dataModel.getItem("0"),
dataModel.getItem("1"));
assertCorrelationEquals(-1.0, correlation);
}
@@ -163,7 +163,7 @@
User user3 = getUser("test3", 3.0, 6.0);
DataModel dataModel = getDataModel(user1, user2, user3);
double correlation =
- new
PearsonCorrelationSimilarity(dataModel).itemCorrelation(dataModel.getItem("0"),
dataModel.getItem("1"));
+ new
PearsonCorrelationSimilarity(dataModel).itemSimilarity(dataModel.getItem("0"),
dataModel.getItem("1"));
assertCorrelationEquals(0.9607689228305227, correlation);
}
@@ -173,7 +173,7 @@
User user3 = getUser("test3", 3.0, 6.0);
DataModel dataModel = getDataModel(user1, user2, user3);
ItemSimilarity itemSimilarity = new
PearsonCorrelationSimilarity(dataModel, Weighting.WEIGHTED);
- double correlation =
itemSimilarity.itemCorrelation(dataModel.getItem("0"), dataModel.getItem("1"));
+ double correlation = itemSimilarity.itemSimilarity(dataModel.getItem("0"),
dataModel.getItem("1"));
assertCorrelationEquals(0.9901922307076306, correlation);
}
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarityTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarityTest.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarityTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/SpearmanCorrelationSimilarityTest.java
Mon Nov 3 01:42:36 2008
@@ -30,7 +30,7 @@
User user1 = getUser("test1", 1.0, 2.0, 3.0);
User user2 = getUser("test2", 1.0, 2.0, 3.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
SpearmanCorrelationSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
SpearmanCorrelationSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(1.0, correlation);
}
@@ -38,7 +38,7 @@
User user1 = getUser("test1", 1.0, 2.0, 3.0);
User user2 = getUser("test2", 4.0, 5.0, 6.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
SpearmanCorrelationSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
SpearmanCorrelationSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(1.0, correlation);
}
@@ -46,7 +46,7 @@
User user1 = getUser("test1", 1.0, 2.0, 3.0);
User user2 = getUser("test2", 3.0, 2.0, 1.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
SpearmanCorrelationSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
SpearmanCorrelationSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(-1.0, correlation);
}
@@ -54,7 +54,7 @@
User user1 = getUser("test1", 1.0, 2.0, 3.0);
User user2 = getUser("test2", 2.0, 3.0, 1.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
SpearmanCorrelationSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
SpearmanCorrelationSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(-0.5, correlation);
}
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/TanimotoCoefficientSimilarityTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/TanimotoCoefficientSimilarityTest.java?rev=710031&r1=710030&r2=710031&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/TanimotoCoefficientSimilarityTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/TanimotoCoefficientSimilarityTest.java
Mon Nov 3 01:42:36 2008
@@ -29,7 +29,7 @@
User user1 = getUser("test1");
User user2 = getUser("test2");
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
TanimotoCoefficientSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
TanimotoCoefficientSimilarity(dataModel).userSimilarity(user1, user2);
assertTrue(Double.isNaN(correlation));
}
@@ -37,7 +37,7 @@
User user1 = getUser("test1");
User user2 = getUser("test2", 1.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
TanimotoCoefficientSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
TanimotoCoefficientSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(0.0, correlation);
}
@@ -45,7 +45,7 @@
User user1 = getUser("test1", null, 2.0, 3.0);
User user2 = getUser("test2", 1.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
TanimotoCoefficientSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
TanimotoCoefficientSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(0.0, correlation);
}
@@ -53,7 +53,7 @@
User user1 = getUser("test1", 1.0);
User user2 = getUser("test2", 1.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
TanimotoCoefficientSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
TanimotoCoefficientSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(1.0, correlation);
}
@@ -61,7 +61,7 @@
User user1 = getUser("test1", 1.0, 2.0, 3.0);
User user2 = getUser("test2", 1.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
TanimotoCoefficientSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
TanimotoCoefficientSimilarity(dataModel).userSimilarity(user1, user2);
assertCorrelationEquals(0.3333333333333333, correlation);
}
@@ -69,7 +69,7 @@
User user1 = getUser("test1", null, 2.0, 3.0);
User user2 = getUser("test2", 1.0, 1.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
TanimotoCoefficientSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
TanimotoCoefficientSimilarity(dataModel).userSimilarity(user1, user2);
assertEquals(0.3333333333333333, correlation);
}
@@ -77,7 +77,7 @@
User user1 = getUser("test1", null, 2.0, 3.0, 1.0);
User user2 = getUser("test2", 1.0, 1.0, null, 0.0);
DataModel dataModel = getDataModel(user1, user2);
- double correlation = new
TanimotoCoefficientSimilarity(dataModel).userCorrelation(user1, user2);
+ double correlation = new
TanimotoCoefficientSimilarity(dataModel).userSimilarity(user1, user2);
assertEquals(0.5, correlation);
}
