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/8b5f69de Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/tree/8b5f69de Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-similar-product/diff/8b5f69de Branch: refs/heads/master Commit: 8b5f69dec918fcb066c32649258414a1a50250d8 Parents: d75189b 893fca5 Author: Donald Szeto <[email protected]> Authored: Wed May 3 17:18:08 2017 -0700 Committer: Donald Szeto <[email protected]> Committed: Wed May 3 17:18:08 2017 -0700 ---------------------------------------------------------------------- README.md | 6 ++++++ build.sbt | 8 +------- engine-cooccurrence.json | 2 +- engine.json | 2 +- project/assembly.sbt | 2 +- project/build.properties | 1 + src/main/scala/ALSAlgorithm.scala | 2 +- src/main/scala/CooccurrenceAlgorithm.scala | 2 +- src/main/scala/DataSource.scala | 2 +- src/main/scala/Engine.scala | 2 +- src/main/scala/Preparator.scala | 2 +- src/main/scala/Serving.scala | 2 +- src/test/scala/CooccurenceAlgorithmTest.scala | 2 +- src/test/scala/EngineTestSparkContext.scala | 2 +- 14 files changed, 19 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
