spark git commit: [SPARK-5343][GraphX]: ShortestPaths traverses backwards
Repository: spark
Updated Branches:
refs/heads/branch-1.3 bba095399 - 5be8902f7
[SPARK-5343][GraphX]: ShortestPaths traverses backwards
Corrected the logic with ShortestPaths so that the calculation will run forward
rather than backwards. Output before looked like:
```scala
import org.apache.spark.graphx._
val g = Graph(sc.makeRDD(Array((1L,), (2L,), (3L,))),
sc.makeRDD(Array(Edge(1L,2L,), Edge(2L,3L,
lib.ShortestPaths.run(g,Array(3)).vertices.collect
// res0: Array[(org.apache.spark.graphx.VertexId,
org.apache.spark.graphx.lib.ShortestPaths.SPMap)] = Array((1,Map()), (3,Map(3
- 0)), (2,Map()))
lib.ShortestPaths.run(g,Array(1)).vertices.collect
// res1: Array[(org.apache.spark.graphx.VertexId,
org.apache.spark.graphx.lib.ShortestPaths.SPMap)] = Array((1,Map(1 - 0)),
(3,Map(1 - 2)), (2,Map(1 - 1)))
```
And new output after the changes looks like:
```scala
import org.apache.spark.graphx._
val g = Graph(sc.makeRDD(Array((1L,), (2L,), (3L,))),
sc.makeRDD(Array(Edge(1L,2L,), Edge(2L,3L,
lib.ShortestPaths.run(g,Array(3)).vertices.collect
// res0: Array[(org.apache.spark.graphx.VertexId,
org.apache.spark.graphx.lib.ShortestPaths.SPMap)] = Array((1,Map(3 - 2)),
(2,Map(3 - 1)), (3,Map(3 - 0)))
lib.ShortestPaths.run(g,Array(1)).vertices.collect
// res1: Array[(org.apache.spark.graphx.VertexId,
org.apache.spark.graphx.lib.ShortestPaths.SPMap)] = Array((1,Map(1 - 0)),
(2,Map()), (3,Map()))
```
Author: Brennon York brennon.y...@capitalone.com
Closes #4478 from brennonyork/SPARK-5343 and squashes the following commits:
aa57f83 [Brennon York] updated to set ShortestPaths to run 'forward' rather
than 'backward'
(cherry picked from commit 5820961289eb98e45eb467efa316c7592b8d619c)
Signed-off-by: Ankur Dave ankurd...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5be8902f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5be8902f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5be8902f
Branch: refs/heads/branch-1.3
Commit: 5be8902f7a7f6eafbe75a9b2cf9b0cc3e5bc6f2b
Parents: bba0953
Author: Brennon York brennon.y...@capitalone.com
Authored: Tue Feb 10 14:57:00 2015 -0800
Committer: Ankur Dave ankurd...@gmail.com
Committed: Tue Feb 10 14:57:18 2015 -0800
--
.../main/scala/org/apache/spark/graphx/lib/ShortestPaths.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/5be8902f/graphx/src/main/scala/org/apache/spark/graphx/lib/ShortestPaths.scala
--
diff --git
a/graphx/src/main/scala/org/apache/spark/graphx/lib/ShortestPaths.scala
b/graphx/src/main/scala/org/apache/spark/graphx/lib/ShortestPaths.scala
index 590f047..179f284 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/lib/ShortestPaths.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/ShortestPaths.scala
@@ -61,8 +61,8 @@ object ShortestPaths {
}
def sendMessage(edge: EdgeTriplet[SPMap, _]): Iterator[(VertexId, SPMap)]
= {
- val newAttr = incrementMap(edge.srcAttr)
- if (edge.dstAttr != addMaps(newAttr, edge.dstAttr))
Iterator((edge.dstId, newAttr))
+ val newAttr = incrementMap(edge.dstAttr)
+ if (edge.srcAttr != addMaps(newAttr, edge.srcAttr))
Iterator((edge.srcId, newAttr))
else Iterator.empty
}
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [SPARK-5343][GraphX]: ShortestPaths traverses backwards
Repository: spark
Updated Branches:
refs/heads/master fd2c032f9 - 582096128
[SPARK-5343][GraphX]: ShortestPaths traverses backwards
Corrected the logic with ShortestPaths so that the calculation will run forward
rather than backwards. Output before looked like:
```scala
import org.apache.spark.graphx._
val g = Graph(sc.makeRDD(Array((1L,), (2L,), (3L,))),
sc.makeRDD(Array(Edge(1L,2L,), Edge(2L,3L,
lib.ShortestPaths.run(g,Array(3)).vertices.collect
// res0: Array[(org.apache.spark.graphx.VertexId,
org.apache.spark.graphx.lib.ShortestPaths.SPMap)] = Array((1,Map()), (3,Map(3
- 0)), (2,Map()))
lib.ShortestPaths.run(g,Array(1)).vertices.collect
// res1: Array[(org.apache.spark.graphx.VertexId,
org.apache.spark.graphx.lib.ShortestPaths.SPMap)] = Array((1,Map(1 - 0)),
(3,Map(1 - 2)), (2,Map(1 - 1)))
```
And new output after the changes looks like:
```scala
import org.apache.spark.graphx._
val g = Graph(sc.makeRDD(Array((1L,), (2L,), (3L,))),
sc.makeRDD(Array(Edge(1L,2L,), Edge(2L,3L,
lib.ShortestPaths.run(g,Array(3)).vertices.collect
// res0: Array[(org.apache.spark.graphx.VertexId,
org.apache.spark.graphx.lib.ShortestPaths.SPMap)] = Array((1,Map(3 - 2)),
(2,Map(3 - 1)), (3,Map(3 - 0)))
lib.ShortestPaths.run(g,Array(1)).vertices.collect
// res1: Array[(org.apache.spark.graphx.VertexId,
org.apache.spark.graphx.lib.ShortestPaths.SPMap)] = Array((1,Map(1 - 0)),
(2,Map()), (3,Map()))
```
Author: Brennon York brennon.y...@capitalone.com
Closes #4478 from brennonyork/SPARK-5343 and squashes the following commits:
aa57f83 [Brennon York] updated to set ShortestPaths to run 'forward' rather
than 'backward'
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/58209612
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/58209612
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/58209612
Branch: refs/heads/master
Commit: 5820961289eb98e45eb467efa316c7592b8d619c
Parents: fd2c032
Author: Brennon York brennon.y...@capitalone.com
Authored: Tue Feb 10 14:57:00 2015 -0800
Committer: Ankur Dave ankurd...@gmail.com
Committed: Tue Feb 10 14:57:00 2015 -0800
--
.../main/scala/org/apache/spark/graphx/lib/ShortestPaths.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/58209612/graphx/src/main/scala/org/apache/spark/graphx/lib/ShortestPaths.scala
--
diff --git
a/graphx/src/main/scala/org/apache/spark/graphx/lib/ShortestPaths.scala
b/graphx/src/main/scala/org/apache/spark/graphx/lib/ShortestPaths.scala
index 590f047..179f284 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/lib/ShortestPaths.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/ShortestPaths.scala
@@ -61,8 +61,8 @@ object ShortestPaths {
}
def sendMessage(edge: EdgeTriplet[SPMap, _]): Iterator[(VertexId, SPMap)]
= {
- val newAttr = incrementMap(edge.srcAttr)
- if (edge.dstAttr != addMaps(newAttr, edge.dstAttr))
Iterator((edge.dstId, newAttr))
+ val newAttr = incrementMap(edge.dstAttr)
+ if (edge.srcAttr != addMaps(newAttr, edge.srcAttr))
Iterator((edge.srcId, newAttr))
else Iterator.empty
}
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
