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:06 UTC
[1/7] incubator-predictionio-template-recommender git commit: Closes
#10
Repository: incubator-predictionio-template-recommender
Updated Branches:
refs/heads/master e835140f8 -> 808c2535e
Closes #10
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/c8e64d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/tree/c8e64d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/diff/c8e64d80
Branch: refs/heads/master
Commit: c8e64d804f8b116f1a5e3ae573d1e37fdfe19eaf
Parents: 8eb81bd
Author: Donald Szeto <ds...@salesforce.com>
Authored: Tue Nov 1 14:26:14 2016 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Tue Nov 1 14:26:14 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[7/7] incubator-predictionio-template-recommender git commit: Merge
branch 'develop'
Posted by do...@apache.org.
Merge branch 'develop'
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/808c2535
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/tree/808c2535
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/diff/808c2535
Branch: refs/heads/master
Commit: 808c2535ea0796ebb1a950d93e335e026dd3178c
Parents: e835140 7a96540
Author: Donald Szeto <ds...@salesforce.com>
Authored: Wed May 3 15:35:56 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Wed May 3 15:35:56 2017 -0700
----------------------------------------------------------------------
README.md | 10 +++++++++-
build.sbt | 8 +-------
data/import_eventserver.py | 6 +++---
data/send_query.py | 2 +-
engine.json | 2 +-
project/assembly.sbt | 2 +-
project/build.properties | 1 +
src/main/scala/ALSAlgorithm.scala | 4 ++--
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 +-
14 files changed, 27 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
[6/7] incubator-predictionio-template-recommender git commit:
0.11.0-incubating release
Posted by do...@apache.org.
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
[3/7] incubator-predictionio-template-recommender git commit: Fix
small typo
Posted by do...@apache.org.
Fix small typo
Closes #6
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/77afa841
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/tree/77afa841
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/diff/77afa841
Branch: refs/heads/master
Commit: 77afa84173256ddbd95329dddf9269850d1783fd
Parents: a4eb514
Author: Mike Coutermarsh <co...@gmail.com>
Authored: Wed May 3 10:40:08 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Wed May 3 10:40:08 2017 -0700
----------------------------------------------------------------------
src/main/scala/ALSAlgorithm.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/77afa841/src/main/scala/ALSAlgorithm.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/ALSAlgorithm.scala b/src/main/scala/ALSAlgorithm.scala
index 17c2806..81bd6c8 100644
--- a/src/main/scala/ALSAlgorithm.scala
+++ b/src/main/scala/ALSAlgorithm.scala
@@ -35,7 +35,7 @@ class ALSAlgorithm(val ap: ALSAlgorithmParams)
require(!data.ratings.take(1).isEmpty,
s"RDD[Rating] in PreparedData cannot be empty." +
" Please check if DataSource generates TrainingData" +
- " and Preprator generates PreparedData correctly.")
+ " and Preparator generates PreparedData correctly.")
// Convert user and item String IDs to Int index for MLlib
val userStringIntMap = BiMap.stringInt(data.ratings.map(_.user))
[5/7] incubator-predictionio-template-recommender git commit: Bump to
PIO 0.11.0-incubating and enhance sbt configuration
Posted by do...@apache.org.
Bump to PIO 0.11.0-incubating and enhance sbt configuration
Closes #15
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/cbb9d4ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/tree/cbb9d4ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/diff/cbb9d4ff
Branch: refs/heads/master
Commit: cbb9d4ff28311bd60aa819a4425f08441810e826
Parents: 1339f59
Author: Naoki Takezoe <ta...@gmail.com>
Authored: Wed May 3 11:06:47 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Wed May 3 11:06:47 2017 -0700
----------------------------------------------------------------------
build.sbt | 2 +-
project/assembly.sbt | 2 +-
project/build.properties | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/cbb9d4ff/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index cdfd27d..9892291 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,6 +3,6 @@ name := "template-scala-parallel-recommendation"
organization := "org.apache.predictionio"
libraryDependencies ++= Seq(
- "org.apache.predictionio" %% "apache-predictionio-core" % "0.10.0-incubating" % "provided",
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.11.0-incubating" % "provided",
"org.apache.spark" %% "spark-core" % "1.3.0" % "provided",
"org.apache.spark" %% "spark-mllib" % "1.3.0" % "provided")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/cbb9d4ff/project/assembly.sbt
----------------------------------------------------------------------
diff --git a/project/assembly.sbt b/project/assembly.sbt
index 74adde3..e17409e 100644
--- a/project/assembly.sbt
+++ b/project/assembly.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.13.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/cbb9d4ff/project/build.properties
----------------------------------------------------------------------
diff --git a/project/build.properties b/project/build.properties
new file mode 100644
index 0000000..64317fd
--- /dev/null
+++ b/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.13.15
[4/7] incubator-predictionio-template-recommender git commit: modify
print statement
Posted by do...@apache.org.
modify print statement
Closes #12
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/1339f59a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/tree/1339f59a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/diff/1339f59a
Branch: refs/heads/master
Commit: 1339f59aa159b43942fd7bed9d6b70adc5947628
Parents: 77afa84
Author: Shinsuke Sugaya <sh...@yahoo.co.jp>
Authored: Wed May 3 10:41:32 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Wed May 3 10:41:32 2017 -0700
----------------------------------------------------------------------
data/import_eventserver.py | 6 +++---
data/send_query.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/1339f59a/data/import_eventserver.py
----------------------------------------------------------------------
diff --git a/data/import_eventserver.py b/data/import_eventserver.py
index 0a1e109..2c92335 100644
--- a/data/import_eventserver.py
+++ b/data/import_eventserver.py
@@ -13,7 +13,7 @@ def import_events(client, file):
f = open(file, 'r')
random.seed(SEED)
count = 0
- print "Importing data..."
+ print("Importing data...")
for line in f:
data = line.rstrip('\r\n').split(RATE_ACTIONS_DELIMITER)
# For demonstration purpose, randomly mix in some buy events
@@ -36,7 +36,7 @@ def import_events(client, file):
)
count += 1
f.close()
- print "%s events are imported." % count
+ print("%s events are imported." % count)
if __name__ == '__main__':
parser = argparse.ArgumentParser(
@@ -46,7 +46,7 @@ if __name__ == '__main__':
parser.add_argument('--file', default="./data/sample_movielens_data.txt")
args = parser.parse_args()
- print args
+ print(args)
client = predictionio.EventClient(
access_key=args.access_key,
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/1339f59a/data/send_query.py
----------------------------------------------------------------------
diff --git a/data/send_query.py b/data/send_query.py
index 7eaf53e..3dafd6d 100644
--- a/data/send_query.py
+++ b/data/send_query.py
@@ -4,4 +4,4 @@ Send sample query to prediction engine
import predictionio
engine_client = predictionio.EngineClient(url="http://localhost:8000")
-print engine_client.send_query({"user": "1", "num": 4})
+print(engine_client.send_query({"user": "1", "num": 4}))
[2/7] incubator-predictionio-template-recommender git commit: Migrate
to sbt-assembly 13.0
Posted by do...@apache.org.
Migrate to sbt-assembly 13.0
Closes #4
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/a4eb514c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/tree/a4eb514c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/diff/a4eb514c
Branch: refs/heads/master
Commit: a4eb514c51ae91f387184f90676b259e8322ba55
Parents: c8e64d8
Author: Mehmet Ali Gozaydin <ku...@gmail.com>
Authored: Wed May 3 10:36:39 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Wed May 3 10:36:39 2017 -0700
----------------------------------------------------------------------
build.sbt | 4 ----
project/assembly.sbt | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/a4eb514c/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 20cccdb..cdfd27d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,3 @@
-import AssemblyKeys._
-
-assemblySettings
-
name := "template-scala-parallel-recommendation"
organization := "org.apache.predictionio"
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-recommender/blob/a4eb514c/project/assembly.sbt
----------------------------------------------------------------------
diff --git a/project/assembly.sbt b/project/assembly.sbt
index 54c3252..74adde3 100644
--- a/project/assembly.sbt
+++ b/project/assembly.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.13.0")