Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2594910BF9 for ; Wed, 9 Oct 2013 06:46:10 +0000 (UTC) Received: (qmail 49898 invoked by uid 500); 9 Oct 2013 06:46:07 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 49676 invoked by uid 500); 9 Oct 2013 06:46:06 -0000 Mailing-List: contact commits-help@spark.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@spark.incubator.apache.org Delivered-To: mailing list commits@spark.incubator.apache.org Received: (qmail 49503 invoked by uid 99); 9 Oct 2013 06:46:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Oct 2013 06:46:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 09 Oct 2013 06:46:00 +0000 Received: (qmail 49236 invoked by uid 99); 9 Oct 2013 06:45:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Oct 2013 06:45:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EDE188B2C01; Wed, 9 Oct 2013 06:45:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: matei@apache.org To: commits@spark.incubator.apache.org Date: Wed, 09 Oct 2013 06:45:13 -0000 Message-Id: <7863dedff0044f199aef0f960001234a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/10] git commit: Style fix using 'if' rather than 'match' on boolean X-Virus-Checked: Checked by ClamAV on apache.org Style fix using 'if' rather than 'match' on boolean Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/c6ceaeae Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/c6ceaeae Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/c6ceaeae Branch: refs/heads/master Commit: c6ceaeae50c7b5d69bb9897af32f537bfbde152d Parents: 6a7836c Author: Nick Pentreath Authored: Fri Oct 4 13:52:53 2013 +0200 Committer: Nick Pentreath Committed: Fri Oct 4 13:52:53 2013 +0200 ---------------------------------------------------------------------- .../apache/spark/mllib/recommendation/ALS.scala | 27 ++++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c6ceaeae/mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala ---------------------------------------------------------------------- diff --git a/mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala b/mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala index 5935d27..36853ac 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala @@ -207,20 +207,19 @@ class ALS private (var numBlocks: Int, var rank: Int, var iterations: Int, var l * @return Option[YtY] - whose value is only used in the implicit preference model */ def computeYtY(factors: RDD[(Int, Array[Array[Double]])]) = { - implicitPrefs match { - case true => { - Option( - factors.flatMapValues{ case factorArray => - factorArray.map{ vector => - val x = new DoubleMatrix(vector) - x.mmul(x.transpose()) - } - }.reduceByKeyLocally((a, b) => a.addi(b)) - .values - .reduce((a, b) => a.addi(b)) - ) - } - case false => None + if (implicitPrefs) { + Option( + factors.flatMapValues{ case factorArray => + factorArray.map{ vector => + val x = new DoubleMatrix(vector) + x.mmul(x.transpose()) + } + }.reduceByKeyLocally((a, b) => a.addi(b)) + .values + .reduce((a, b) => a.addi(b)) + ) + } else { + None } }