diff options
author | Wang Jianping J <jianping.j.wang@gmail.com> | 2013-12-22 18:20:49 +0800 |
---|---|---|
committer | Wang Jianping J <jianping.j.wang@gmail.com> | 2013-12-22 18:20:49 +0800 |
commit | e64a794a4417f614e1b74180a123f5f913a6db53 (patch) | |
tree | dc0a5df9a757b10c6b11b23771959bf4dc7f8e41 | |
parent | b4bce88a2d881d6514b6beb37e83c31afc01e53f (diff) | |
download | spark-e64a794a4417f614e1b74180a123f5f913a6db53.tar.gz spark-e64a794a4417f614e1b74180a123f5f913a6db53.tar.bz2 spark-e64a794a4417f614e1b74180a123f5f913a6db53.zip |
Update Svdpp.scala
-rw-r--r-- | graph/src/main/scala/org/apache/spark/graph/algorithms/Svdpp.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/graph/src/main/scala/org/apache/spark/graph/algorithms/Svdpp.scala b/graph/src/main/scala/org/apache/spark/graph/algorithms/Svdpp.scala index 74096eb80d..26b999f4cf 100644 --- a/graph/src/main/scala/org/apache/spark/graph/algorithms/Svdpp.scala +++ b/graph/src/main/scala/org/apache/spark/graph/algorithms/Svdpp.scala @@ -1,6 +1,5 @@ package org.apache.spark.graph.algorithms -import org.apache.spark._ import org.apache.spark.rdd._ import org.apache.spark.graph._ import scala.util.Random @@ -53,7 +52,7 @@ object Svdpp { vd } - // calculate initial norm and bias + // calculate initial bias and norm def mapF0(et: EdgeTriplet[VT, Double]): Iterator[(Vid, (Long, Double))] = { assert(et.srcAttr != null && et.dstAttr != null) Iterator((et.srcId, (1L, et.attr)), (et.dstId, (1L, et.attr))) @@ -76,7 +75,7 @@ object Svdpp { // make graph var g = Graph.fromEdges(edges, defaultF(rank)).cache() - // calculate initial norm and bias + // calculate initial bias and norm val t0 = g.mapReduceTriplets(mapF0, reduceF0) g.outerJoinVertices(t0) {updateF0} @@ -107,8 +106,9 @@ object Svdpp { val updateP = (q.mapMultiply(err)).subtract(p.mapMultiply(gamma7)) val updateQ = (usr.v2.mapMultiply(err)).subtract(q.mapMultiply(gamma7)) val updateY = (q.mapMultiply(err*usr.norm)).subtract((itm.v2).mapMultiply(gamma7)) - Iterator((et.srcId, new Msg(updateP, updateY, err - gamma6*usr.bias)), (et.dstId, new Msg(updateQ, updateY, err - gamma6*itm.bias))) - } + Iterator((et.srcId, new Msg(updateP, updateY, err - gamma6*usr.bias)), + (et.dstId, new Msg(updateQ, updateY, err - gamma6*itm.bias))) + } def reduceF2(g1: Msg, g2: Msg):Msg = { g1.v1 = g1.v1.add(g2.v1) g1.v2 = g1.v2.add(g2.v2) |