Return-Path: X-Original-To: apmail-mahout-commits-archive@www.apache.org Delivered-To: apmail-mahout-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9CF724238 for ; Sun, 19 Jun 2011 14:50:52 +0000 (UTC) Received: (qmail 24581 invoked by uid 500); 19 Jun 2011 14:50:52 -0000 Delivered-To: apmail-mahout-commits-archive@mahout.apache.org Received: (qmail 24541 invoked by uid 500); 19 Jun 2011 14:50:52 -0000 Mailing-List: contact commits-help@mahout.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@mahout.apache.org Delivered-To: mailing list commits@mahout.apache.org Received: (qmail 24527 invoked by uid 99); 19 Jun 2011 14:50:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Jun 2011 14:50:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Sun, 19 Jun 2011 14:50:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 525FA2388906; Sun, 19 Jun 2011 14:50:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1137374 - in /mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo: RecommenderJob.java UserIDsMapper.java Date: Sun, 19 Jun 2011 14:50:29 -0000 To: commits@mahout.apache.org From: srowen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110619145029.525FA2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: srowen Date: Sun Jun 19 14:50:28 2011 New Revision: 1137374 URL: http://svn.apache.org/viewvc?rev=1137374&view=rev Log: Small improvement and typo fix from book Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderJob.java mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/UserIDsMapper.java Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderJob.java URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderJob.java?rev=1137374&r1=1137373&r2=1137374&view=diff ============================================================================== --- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderJob.java (original) +++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/RecommenderJob.java Sun Jun 19 14:50:28 2011 @@ -109,7 +109,7 @@ public final class RecommenderJob extend addOutputOption(); addOption("recommenderClassName", "r", "Name of recommender class to instantiate"); addOption("numRecommendations", "n", "Number of recommendations per user", "10"); - addOption("usersFile", "u", "Number of recommendations per user", null); + addOption("usersFile", "u", "File of users to recommend for", null); Map parsedArgs = parseArguments(args); if (parsedArgs == null) { Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/UserIDsMapper.java URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/UserIDsMapper.java?rev=1137374&r1=1137373&r2=1137374&view=diff ============================================================================== --- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/UserIDsMapper.java (original) +++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/UserIDsMapper.java Sun Jun 19 14:50:28 2011 @@ -18,6 +18,7 @@ package org.apache.mahout.cf.taste.hadoop.pseudo; import java.io.IOException; +import java.util.regex.Pattern; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.NullWritable; @@ -30,15 +31,16 @@ import org.apache.mahout.math.VarLongWri */ public final class UserIDsMapper extends Mapper { - + + private static final Pattern DELIMITER = Pattern.compile("[\t,]"); + @Override protected void map(LongWritable key, Text value, Context context) throws IOException, InterruptedException { - String line = value.toString(); - int comma = line.indexOf(','); - long userID = comma >= 0 ? Long.parseLong(line.substring(0, comma)) : Long.parseLong(line); + String[] tokens = DELIMITER.split(value.toString()); + long userID = Long.parseLong(tokens[0]); context.write(new VarLongWritable(userID), NullWritable.get()); } - + } \ No newline at end of file