git commit: [SPARK-4254] [mllib] MovieLensALS bug fix

2014-11-05 Thread meng 
Repository: spark
Updated Branches:
  refs/heads/master cb0eae3b7 -> c315d1316


[SPARK-4254] [mllib] MovieLensALS bug fix

Changed code so it does not try to serialize Params.
CC: mengxr  debasish83 srowen

Author: Joseph K. Bradley 

Closes #3116 from jkbradley/als-bugfix and squashes the following commits:

e575bd8 [Joseph K. Bradley] Merge remote-tracking branch 'upstream/master' into 
als-bugfix
9401b16 [Joseph K. Bradley] changed implicitPrefs so it is not serialized to 
fix MovieLensALS example bug


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c315d131
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c315d131
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c315d131

Branch: refs/heads/master
Commit: c315d1316cb2372e90ae3a12f72d5b3304435a6b
Parents: cb0eae3
Author: Joseph K. Bradley 
Authored: Wed Nov 5 19:51:18 2014 -0800
Committer: Xiangrui Meng 
Committed: Wed Nov 5 19:51:18 2014 -0800

--
 .../scala/org/apache/spark/examples/mllib/MovieLensALS.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/c315d131/examples/src/main/scala/org/apache/spark/examples/mllib/MovieLensALS.scala
--
diff --git 
a/examples/src/main/scala/org/apache/spark/examples/mllib/MovieLensALS.scala 
b/examples/src/main/scala/org/apache/spark/examples/mllib/MovieLensALS.scala
index 8796c28..91a0a86 100644
--- a/examples/src/main/scala/org/apache/spark/examples/mllib/MovieLensALS.scala
+++ b/examples/src/main/scala/org/apache/spark/examples/mllib/MovieLensALS.scala
@@ -106,9 +106,11 @@ object MovieLensALS {
 
 Logger.getRootLogger.setLevel(Level.WARN)
 
+val implicitPrefs = params.implicitPrefs
+
 val ratings = sc.textFile(params.input).map { line =>
   val fields = line.split("::")
-  if (params.implicitPrefs) {
+  if (implicitPrefs) {
 /*
  * MovieLens ratings are on a scale of 1-5:
  * 5: Must see


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

git commit: [SPARK-4254] [mllib] MovieLensALS bug fix

2014-11-05 Thread meng 
Repository: spark
Updated Branches:
  refs/heads/branch-1.2 9ac5c517b -> ff84a8ae2


[SPARK-4254] [mllib] MovieLensALS bug fix

Changed code so it does not try to serialize Params.
CC: mengxr  debasish83 srowen

Author: Joseph K. Bradley 

Closes #3116 from jkbradley/als-bugfix and squashes the following commits:

e575bd8 [Joseph K. Bradley] Merge remote-tracking branch 'upstream/master' into 
als-bugfix
9401b16 [Joseph K. Bradley] changed implicitPrefs so it is not serialized to 
fix MovieLensALS example bug

(cherry picked from commit c315d1316cb2372e90ae3a12f72d5b3304435a6b)
Signed-off-by: Xiangrui Meng 


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ff84a8ae
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ff84a8ae
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ff84a8ae

Branch: refs/heads/branch-1.2
Commit: ff84a8ae258083423529885d85bf1d939a62d899
Parents: 9ac5c51
Author: Joseph K. Bradley 
Authored: Wed Nov 5 19:51:18 2014 -0800
Committer: Xiangrui Meng 
Committed: Wed Nov 5 19:51:26 2014 -0800

--
 .../scala/org/apache/spark/examples/mllib/MovieLensALS.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/ff84a8ae/examples/src/main/scala/org/apache/spark/examples/mllib/MovieLensALS.scala
--
diff --git 
a/examples/src/main/scala/org/apache/spark/examples/mllib/MovieLensALS.scala 
b/examples/src/main/scala/org/apache/spark/examples/mllib/MovieLensALS.scala
index 8796c28..91a0a86 100644
--- a/examples/src/main/scala/org/apache/spark/examples/mllib/MovieLensALS.scala
+++ b/examples/src/main/scala/org/apache/spark/examples/mllib/MovieLensALS.scala
@@ -106,9 +106,11 @@ object MovieLensALS {
 
 Logger.getRootLogger.setLevel(Level.WARN)
 
+val implicitPrefs = params.implicitPrefs
+
 val ratings = sc.textFile(params.input).map { line =>
   val fields = line.split("::")
-  if (params.implicitPrefs) {
+  if (implicitPrefs) {
 /*
  * MovieLens ratings are on a scale of 1-5:
  * 5: Must see


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org