You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by do...@apache.org on 2017/05/03 22:36:11 UTC
[6/7] incubator-predictionio-template-recommender git commit:
0.11.0-incubating release
0.11.0-incubating release
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/commit/7a96540a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/tree/7a96540a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/diff/7a96540a
Branch: refs/heads/master
Commit: 7a96540ad0087d9796a32770dc5a45805ddd810e
Parents: cbb9d4f
Author: Donald Szeto <ds...@salesforce.com>
Authored: Wed May 3 15:35:05 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Wed May 3 15:35:05 2017 -0700
----------------------------------------------------------------------
README.md | 10 +++++++++-
build.sbt | 2 --
engine.json | 2 +-
src/main/scala/ALSAlgorithm.scala | 2 +-
src/main/scala/ALSModel.scala | 2 +-
src/main/scala/DataSource.scala | 2 +-
src/main/scala/Engine.scala | 2 +-
src/main/scala/Evaluation.scala | 6 +++---
src/main/scala/Preparator.scala | 2 +-
src/main/scala/Serving.scala | 2 +-
10 files changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/7a96540a/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index d5814c3..f824876 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,18 @@
## Documentation
-Please refer to http://docs.prediction.io/templates/recommendation/quickstart/
+Please refer to
+http://predictionio.incubator.apache.org/templates/recommendation/quickstart/.
## Versions
+### v0.11.0-incubating
+
+- Bump version number to track PredictionIO version
+- Rename Scala package name
+- Update SBT version
+- Fix typo
+
### v0.4.0
- Compatible with Apache PredictionIO 0.10.0-incubating
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/7a96540a/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 9892291..a7cb20c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,5 @@
name := "template-scala-parallel-recommendation"
-organization := "org.apache.predictionio"
-
libraryDependencies ++= Seq(
"org.apache.predictionio" %% "apache-predictionio-core" % "0.11.0-incubating" % "provided",
"org.apache.spark" %% "spark-core" % "1.3.0" % "provided",
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/7a96540a/engine.json
----------------------------------------------------------------------
diff --git a/engine.json b/engine.json
index e10424e..258b3d1 100644
--- a/engine.json
+++ b/engine.json
@@ -1,7 +1,7 @@
{
"id": "default",
"description": "Default settings",
- "engineFactory": "org.template.recommendation.RecommendationEngine",
+ "engineFactory": "org.example.recommendation.RecommendationEngine",
"datasource": {
"params" : {
"appName": "INVALID_APP_NAME"
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/7a96540a/src/main/scala/ALSAlgorithm.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/ALSAlgorithm.scala b/src/main/scala/ALSAlgorithm.scala
index 81bd6c8..b53a9af 100644
--- a/src/main/scala/ALSAlgorithm.scala
+++ b/src/main/scala/ALSAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.template.recommendation
+package org.example.recommendation
import org.apache.predictionio.controller.PAlgorithm
import org.apache.predictionio.controller.Params
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/7a96540a/src/main/scala/ALSModel.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/ALSModel.scala b/src/main/scala/ALSModel.scala
index 243c1d1..afec745 100644
--- a/src/main/scala/ALSModel.scala
+++ b/src/main/scala/ALSModel.scala
@@ -3,7 +3,7 @@ package org.apache.spark.mllib.recommendation
// MatrixFactorizationModel's constructor is private and we are using
// its constructor in order to save and load the model
-import org.template.recommendation.ALSAlgorithmParams
+import org.example.recommendation.ALSAlgorithmParams
import org.apache.predictionio.controller.IPersistentModel
import org.apache.predictionio.controller.IPersistentModelLoader
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/7a96540a/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/DataSource.scala b/src/main/scala/DataSource.scala
index eea3ae6..7f7b4a1 100644
--- a/src/main/scala/DataSource.scala
+++ b/src/main/scala/DataSource.scala
@@ -1,4 +1,4 @@
-package org.template.recommendation
+package org.example.recommendation
import org.apache.predictionio.controller.PDataSource
import org.apache.predictionio.controller.EmptyEvaluationInfo
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/7a96540a/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Engine.scala b/src/main/scala/Engine.scala
index 79840dc..20a5521 100644
--- a/src/main/scala/Engine.scala
+++ b/src/main/scala/Engine.scala
@@ -1,4 +1,4 @@
-package org.template.recommendation
+package org.example.recommendation
import org.apache.predictionio.controller.IEngineFactory
import org.apache.predictionio.controller.Engine
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/7a96540a/src/main/scala/Evaluation.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Evaluation.scala b/src/main/scala/Evaluation.scala
index 34e5689..e0eebe1 100644
--- a/src/main/scala/Evaluation.scala
+++ b/src/main/scala/Evaluation.scala
@@ -1,4 +1,4 @@
-package org.template.recommendation
+package org.example.recommendation
import org.apache.predictionio.controller.Evaluation
import org.apache.predictionio.controller.OptionAverageMetric
@@ -9,8 +9,8 @@ import org.apache.predictionio.controller.EngineParams
import org.apache.predictionio.controller.MetricEvaluator
// Usage:
-// $ pio eval org.template.recommendation.RecommendationEvaluation \
-// org.template.recommendation.EngineParamsList
+// $ pio eval org.example.recommendation.RecommendationEvaluation \
+// org.example.recommendation.EngineParamsList
case class PrecisionAtK(k: Int, ratingThreshold: Double = 2.0)
extends OptionAverageMetric[EmptyEvaluationInfo, Query, PredictedResult, ActualResult] {
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/7a96540a/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Preparator.scala b/src/main/scala/Preparator.scala
index 8f2f7e4..0e20c62 100644
--- a/src/main/scala/Preparator.scala
+++ b/src/main/scala/Preparator.scala
@@ -1,4 +1,4 @@
-package org.template.recommendation
+package org.example.recommendation
import org.apache.predictionio.controller.PPreparator
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/7a96540a/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Serving.scala b/src/main/scala/Serving.scala
index 38ba8b9..6ba725f 100644
--- a/src/main/scala/Serving.scala
+++ b/src/main/scala/Serving.scala
@@ -1,4 +1,4 @@
-package org.template.recommendation
+package org.example.recommendation
import org.apache.predictionio.controller.LServing