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 2008/08/09 23:55:05 UTC
svn commit: r684358 [2/2] - in /lucene/mahout/trunk/core/src:
main/examples/org/apache/mahout/cf/taste/example/grouplens/
main/java/org/apache/mahout/cf/taste/common/
main/java/org/apache/mahout/cf/taste/impl/common/
main/java/org/apache/mahout/cf/tast...
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/LogLikelihoodCorrelationTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/LogLikelihoodCorrelationTest.java?rev=684358&r1=684357&r2=684358&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/LogLikelihoodCorrelationTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/LogLikelihoodCorrelationTest.java Sat Aug 9 14:55:03 2008
@@ -60,7 +60,7 @@
public void testRefresh() {
// Make sure this doesn't throw an exception
- new LogLikelihoodCorrelation(getDataModel()).refresh();
+ new LogLikelihoodCorrelation(getDataModel()).refresh(null);
}
}
\ No newline at end of file
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/PearsonCorrelationTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/PearsonCorrelationTest.java?rev=684358&r1=684357&r2=684358&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/PearsonCorrelationTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/PearsonCorrelationTest.java Sat Aug 9 14:55:03 2008
@@ -179,7 +179,7 @@
public void testRefresh() throws Exception {
// Make sure this doesn't throw an exception
- new PearsonCorrelation(getDataModel()).refresh();
+ new PearsonCorrelation(getDataModel()).refresh(null);
}
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/SpearmanCorrelationTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/SpearmanCorrelationTest.java?rev=684358&r1=684357&r2=684358&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/SpearmanCorrelationTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/SpearmanCorrelationTest.java Sat Aug 9 14:55:03 2008
@@ -60,7 +60,7 @@
public void testRefresh() throws TasteException {
// Make sure this doesn't throw an exception
- new SpearmanCorrelation(getDataModel()).refresh();
+ new SpearmanCorrelation(getDataModel()).refresh(null);
}
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/TanimotoCoefficientCorrelationTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/TanimotoCoefficientCorrelationTest.java?rev=684358&r1=684357&r2=684358&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/TanimotoCoefficientCorrelationTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/correlation/TanimotoCoefficientCorrelationTest.java Sat Aug 9 14:55:03 2008
@@ -83,7 +83,7 @@
public void testRefresh() {
// Make sure this doesn't throw an exception
- new TanimotoCoefficientCorrelation(getDataModel()).refresh();
+ new TanimotoCoefficientCorrelation(getDataModel()).refresh(null);
}
}
\ No newline at end of file
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java?rev=684358&r1=684357&r2=684358&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java Sat Aug 9 14:55:03 2008
@@ -58,7 +58,7 @@
assertEquals(1, recommender.recommend("C345", 3).size());
// Make sure this doesn't throw an exception
- model.refresh();
+ model.refresh(null);
}
public void testItem() throws Exception {
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/DummyCorrelation.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/DummyCorrelation.java?rev=684358&r1=684357&r2=684358&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/DummyCorrelation.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/DummyCorrelation.java Sat Aug 9 14:55:03 2008
@@ -22,6 +22,9 @@
import org.apache.mahout.cf.taste.correlation.UserCorrelation;
import org.apache.mahout.cf.taste.model.Item;
import org.apache.mahout.cf.taste.model.User;
+import org.apache.mahout.cf.taste.common.Refreshable;
+
+import java.util.Collection;
final class DummyCorrelation implements UserCorrelation, ItemCorrelation {
@@ -39,7 +42,7 @@
throw new UnsupportedOperationException();
}
- public void refresh() {
+ public void refresh(Collection<Refreshable> alreadyRefreshed) {
// do nothing
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNNeighborhoodTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNNeighborhoodTest.java?rev=684358&r1=684357&r2=684358&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNNeighborhoodTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNNeighborhoodTest.java Sat Aug 9 14:55:03 2008
@@ -62,7 +62,7 @@
public void testRefresh() throws Exception {
// Make sure this doesn't throw an exception
DataModel dataModel = new GenericDataModel(Collections.singletonList(getUser("test1", 0.1)));
- new NearestNUserNeighborhood(1, new DummyCorrelation(), dataModel).refresh();
+ new NearestNUserNeighborhood(1, new DummyCorrelation(), dataModel).refresh(null);
}
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdNeighborhoodTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdNeighborhoodTest.java?rev=684358&r1=684357&r2=684358&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdNeighborhoodTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/neighborhood/ThresholdNeighborhoodTest.java Sat Aug 9 14:55:03 2008
@@ -60,7 +60,7 @@
public void testRefresh() throws Exception {
// Make sure this doesn't throw an exception
DataModel dataModel = new GenericDataModel(Collections.singletonList(getUser("test1", 0.1)));
- new ThresholdUserNeighborhood(20.0, new DummyCorrelation(), dataModel).refresh();
+ new ThresholdUserNeighborhood(20.0, new DummyCorrelation(), dataModel).refresh(null);
}
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommenderTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommenderTest.java?rev=684358&r1=684357&r2=684358&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommenderTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommenderTest.java Sat Aug 9 14:55:03 2008
@@ -42,7 +42,7 @@
assertEquals(2, recommendCount.get());
cachingRecommender.recommend("2", 1);
assertEquals(2, recommendCount.get());
- cachingRecommender.refresh();
+ cachingRecommender.refresh(null);
cachingRecommender.recommend("1", 1);
assertEquals(3, recommendCount.get());
cachingRecommender.recommend("2", 1);
@@ -52,7 +52,7 @@
// Results from this recommend() method can't be cached:
Rescorer<Item> rescorer = NullRescorer.getItemInstance();
- cachingRecommender.refresh();
+ cachingRecommender.refresh(null);
cachingRecommender.recommend("1", 1, rescorer);
assertEquals(6, recommendCount.get());
cachingRecommender.recommend("2", 1, rescorer);
@@ -62,7 +62,7 @@
cachingRecommender.recommend("2", 1, rescorer);
assertEquals(9, recommendCount.get());
- cachingRecommender.refresh();
+ cachingRecommender.refresh(null);
cachingRecommender.estimatePreference("test1", "1");
assertEquals(10, recommendCount.get());
cachingRecommender.estimatePreference("test1", "2");
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=684358&r1=684357&r2=684358&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 Sat Aug 9 14:55:03 2008
@@ -46,7 +46,7 @@
RecommendedItem firstRecommended = recommended.get(0);
assertEquals(new GenericItem<String>("2"), firstRecommended.getItem());
assertEquals(0.1, firstRecommended.getValue(), EPSILON);
- recommender.refresh();
+ recommender.refresh(null);
assertEquals(new GenericItem<String>("2"), firstRecommended.getItem());
assertEquals(0.1, firstRecommended.getValue(), EPSILON);
}
@@ -76,7 +76,7 @@
for (int i = 0; i < fewRecommended.size(); i++) {
assertEquals(fewRecommended.get(i).getItem(), moreRecommended.get(i).getItem());
}
- recommender.refresh();
+ recommender.refresh(null);
for (int i = 0; i < fewRecommended.size(); i++) {
assertEquals(fewRecommended.get(i).getItem(), moreRecommended.get(i).getItem());
}
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=684358&r1=684357&r2=684358&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 Sat Aug 9 14:55:03 2008
@@ -48,7 +48,7 @@
RecommendedItem firstRecommended = recommended.get(0);
assertEquals(new GenericItem<String>("2"), firstRecommended.getItem());
assertEquals(0.3, firstRecommended.getValue());
- recommender.refresh();
+ recommender.refresh(null);
assertEquals(new GenericItem<String>("2"), firstRecommended.getItem());
assertEquals(0.3, firstRecommended.getValue());
}
@@ -69,7 +69,7 @@
for (int i = 0; i < fewRecommended.size(); i++) {
assertEquals(fewRecommended.get(i).getItem(), moreRecommended.get(i).getItem());
}
- recommender.refresh();
+ recommender.refresh(null);
for (int i = 0; i < fewRecommended.size(); i++) {
assertEquals(fewRecommended.get(i).getItem(), moreRecommended.get(i).getItem());
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/MockRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/MockRecommender.java?rev=684358&r1=684357&r2=684358&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/MockRecommender.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/MockRecommender.java Sat Aug 9 14:55:03 2008
@@ -27,10 +27,12 @@
import org.apache.mahout.cf.taste.recommender.RecommendedItem;
import org.apache.mahout.cf.taste.recommender.Recommender;
import org.apache.mahout.cf.taste.recommender.Rescorer;
+import org.apache.mahout.cf.taste.common.Refreshable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Collection;
import java.util.concurrent.atomic.AtomicInteger;
@@ -78,7 +80,7 @@
return new GenericDataModel(users);
}
- public void refresh() {
+ public void refresh(Collection<Refreshable> alreadyRefreshed) {
// do nothing
}
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=684358&r1=684357&r2=684358&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 Sat Aug 9 14:55:03 2008
@@ -48,7 +48,7 @@
List<RecommendedItem> recommended = recommender.recommend("test1", 1);
assertNotNull(recommended);
assertEquals(0, recommended.size());
- recommender.refresh();
+ recommender.refresh(null);
assertNotNull(recommended);
assertEquals(0, recommended.size());
}
@@ -69,7 +69,7 @@
for (int i = 0; i < fewRecommended.size(); i++) {
assertEquals(fewRecommended.get(i).getItem(), moreRecommended.get(i).getItem());
}
- recommender.refresh();
+ recommender.refresh(null);
for (int i = 0; i < fewRecommended.size(); i++) {
assertEquals(fewRecommended.get(i).getItem(), moreRecommended.get(i).getItem());
}
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=684358&r1=684357&r2=684358&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 Sat Aug 9 14:55:03 2008
@@ -44,7 +44,7 @@
RecommendedItem firstRecommended = recommended.get(0);
assertEquals(new GenericItem<String>("2"), firstRecommended.getItem());
assertEquals(0.34803885284992736, firstRecommended.getValue(), EPSILON);
- recommender.refresh();
+ recommender.refresh(null);
assertEquals(new GenericItem<String>("2"), firstRecommended.getItem());
assertEquals(0.34803885284992736, firstRecommended.getValue(), EPSILON);
}
@@ -63,7 +63,7 @@
for (int i = 0; i < fewRecommended.size(); i++) {
assertEquals(fewRecommended.get(i).getItem(), moreRecommended.get(i).getItem());
}
- recommender.refresh();
+ recommender.refresh(null);
for (int i = 0; i < fewRecommended.size(); i++) {
assertEquals(fewRecommended.get(i).getItem(), moreRecommended.get(i).getItem());
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/CaseAmplificationTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/CaseAmplificationTest.java?rev=684358&r1=684357&r2=684358&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/CaseAmplificationTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/CaseAmplificationTest.java Sat Aug 9 14:55:03 2008
@@ -29,7 +29,7 @@
public void testRefresh() {
// Make sure this doesn't throw an exception
- new CaseAmplification(1.0).refresh();
+ new CaseAmplification(1.0).refresh(null);
}
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequencyTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequencyTest.java?rev=684358&r1=684357&r2=684358&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequencyTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/InverseUserFrequencyTest.java Sat Aug 9 14:55:03 2008
@@ -29,7 +29,7 @@
*/
public final class InverseUserFrequencyTest extends TransformTestCase {
- public void testIUF() {
+ public void testIUF() throws Exception {
List<User> users = new ArrayList<User>(5);
users.add(getUser("test1", 0.1));
users.add(getUser("test2", 0.2, 0.3));
@@ -49,7 +49,7 @@
}
// Make sure this doesn't throw an exception
- iuf.refresh();
+ iuf.refresh(null);
}
}
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=684358&r1=684357&r2=684358&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 Sat Aug 9 14:55:03 2008
@@ -56,7 +56,7 @@
public void testRefresh() {
// Make sure this doesn't throw an exception
- new ZScore().refresh();
+ new ZScore().refresh(null);
}
}