Merge branch 'develop'
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/9a169a24 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/tree/9a169a24 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/diff/9a169a24 Branch: refs/heads/master Commit: 9a169a246540a6aff545db8b00fe7c2e69a73dad Parents: 8b5f69d 400b49c Author: Naoki Takezoe <[email protected]> Authored: Thu Oct 12 03:29:14 2017 +0900 Committer: Naoki Takezoe <[email protected]> Committed: Thu Oct 12 03:29:14 2017 +0900 ---------------------------------------------------------------------- LICENSE.txt | 202 +++++++++++++++++++++ README.md | 9 +- build.sbt | 9 +- data/import_eventserver.py | 14 +- data/send_query.py | 2 +- project/assembly.sbt | 2 +- project/build.properties | 2 +- src/main/scala/ALSAlgorithm.scala | 5 +- src/main/scala/CooccurrenceAlgorithm.scala | 2 +- src/main/scala/DataSource.scala | 2 - src/main/scala/Engine.scala | 10 +- src/main/scala/Preparator.scala | 1 - src/test/scala/CooccurenceAlgorithmTest.scala | 2 + 13 files changed, 234 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
