Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EA7C1200CC3 for ; Sat, 15 Jul 2017 18:55:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E70CA168503; Sat, 15 Jul 2017 16:55:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (unknown [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DEC66168501 for ; Sat, 15 Jul 2017 18:55:54 +0200 (CEST) Received: (qmail 88382 invoked by uid 500); 15 Jul 2017 16:55:54 -0000 Mailing-List: contact commits-help@predictionio.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@predictionio.incubator.apache.org Delivered-To: mailing list commits@predictionio.incubator.apache.org Received: (qmail 88373 invoked by uid 99); 15 Jul 2017 16:55:54 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Jul 2017 16:55:54 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 9B0CA18070F for ; Sat, 15 Jul 2017 16:55:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.221 X-Spam-Level: X-Spam-Status: No, score=-1.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RDNS_NONE=3, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 3l7xD5ELOQhA for ; Sat, 15 Jul 2017 16:55:50 +0000 (UTC) Received: from mail.apache.org (unknown [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 18D6A5FB62 for ; Sat, 15 Jul 2017 16:55:48 +0000 (UTC) Received: (qmail 88356 invoked by uid 99); 15 Jul 2017 16:55:48 -0000 Received: from Unknown (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Jul 2017 16:55:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 94377F3243; Sat, 15 Jul 2017 16:55:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: takezoe@apache.org To: commits@predictionio.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-predictionio git commit: Fix use of case class in recommender examples Date: Sat, 15 Jul 2017 16:55:47 +0000 (UTC) archived-at: Sat, 15 Jul 2017 16:55:56 -0000 Repository: incubator-predictionio Updated Branches: refs/heads/develop 0fc9f7f65 -> 4e2abe5c5 Fix use of case class in recommender examples Closes #408 Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/4e2abe5c Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/4e2abe5c Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/4e2abe5c Branch: refs/heads/develop Commit: 4e2abe5c5bebf8992a89935674131b4dfd11619d Parents: 0fc9f7f Author: Naoki Takezoe Authored: Sun Jul 16 01:54:29 2017 +0900 Committer: Naoki Takezoe Committed: Sun Jul 16 01:54:29 2017 +0900 ---------------------------------------------------------------------- .../blacklist-items/src/main/scala/ALSAlgorithm.scala | 4 ++-- .../blacklist-items/src/main/scala/Engine.scala | 8 ++++---- .../customize-data-prep/src/main/scala/ALSAlgorithm.scala | 4 ++-- .../customize-data-prep/src/main/scala/Engine.scala | 8 ++++---- .../customize-serving/src/main/scala/ALSAlgorithm.scala | 4 ++-- .../customize-serving/src/main/scala/Engine.scala | 8 ++++---- .../reading-custom-events/src/main/scala/ALSAlgorithm.scala | 4 ++-- .../reading-custom-events/src/main/scala/Engine.scala | 8 ++++---- .../train-with-view-event/src/main/scala/ALSAlgorithm.scala | 4 ++-- .../train-with-view-event/src/main/scala/Engine.scala | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/4e2abe5c/examples/scala-parallel-recommendation/blacklist-items/src/main/scala/ALSAlgorithm.scala ---------------------------------------------------------------------- diff --git a/examples/scala-parallel-recommendation/blacklist-items/src/main/scala/ALSAlgorithm.scala b/examples/scala-parallel-recommendation/blacklist-items/src/main/scala/ALSAlgorithm.scala index f613f66..d500d67 100644 --- a/examples/scala-parallel-recommendation/blacklist-items/src/main/scala/ALSAlgorithm.scala +++ b/examples/scala-parallel-recommendation/blacklist-items/src/main/scala/ALSAlgorithm.scala @@ -103,10 +103,10 @@ class ALSAlgorithm(val ap: ALSAlgorithmParams) val itemScores = model .recommendProductsWithFilter(userInt, query.num, blackList) // MODIFIED .map (r => ItemScore(itemIntStringMap(r.product), r.rating)) - new PredictedResult(itemScores) + PredictedResult(itemScores) }.getOrElse{ logger.info(s"No prediction for unknown user ${query.user}.") - new PredictedResult(Array.empty) + PredictedResult(Array.empty) } } http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/4e2abe5c/examples/scala-parallel-recommendation/blacklist-items/src/main/scala/Engine.scala ---------------------------------------------------------------------- diff --git a/examples/scala-parallel-recommendation/blacklist-items/src/main/scala/Engine.scala b/examples/scala-parallel-recommendation/blacklist-items/src/main/scala/Engine.scala index db8351a..4856647 100644 --- a/examples/scala-parallel-recommendation/blacklist-items/src/main/scala/Engine.scala +++ b/examples/scala-parallel-recommendation/blacklist-items/src/main/scala/Engine.scala @@ -24,20 +24,20 @@ case class Query( user: String, num: Int, blackList: Set[String] // ADDED -) extends Serializable +) case class PredictedResult( itemScores: Array[ItemScore] -) extends Serializable +) case class ActualResult( ratings: Array[Rating] -) extends Serializable +) case class ItemScore( item: String, score: Double -) extends Serializable +) object RecommendationEngine extends EngineFactory { def apply() = { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/4e2abe5c/examples/scala-parallel-recommendation/customize-data-prep/src/main/scala/ALSAlgorithm.scala ---------------------------------------------------------------------- diff --git a/examples/scala-parallel-recommendation/customize-data-prep/src/main/scala/ALSAlgorithm.scala b/examples/scala-parallel-recommendation/customize-data-prep/src/main/scala/ALSAlgorithm.scala index b0f874d..65f2f15 100644 --- a/examples/scala-parallel-recommendation/customize-data-prep/src/main/scala/ALSAlgorithm.scala +++ b/examples/scala-parallel-recommendation/customize-data-prep/src/main/scala/ALSAlgorithm.scala @@ -101,10 +101,10 @@ class ALSAlgorithm(val ap: ALSAlgorithmParams) // index. Convert it to String ID for returning PredictedResult val itemScores = model.recommendProducts(userInt, query.num) .map (r => ItemScore(itemIntStringMap(r.product), r.rating)) - new PredictedResult(itemScores) + PredictedResult(itemScores) }.getOrElse{ logger.info(s"No prediction for unknown user ${query.user}.") - new PredictedResult(Array.empty) + PredictedResult(Array.empty) } } http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/4e2abe5c/examples/scala-parallel-recommendation/customize-data-prep/src/main/scala/Engine.scala ---------------------------------------------------------------------- diff --git a/examples/scala-parallel-recommendation/customize-data-prep/src/main/scala/Engine.scala b/examples/scala-parallel-recommendation/customize-data-prep/src/main/scala/Engine.scala index b2a668b..65ef516 100644 --- a/examples/scala-parallel-recommendation/customize-data-prep/src/main/scala/Engine.scala +++ b/examples/scala-parallel-recommendation/customize-data-prep/src/main/scala/Engine.scala @@ -23,20 +23,20 @@ import org.apache.predictionio.controller.Engine case class Query( user: String, num: Int -) extends Serializable +) case class PredictedResult( itemScores: Array[ItemScore] -) extends Serializable +) case class ActualResult( ratings: Array[Rating] -) extends Serializable +) case class ItemScore( item: String, score: Double -) extends Serializable +) object RecommendationEngine extends EngineFactory { def apply() = { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/4e2abe5c/examples/scala-parallel-recommendation/customize-serving/src/main/scala/ALSAlgorithm.scala ---------------------------------------------------------------------- diff --git a/examples/scala-parallel-recommendation/customize-serving/src/main/scala/ALSAlgorithm.scala b/examples/scala-parallel-recommendation/customize-serving/src/main/scala/ALSAlgorithm.scala index b0f874d..65f2f15 100644 --- a/examples/scala-parallel-recommendation/customize-serving/src/main/scala/ALSAlgorithm.scala +++ b/examples/scala-parallel-recommendation/customize-serving/src/main/scala/ALSAlgorithm.scala @@ -101,10 +101,10 @@ class ALSAlgorithm(val ap: ALSAlgorithmParams) // index. Convert it to String ID for returning PredictedResult val itemScores = model.recommendProducts(userInt, query.num) .map (r => ItemScore(itemIntStringMap(r.product), r.rating)) - new PredictedResult(itemScores) + PredictedResult(itemScores) }.getOrElse{ logger.info(s"No prediction for unknown user ${query.user}.") - new PredictedResult(Array.empty) + PredictedResult(Array.empty) } } http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/4e2abe5c/examples/scala-parallel-recommendation/customize-serving/src/main/scala/Engine.scala ---------------------------------------------------------------------- diff --git a/examples/scala-parallel-recommendation/customize-serving/src/main/scala/Engine.scala b/examples/scala-parallel-recommendation/customize-serving/src/main/scala/Engine.scala index b2a668b..65ef516 100644 --- a/examples/scala-parallel-recommendation/customize-serving/src/main/scala/Engine.scala +++ b/examples/scala-parallel-recommendation/customize-serving/src/main/scala/Engine.scala @@ -23,20 +23,20 @@ import org.apache.predictionio.controller.Engine case class Query( user: String, num: Int -) extends Serializable +) case class PredictedResult( itemScores: Array[ItemScore] -) extends Serializable +) case class ActualResult( ratings: Array[Rating] -) extends Serializable +) case class ItemScore( item: String, score: Double -) extends Serializable +) object RecommendationEngine extends EngineFactory { def apply() = { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/4e2abe5c/examples/scala-parallel-recommendation/reading-custom-events/src/main/scala/ALSAlgorithm.scala ---------------------------------------------------------------------- diff --git a/examples/scala-parallel-recommendation/reading-custom-events/src/main/scala/ALSAlgorithm.scala b/examples/scala-parallel-recommendation/reading-custom-events/src/main/scala/ALSAlgorithm.scala index b0f874d..65f2f15 100644 --- a/examples/scala-parallel-recommendation/reading-custom-events/src/main/scala/ALSAlgorithm.scala +++ b/examples/scala-parallel-recommendation/reading-custom-events/src/main/scala/ALSAlgorithm.scala @@ -101,10 +101,10 @@ class ALSAlgorithm(val ap: ALSAlgorithmParams) // index. Convert it to String ID for returning PredictedResult val itemScores = model.recommendProducts(userInt, query.num) .map (r => ItemScore(itemIntStringMap(r.product), r.rating)) - new PredictedResult(itemScores) + PredictedResult(itemScores) }.getOrElse{ logger.info(s"No prediction for unknown user ${query.user}.") - new PredictedResult(Array.empty) + PredictedResult(Array.empty) } } http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/4e2abe5c/examples/scala-parallel-recommendation/reading-custom-events/src/main/scala/Engine.scala ---------------------------------------------------------------------- diff --git a/examples/scala-parallel-recommendation/reading-custom-events/src/main/scala/Engine.scala b/examples/scala-parallel-recommendation/reading-custom-events/src/main/scala/Engine.scala index b2a668b..65ef516 100644 --- a/examples/scala-parallel-recommendation/reading-custom-events/src/main/scala/Engine.scala +++ b/examples/scala-parallel-recommendation/reading-custom-events/src/main/scala/Engine.scala @@ -23,20 +23,20 @@ import org.apache.predictionio.controller.Engine case class Query( user: String, num: Int -) extends Serializable +) case class PredictedResult( itemScores: Array[ItemScore] -) extends Serializable +) case class ActualResult( ratings: Array[Rating] -) extends Serializable +) case class ItemScore( item: String, score: Double -) extends Serializable +) object RecommendationEngine extends EngineFactory { def apply() = { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/4e2abe5c/examples/scala-parallel-recommendation/train-with-view-event/src/main/scala/ALSAlgorithm.scala ---------------------------------------------------------------------- diff --git a/examples/scala-parallel-recommendation/train-with-view-event/src/main/scala/ALSAlgorithm.scala b/examples/scala-parallel-recommendation/train-with-view-event/src/main/scala/ALSAlgorithm.scala index 3aa1953..234aa0d 100644 --- a/examples/scala-parallel-recommendation/train-with-view-event/src/main/scala/ALSAlgorithm.scala +++ b/examples/scala-parallel-recommendation/train-with-view-event/src/main/scala/ALSAlgorithm.scala @@ -102,10 +102,10 @@ class ALSAlgorithm(val ap: ALSAlgorithmParams) // index. Convert it to String ID for returning PredictedResult val itemScores = model.recommendProducts(userInt, query.num) .map (r => ItemScore(itemIntStringMap(r.product), r.rating)) - new PredictedResult(itemScores) + PredictedResult(itemScores) }.getOrElse{ logger.info(s"No prediction for unknown user ${query.user}.") - new PredictedResult(Array.empty) + PredictedResult(Array.empty) } } http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/4e2abe5c/examples/scala-parallel-recommendation/train-with-view-event/src/main/scala/Engine.scala ---------------------------------------------------------------------- diff --git a/examples/scala-parallel-recommendation/train-with-view-event/src/main/scala/Engine.scala b/examples/scala-parallel-recommendation/train-with-view-event/src/main/scala/Engine.scala index b2a668b..65ef516 100644 --- a/examples/scala-parallel-recommendation/train-with-view-event/src/main/scala/Engine.scala +++ b/examples/scala-parallel-recommendation/train-with-view-event/src/main/scala/Engine.scala @@ -23,20 +23,20 @@ import org.apache.predictionio.controller.Engine case class Query( user: String, num: Int -) extends Serializable +) case class PredictedResult( itemScores: Array[ItemScore] -) extends Serializable +) case class ActualResult( ratings: Array[Rating] -) extends Serializable +) case class ItemScore( item: String, score: Double -) extends Serializable +) object RecommendationEngine extends EngineFactory { def apply() = {