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 2016/11/01 21:57:25 UTC
[1/2] incubator-predictionio-template-similar-product git commit:
Update template for PIO v0.10.0-incubating
Repository: incubator-predictionio-template-similar-product
Updated Branches:
refs/heads/develop 143ba4d96 -> 9c240b546
Update template for PIO v0.10.0-incubating
Closes #12
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/commit/430487e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/tree/430487e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/diff/430487e2
Branch: refs/heads/develop
Commit: 430487e20c6e74711538486f6715ca2d587b7bb9
Parents: 143ba4d
Author: Chan Lee <ch...@gmail.com>
Authored: Tue Nov 1 14:56:54 2016 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Tue Nov 1 14:56:54 2016 -0700
----------------------------------------------------------------------
build.sbt | 10 +++++-----
project/pio-build.sbt | 1 -
src/main/scala/ALSAlgorithm.scala | 6 +++---
src/main/scala/CooccurrenceAlgorithm.scala | 6 +++---
src/main/scala/DataSource.scala | 12 ++++++------
src/main/scala/Engine.scala | 4 ++--
src/main/scala/Preparator.scala | 2 +-
src/main/scala/Serving.scala | 2 +-
src/test/scala/CooccurenceAlgorithmTest.scala | 2 +-
template.json | 2 +-
10 files changed, 23 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/430487e2/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 3260f8e..e47aee3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,14 +4,14 @@ assemblySettings
name := "template-scala-parallel-similarproduct"
-organization := "io.prediction"
+organization := "org.apache.predictionio"
parallelExecution in Test := false
test in assembly := {}
libraryDependencies ++= Seq(
- "io.prediction" %% "core" % pioVersion.value % "provided",
- "org.apache.spark" %% "spark-core" % "1.3.0" % "provided",
- "org.apache.spark" %% "spark-mllib" % "1.3.0" % "provided",
- "org.scalatest" %% "scalatest" % "2.2.1" % "test")
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.10.0-incubating" % "provided",
+ "org.apache.spark" %% "spark-core" % "1.3.0" % "provided",
+ "org.apache.spark" %% "spark-mllib" % "1.3.0" % "provided",
+ "org.scalatest" %% "scalatest" % "2.2.1" % "test")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/430487e2/project/pio-build.sbt
----------------------------------------------------------------------
diff --git a/project/pio-build.sbt b/project/pio-build.sbt
deleted file mode 100644
index 8346a96..0000000
--- a/project/pio-build.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("io.prediction" % "pio-build" % "0.9.0")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/430487e2/src/main/scala/ALSAlgorithm.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/ALSAlgorithm.scala b/src/main/scala/ALSAlgorithm.scala
index 62f87a3..2b6a3bb 100644
--- a/src/main/scala/ALSAlgorithm.scala
+++ b/src/main/scala/ALSAlgorithm.scala
@@ -1,8 +1,8 @@
package org.template.similarproduct
-import io.prediction.controller.P2LAlgorithm
-import io.prediction.controller.Params
-import io.prediction.data.storage.BiMap
+import org.apache.predictionio.controller.P2LAlgorithm
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.BiMap
import org.apache.spark.SparkContext
import org.apache.spark.SparkContext._
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/430487e2/src/main/scala/CooccurrenceAlgorithm.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/CooccurrenceAlgorithm.scala b/src/main/scala/CooccurrenceAlgorithm.scala
index 3834ead..dbac702 100644
--- a/src/main/scala/CooccurrenceAlgorithm.scala
+++ b/src/main/scala/CooccurrenceAlgorithm.scala
@@ -1,8 +1,8 @@
package org.template.similarproduct
-import io.prediction.controller.P2LAlgorithm
-import io.prediction.controller.Params
-import io.prediction.data.storage.BiMap
+import org.apache.predictionio.controller.P2LAlgorithm
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.BiMap
import org.apache.spark.SparkContext
import org.apache.spark.rdd.RDD
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/430487e2/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/DataSource.scala b/src/main/scala/DataSource.scala
index b302d1a..f4c7221 100644
--- a/src/main/scala/DataSource.scala
+++ b/src/main/scala/DataSource.scala
@@ -1,11 +1,11 @@
package org.template.similarproduct
-import io.prediction.controller.PDataSource
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.EmptyActualResult
-import io.prediction.controller.Params
-import io.prediction.data.storage.Event
-import io.prediction.data.store.PEventStore
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.EmptyActualResult
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.store.PEventStore
import org.apache.spark.SparkContext
import org.apache.spark.SparkContext._
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/430487e2/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Engine.scala b/src/main/scala/Engine.scala
index 034935a..c7a6a21 100644
--- a/src/main/scala/Engine.scala
+++ b/src/main/scala/Engine.scala
@@ -1,7 +1,7 @@
package org.template.similarproduct
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
case class Query(
items: List[String],
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/430487e2/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Preparator.scala b/src/main/scala/Preparator.scala
index c5e42ec..6b84b01 100644
--- a/src/main/scala/Preparator.scala
+++ b/src/main/scala/Preparator.scala
@@ -1,6 +1,6 @@
package org.template.similarproduct
-import io.prediction.controller.PPreparator
+import org.apache.predictionio.controller.PPreparator
import org.apache.spark.SparkContext
import org.apache.spark.SparkContext._
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/430487e2/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Serving.scala b/src/main/scala/Serving.scala
index 7a7f124..8543796 100644
--- a/src/main/scala/Serving.scala
+++ b/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
package org.template.similarproduct
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
class Serving
extends LServing[Query, PredictedResult] {
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/430487e2/src/test/scala/CooccurenceAlgorithmTest.scala
----------------------------------------------------------------------
diff --git a/src/test/scala/CooccurenceAlgorithmTest.scala b/src/test/scala/CooccurenceAlgorithmTest.scala
index 8a8e0b4..29ac40e 100644
--- a/src/test/scala/CooccurenceAlgorithmTest.scala
+++ b/src/test/scala/CooccurenceAlgorithmTest.scala
@@ -1,6 +1,6 @@
package org.template.similarproduct
-import io.prediction.data.storage.BiMap
+import org.apache.predictionio.data.storage.BiMap
import org.scalatest.FlatSpec
import org.scalatest.Matchers
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/430487e2/template.json
----------------------------------------------------------------------
diff --git a/template.json b/template.json
index fb4a50b..d076ec5 100644
--- a/template.json
+++ b/template.json
@@ -1 +1 @@
-{"pio": {"version": { "min": "0.9.2" }}}
+{"pio": {"version": { "min": "0.10.0-incubating" }}}
[2/2] incubator-predictionio-template-similar-product git commit:
v0.4.0 release
Posted by do...@apache.org.
v0.4.0 release
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/commit/9c240b54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/tree/9c240b54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/diff/9c240b54
Branch: refs/heads/develop
Commit: 9c240b54672200ee6924e2e220a0be8d74952daf
Parents: 430487e
Author: Donald Szeto <ds...@salesforce.com>
Authored: Tue Nov 1 14:57:11 2016 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Tue Nov 1 14:57:11 2016 -0700
----------------------------------------------------------------------
README.md | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/blob/9c240b54/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 766cae6..f874bd5 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,14 @@
## Documentation
-Please refer to http://docs.prediction.io/templates/similarproduct/quickstart/
+Please refer to http://predictionio.incubator.apache.org/templates/similarproduct/quickstart/
## Versions
+### v0.4.0
+
+Update for Apache PredictionIO 0.10.0-incubating
+
### v0.3.2
- Fix CooccurrenceAlgorithm with unknown item ids