From 493d7357f429ede73dc3e59c1e21c31c215fd87e Mon Sep 17 00:00:00 2001 From: Peter Fontana Date: Fri, 22 Aug 2014 16:32:50 -0400 Subject: [PATCH 1/2] Fixed PageRank to add resetProb, not oldPR --- .../src/main/scala/org/apache/spark/graphx/lib/PageRank.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala index 614555a054dfb..039f9aee87dc0 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala @@ -139,7 +139,8 @@ object PageRank extends Logging { // version of Pregel def vertexProgram(id: VertexId, attr: (Double, Double), msgSum: Double): (Double, Double) = { val (oldPR, lastDelta) = attr - val newPR = oldPR + (1.0 - resetProb) * msgSum + # Equation: resetProb * (1-resetProb)*msgSum + val newPR = resetProb + (1.0 - resetProb) * msgSum (newPR, newPR - oldPR) } From 18eb2319beff5edd5d9914cb286e407ab1303daa Mon Sep 17 00:00:00 2001 From: Peter Fontana Date: Fri, 22 Aug 2014 16:36:42 -0400 Subject: [PATCH 2/2] Corrected PageRankFile --- .../src/main/scala/org/apache/spark/graphx/lib/PageRank.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala index 039f9aee87dc0..42c3125c46691 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala @@ -139,7 +139,7 @@ object PageRank extends Logging { // version of Pregel def vertexProgram(id: VertexId, attr: (Double, Double), msgSum: Double): (Double, Double) = { val (oldPR, lastDelta) = attr - # Equation: resetProb * (1-resetProb)*msgSum + // Equation: resetProb * (1-resetProb)*msgSum val newPR = resetProb + (1.0 - resetProb) * msgSum (newPR, newPR - oldPR) }