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/04 17:32:28 UTC
[1/4] incubator-predictionio-template-attribute-based-classifier git
commit: python3 support
Repository: incubator-predictionio-template-attribute-based-classifier
Updated Branches:
refs/heads/develop 58c5179ef -> 903f9eef4
python3 support
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/commit/cf1750dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/tree/cf1750dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/diff/cf1750dd
Branch: refs/heads/develop
Commit: cf1750dd7dbe54391f9cc0610faeb6d97e859c01
Parents: 58c5179
Author: Shinsuke Sugaya <sh...@yahoo.co.jp>
Authored: Wed Mar 15 18:52:19 2017 +0900
Committer: Shinsuke Sugaya <sh...@yahoo.co.jp>
Committed: Wed Mar 15 18:52:19 2017 +0900
----------------------------------------------------------------------
data/import_eventserver.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/cf1750dd/data/import_eventserver.py
----------------------------------------------------------------------
diff --git a/data/import_eventserver.py b/data/import_eventserver.py
index 7e808e3..679ce6d 100644
--- a/data/import_eventserver.py
+++ b/data/import_eventserver.py
@@ -8,7 +8,7 @@ import argparse
def import_events(client, file):
f = open(file, 'r')
count = 0
- print "Importing data..."
+ print("Importing data...")
for line in f:
data = line.rstrip('\r\n').split(",")
plan = data[0]
@@ -26,7 +26,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(
@@ -36,7 +36,7 @@ if __name__ == '__main__':
parser.add_argument('--file', default="./data/data.txt")
args = parser.parse_args()
- print args
+ print(args)
client = predictionio.EventClient(
access_key=args.access_key,
[4/4] incubator-predictionio-template-attribute-based-classifier 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-attribute-based-classifier/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/commit/903f9eef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/tree/903f9eef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/diff/903f9eef
Branch: refs/heads/develop
Commit: 903f9eef4179025fdb7168620bf440f7236588d0
Parents: a7e13de
Author: Donald Szeto <do...@apache.org>
Authored: Thu May 4 10:32:03 2017 -0700
Committer: Donald Szeto <do...@apache.org>
Committed: Thu May 4 10:32:03 2017 -0700
----------------------------------------------------------------------
README.md | 7 +++++++
build.sbt | 2 --
engine.json | 2 +-
src/main/scala/CompleteEvaluation.scala | 2 +-
src/main/scala/DataSource.scala | 2 +-
src/main/scala/Engine.scala | 2 +-
src/main/scala/Evaluation.scala | 2 +-
src/main/scala/NaiveBayesAlgorithm.scala | 2 +-
src/main/scala/PrecisionEvaluation.scala | 2 +-
src/main/scala/Preparator.scala | 2 +-
src/main/scala/Serving.scala | 2 +-
11 files changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/903f9eef/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 031c09f..d8bac33 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,13 @@ Please refer to http://predictionio.incubator.apache.org/templates/classificatio
## Versions
+### v0.11.0-incubating
+
+- Bump version number to track PredictionIO version
+- Rename Scala package name
+- Update SBT version
+- Add Python 3 support to scripts
+
### v0.4.0
Update for Apache PredictionIO 0.10.0-incubating
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/903f9eef/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 13544fd..560eb77 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,5 @@
name := "template-scala-parallel-classification"
-organization := "org.apache.predictionio"
-
libraryDependencies ++= Seq(
"org.apache.predictionio" %% "apache-predictionio-core" % "0.11.0-incubating" % "provided",
"org.apache.spark" %% "spark-core" % "1.3.1" % "provided",
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/903f9eef/engine.json
----------------------------------------------------------------------
diff --git a/engine.json b/engine.json
index 833c831..97d8d30 100644
--- a/engine.json
+++ b/engine.json
@@ -1,7 +1,7 @@
{
"id": "default",
"description": "Default settings",
- "engineFactory": "org.template.classification.ClassificationEngine",
+ "engineFactory": "org.example.classification.ClassificationEngine",
"datasource": {
"params": {
"appName": "INVALID_APP_NAME"
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/903f9eef/src/main/scala/CompleteEvaluation.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/CompleteEvaluation.scala b/src/main/scala/CompleteEvaluation.scala
index 3dd1d1d..68ea134 100644
--- a/src/main/scala/CompleteEvaluation.scala
+++ b/src/main/scala/CompleteEvaluation.scala
@@ -1,4 +1,4 @@
-package org.template.classification
+package org.example.classification
import org.apache.predictionio.controller.Evaluation
import org.apache.predictionio.controller.MetricEvaluator
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/903f9eef/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/DataSource.scala b/src/main/scala/DataSource.scala
index eb2e6e8..96d245e 100644
--- a/src/main/scala/DataSource.scala
+++ b/src/main/scala/DataSource.scala
@@ -1,4 +1,4 @@
-package org.template.classification
+package org.example.classification
import org.apache.predictionio.controller.PDataSource
import org.apache.predictionio.controller.EmptyEvaluationInfo
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/903f9eef/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Engine.scala b/src/main/scala/Engine.scala
index 885f56d..72c2515 100644
--- a/src/main/scala/Engine.scala
+++ b/src/main/scala/Engine.scala
@@ -1,4 +1,4 @@
-package org.template.classification
+package org.example.classification
import org.apache.predictionio.controller.EngineFactory
import org.apache.predictionio.controller.Engine
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/903f9eef/src/main/scala/Evaluation.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Evaluation.scala b/src/main/scala/Evaluation.scala
index 5f58cfa..9916f03 100644
--- a/src/main/scala/Evaluation.scala
+++ b/src/main/scala/Evaluation.scala
@@ -1,4 +1,4 @@
-package org.template.classification
+package org.example.classification
import org.apache.predictionio.controller.AverageMetric
import org.apache.predictionio.controller.EmptyEvaluationInfo
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/903f9eef/src/main/scala/NaiveBayesAlgorithm.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/NaiveBayesAlgorithm.scala b/src/main/scala/NaiveBayesAlgorithm.scala
index c40f31f..5723bc1 100644
--- a/src/main/scala/NaiveBayesAlgorithm.scala
+++ b/src/main/scala/NaiveBayesAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.template.classification
+package org.example.classification
import org.apache.predictionio.controller.P2LAlgorithm
import org.apache.predictionio.controller.Params
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/903f9eef/src/main/scala/PrecisionEvaluation.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/PrecisionEvaluation.scala b/src/main/scala/PrecisionEvaluation.scala
index 299c43f..71d391a 100644
--- a/src/main/scala/PrecisionEvaluation.scala
+++ b/src/main/scala/PrecisionEvaluation.scala
@@ -1,4 +1,4 @@
-package org.template.classification
+package org.example.classification
import org.apache.predictionio.controller.OptionAverageMetric
import org.apache.predictionio.controller.EmptyEvaluationInfo
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/903f9eef/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Preparator.scala b/src/main/scala/Preparator.scala
index 8a1e41d..880021a 100644
--- a/src/main/scala/Preparator.scala
+++ b/src/main/scala/Preparator.scala
@@ -1,4 +1,4 @@
-package org.template.classification
+package org.example.classification
import org.apache.predictionio.controller.PPreparator
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/903f9eef/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Serving.scala b/src/main/scala/Serving.scala
index 9722883..3ee6c83 100644
--- a/src/main/scala/Serving.scala
+++ b/src/main/scala/Serving.scala
@@ -1,4 +1,4 @@
-package org.template.classification
+package org.example.classification
import org.apache.predictionio.controller.LServing
[2/4] incubator-predictionio-template-attribute-based-classifier 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
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/commit/5623d085
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/tree/5623d085
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/diff/5623d085
Branch: refs/heads/develop
Commit: 5623d0857f7110f5526ecbcb60722f2dca7311a6
Parents: 58c5179
Author: Naoki Takezoe <ta...@gmail.com>
Authored: Wed May 3 21:51:28 2017 +0900
Committer: Naoki Takezoe <ta...@gmail.com>
Committed: Wed May 3 21:51:28 2017 +0900
----------------------------------------------------------------------
build.sbt | 6 +-----
project/assembly.sbt | 2 +-
project/build.properties | 1 +
3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/5623d085/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index d74e6bc..13544fd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,12 +1,8 @@
-import AssemblyKeys._
-
-assemblySettings
-
name := "template-scala-parallel-classification"
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.1" % "provided",
"org.apache.spark" %% "spark-mllib" % "1.3.1" % "provided")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/5623d085/project/assembly.sbt
----------------------------------------------------------------------
diff --git a/project/assembly.sbt b/project/assembly.sbt
index 54c3252..e17409e 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.14.4")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/blob/5623d085/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
[3/4] incubator-predictionio-template-attribute-based-classifier git
commit: Merge branch 'update-pio_0.11.0' of
https://github.com/takezoe/incubator-predictionio-template-attribute-based-classifier
into develop
Posted by do...@apache.org.
Merge branch 'update-pio_0.11.0' of https://github.com/takezoe/incubator-predictionio-template-attribute-based-classifier into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/commit/a7e13de6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/tree/a7e13de6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-attribute-based-classifier/diff/a7e13de6
Branch: refs/heads/develop
Commit: a7e13de6fa40602c8e587ce945768c144e62e83f
Parents: cf1750d 5623d08
Author: Donald Szeto <ds...@salesforce.com>
Authored: Thu May 4 09:08:40 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Thu May 4 09:08:40 2017 -0700
----------------------------------------------------------------------
build.sbt | 6 +-----
project/assembly.sbt | 2 +-
project/build.properties | 1 +
3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------