Return-Path: Delivered-To: apmail-lucene-mahout-commits-archive@minotaur.apache.org Received: (qmail 60838 invoked from network); 9 Nov 2009 14:41:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Nov 2009 14:41:49 -0000 Received: (qmail 11344 invoked by uid 500); 9 Nov 2009 14:41:49 -0000 Delivered-To: apmail-lucene-mahout-commits-archive@lucene.apache.org Received: (qmail 11258 invoked by uid 500); 9 Nov 2009 14:41:49 -0000 Mailing-List: contact mahout-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mahout-dev@lucene.apache.org Delivered-To: mailing list mahout-commits@lucene.apache.org Received: (qmail 11249 invoked by uid 99); 9 Nov 2009 14:41:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Nov 2009 14:41:49 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Nov 2009 14:41:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C9FCE23888D4; Mon, 9 Nov 2009 14:41:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r834083 - in /lucene/mahout/trunk/core/src: main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/ main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/ Date: Mon, 09 Nov 2009 14:41:14 -0000 To: mahout-commits@lucene.apache.org From: srowen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091109144126.C9FCE23888D4@eris.apache.org> Author: srowen Date: Mon Nov 9 14:41:00 2009 New Revision: 834083 URL: http://svn.apache.org/viewvc?rev=834083&view=rev Log: Oops missed unit test. Remove problematic SVDRecommender constructor that does no training? Modified: 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/recommender/svd/SVDRecommender.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=834083&r1=834082&r2=834083&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 Mon Nov 9 14:41:00 2009 @@ -271,7 +271,7 @@ PreferenceArray userPreferences = dataModel.getPreferencesFromUser(userID); int length = userPreferences.length(); for (int i = 0; i < length - 1; i++) { - double prefAValue = userPreferences.getValue(i); + float prefAValue = userPreferences.getValue(i); long itemIDA = userPreferences.getItemID(i); FastByIDMap aMap = averageDiffs.get(itemIDA); if (aMap == null) { Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommender.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommender.java?rev=834083&r1=834082&r2=834083&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommender.java (original) +++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/SVDRecommender.java Mon Nov 9 14:41:00 2009 @@ -69,12 +69,6 @@ * @param initialSteps number of initial training steps */ public SVDRecommender(DataModel dataModel, int numFeatures, int initialSteps) throws TasteException { - this(dataModel, numFeatures); - train(initialSteps); - } - - /** @param numFeatures the number of features */ - public SVDRecommender(DataModel dataModel, int numFeatures) throws TasteException { super(dataModel); this.numFeatures = numFeatures; @@ -114,6 +108,7 @@ }); refreshHelper.addDependency(dataModel); + train(initialSteps); } private void recachePreferences() throws TasteException { 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=834083&r1=834082&r2=834083&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 Mon Nov 9 14:41:00 2009 @@ -112,14 +112,15 @@ public void testDiffStdevBehavior() throws Exception { DataModel dataModel = getDataModel( - new long[] {1, 2}, + new long[] {1, 2, 3}, new Double[][] { {0.1, 0.2}, {0.2, 0.3, 0.6}, + {0.3, 0.3, 0.3}, }); Recommender recommender = new SlopeOneRecommender(dataModel); - assertEquals(0.6, recommender.estimatePreference(1, 2), EPSILON); + assertEquals(0.3257f, recommender.estimatePreference(1, 2), EPSILON); } private static Recommender buildRecommender() throws TasteException {