Author: srowen
Date: Thu Jul 17 12:17:21 2008
New Revision: 677693
URL: http://svn.apache.org/viewvc?rev=677693&view=rev
Log:
Bug fix in MemoryDiffStorage.buildAverageDiffs() -- need to clear averageDiffs
at start
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/MemoryDiffStorage.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommenderTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommenderTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommenderTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/SlopeOneRecommenderTest.java
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=677693&r1=677692&r2=677693&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
Thu Jul 17 12:17:21 2008
@@ -200,6 +200,7 @@
log.info("Building average diffs...");
try {
buildAverageDiffsLock.writeLock().lock();
+ averageDiffs.clear();
long averageCount = 0L;
for (User user : dataModel.getUsers()) {
averageCount = processOneUser(averageCount, user);
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommenderTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommenderTest.java?rev=677693&r1=677692&r2=677693&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommenderTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericItemBasedRecommenderTest.java
Thu Jul 17 12:17:21 2008
@@ -46,6 +46,9 @@
RecommendedItem firstRecommended = recommended.get(0);
assertEquals(new GenericItem<String>("2"), firstRecommended.getItem());
assertEquals(0.1, firstRecommended.getValue(), EPSILON);
+ recommender.refresh();
+ assertEquals(new GenericItem<String>("2"), firstRecommended.getItem());
+ assertEquals(0.1, firstRecommended.getValue(), EPSILON);
}
public void testHowMany() throws Exception {
@@ -73,6 +76,10 @@
for (int i = 0; i < fewRecommended.size(); i++) {
assertEquals(fewRecommended.get(i).getItem(),
moreRecommended.get(i).getItem());
}
+ recommender.refresh();
+ for (int i = 0; i < fewRecommended.size(); i++) {
+ assertEquals(fewRecommended.get(i).getItem(),
moreRecommended.get(i).getItem());
+ }
}
public void testRescorer() throws Exception {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommenderTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommenderTest.java?rev=677693&r1=677692&r2=677693&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommenderTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommenderTest.java
Thu Jul 17 12:17:21 2008
@@ -48,6 +48,9 @@
RecommendedItem firstRecommended = recommended.get(0);
assertEquals(new GenericItem<String>("2"), firstRecommended.getItem());
assertEquals(0.3, firstRecommended.getValue());
+ recommender.refresh();
+ assertEquals(new GenericItem<String>("2"), firstRecommended.getItem());
+ assertEquals(0.3, firstRecommended.getValue());
}
public void testHowMany() throws Exception {
@@ -66,6 +69,10 @@
for (int i = 0; i < fewRecommended.size(); i++) {
assertEquals(fewRecommended.get(i).getItem(),
moreRecommended.get(i).getItem());
}
+ recommender.refresh();
+ for (int i = 0; i < fewRecommended.size(); i++) {
+ assertEquals(fewRecommended.get(i).getItem(),
moreRecommended.get(i).getItem());
+ }
}
public void testRescorer() throws Exception {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommenderTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommenderTest.java?rev=677693&r1=677692&r2=677693&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommenderTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommenderTest.java
Thu Jul 17 12:17:21 2008
@@ -48,6 +48,9 @@
List<RecommendedItem> recommended = recommender.recommend("test1", 1);
assertNotNull(recommended);
assertEquals(0, recommended.size());
+ recommender.refresh();
+ assertNotNull(recommended);
+ assertEquals(0, recommended.size());
}
public void testHowMany() throws Exception {
@@ -66,6 +69,10 @@
for (int i = 0; i < fewRecommended.size(); i++) {
assertEquals(fewRecommended.get(i).getItem(),
moreRecommended.get(i).getItem());
}
+ recommender.refresh();
+ for (int i = 0; i < fewRecommended.size(); i++) {
+ assertEquals(fewRecommended.get(i).getItem(),
moreRecommended.get(i).getItem());
+ }
}
public void testRescorer() throws Exception {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/SlopeOneRecommenderTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/SlopeOneRecommenderTest.java?rev=677693&r1=677692&r2=677693&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/SlopeOneRecommenderTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/SlopeOneRecommenderTest.java
Thu Jul 17 12:17:21 2008
@@ -44,6 +44,9 @@
RecommendedItem firstRecommended = recommended.get(0);
assertEquals(new GenericItem<String>("2"), firstRecommended.getItem());
assertEquals(0.34803885284992736, firstRecommended.getValue(), EPSILON);
+ recommender.refresh();
+ assertEquals(new GenericItem<String>("2"), firstRecommended.getItem());
+ assertEquals(0.34803885284992736, firstRecommended.getValue(), EPSILON);
}
public void testHowMany() throws Exception {
@@ -60,6 +63,10 @@
for (int i = 0; i < fewRecommended.size(); i++) {
assertEquals(fewRecommended.get(i).getItem(),
moreRecommended.get(i).getItem());
}
+ recommender.refresh();
+ for (int i = 0; i < fewRecommended.size(); i++) {
+ assertEquals(fewRecommended.get(i).getItem(),
moreRecommended.get(i).getItem());
+ }
}
public void testRescorer() throws Exception {
