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 <[email protected]> Authored: Wed May 3 15:35:56 2017 -0700 Committer: Donald Szeto <[email protected]> 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(-) ----------------------------------------------------------------------
