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 8f4a88185043fe428f8a9a22badf53de9a4ab34f..2e6100c0708e29925eb28cadc278c7361c1cf611 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 2fe77b4962a47cdf3344ecf87e41627c75e6d35f..a5e0a9ffb6dcc20221eb2d7788f833ed8c1691ff 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 {