ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merging upstream changes

Browse source
This commit is contained in:
Joseph E. Gonzalez 2013-10-29 16:23:26 -07:00
parent 08c7b040d6 098768e0b9
commit d8c8256e52
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
graph/src/main/scala/org/apache/spark/graph/Analytics.scala
View file

@ -27,7 +27,7 @@ object Analytics extends Logging {
* for( iter <- 0 until numIter ) {
* swap(oldPR, PR)
* for( i <- 0 until n ) {
* PR[i] = alpha + (1 - \alpha) * inNbrs[i].map(j => oldPR[j] / outDeg[j]).sum
* PR[i] = alpha + (1 - alpha) * inNbrs[i].map(j => oldPR[j] / outDeg[j]).sum
* }
* }
* }}}
@ -199,18 +199,6 @@ object Analytics extends Logging {
sendMessage,
(a,b) => math.min(a,b)
)
/**
* Originally this was implemented using the GraphLab abstraction but with
* support for message computation along all edge directions the pregel
* abstraction is sufficient
*/
// GraphLab(ccGraph, gatherDirection = EdgeDirection.Both, scatterDirection = EdgeDirection.Both)(
// (me_id, edge) => edge.otherVertexAttr(me_id), // gather
// (a: Vid, b: Vid) => math.min(a, b), // merge
// (id, data, a: Option[Vid]) => math.min(data, a.getOrElse(Long.MaxValue)), // apply
// (me_id, edge) => (edge.vertexAttr(me_id) < edge.otherVertexAttr(me_id))
// )
} // end of connectedComponents

2
graph/src/main/scala/org/apache/spark/graph/Pregel.scala
View file

@ -8,7 +8,7 @@ import org.apache.spark.rdd.RDD
* message-passing API. However, unlike the original Pregel API the
* GraphX pregel API factors the sendMessage computation over edges,
* enables the message sending computation to read both vertex
* attributes, and finally contrains messages to the graph structure.
* attributes, and finally constrains messages to the graph structure.
* These changes allow for substantially more efficient distributed
* execution while also exposing greater flexibility for graph based
* computation.