From c1104058c6201d5a2b59dff1babcb71523f156fe Mon Sep 17 00:00:00 2001
From: Ankur Dave <ankurdave@gmail.com>
Date: Tue, 3 May 2011 18:53:58 -0700
Subject: [PATCH] Move shortest path and PageRank to bagel.examples
---
bagel/src/main/scala/bagel/{ => examples}/ShortestPath.scala | 4 +++-
.../main/scala/bagel/{ => examples}/WikipediaPageRank.scala | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
rename bagel/src/main/scala/bagel/{ => examples}/ShortestPath.scala (98%)
rename bagel/src/main/scala/bagel/{ => examples}/WikipediaPageRank.scala (98%)
diff --git a/bagel/src/main/scala/bagel/ShortestPath.scala b/bagel/src/main/scala/bagel/examples/ShortestPath.scala
similarity index 98%
rename from bagel/src/main/scala/bagel/ShortestPath.scala
rename to bagel/src/main/scala/bagel/examples/ShortestPath.scala
index 8f4a881850..2e6100c070 100644
--- a/bagel/src/main/scala/bagel/ShortestPath.scala
+++ b/bagel/src/main/scala/bagel/examples/ShortestPath.scala
@@ -1,10 +1,11 @@
-package bagel
+package bagel.examples
import spark._
import spark.SparkContext._
import scala.math.min
+import bagel._
import bagel.Pregel._
object ShortestPath {
@@ -80,6 +81,7 @@ object ShortestPath {
}
}
+@serializable
object MinCombiner extends Combiner[SPMessage, Int] {
def createCombiner(msg: SPMessage): Int =
msg.value
diff --git a/bagel/src/main/scala/bagel/WikipediaPageRank.scala b/bagel/src/main/scala/bagel/examples/WikipediaPageRank.scala
similarity index 98%
rename from bagel/src/main/scala/bagel/WikipediaPageRank.scala
rename to bagel/src/main/scala/bagel/examples/WikipediaPageRank.scala
index 2fe77b4962..a5e0a9ffb6 100644
--- a/bagel/src/main/scala/bagel/WikipediaPageRank.scala
+++ b/bagel/src/main/scala/bagel/examples/WikipediaPageRank.scala
@@ -1,8 +1,9 @@
-package bagel
+package bagel.examples
import spark._
import spark.SparkContext._
+import bagel._
import bagel.Pregel._
import scala.collection.mutable.ArrayBuffer
@@ -75,6 +76,7 @@ object WikipediaPageRank {
}
}
+@serializable
object PRCombiner extends Combiner[PRMessage, Double] {
def createCombiner(msg: PRMessage): Double =
msg.value
@@ -103,6 +105,7 @@ object PRCombiner extends Combiner[PRMessage, Double] {
}
}
+@serializable
object PRNoCombiner extends DefaultCombiner[PRMessage] {
def compute(numVertices: Long, epsilon: Double)(self: PRVertex, messages: Option[ArrayBuffer[PRMessage]], superstep: Int): (PRVertex, Iterable[PRMessage]) =
PRCombiner.compute(numVertices, epsilon)(self, messages match {
--
GitLab