From c18fa3ebc6848d2da19ac2f68c9e22870e135ecd Mon Sep 17 00:00:00 2001 From: Ankur Dave Date: Fri, 15 Apr 2011 21:40:54 -0700 Subject: Package combiner functions into a trait --- bagel/src/test/scala/bagel/BagelSuite.scala | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'bagel/src/test') diff --git a/bagel/src/test/scala/bagel/BagelSuite.scala b/bagel/src/test/scala/bagel/BagelSuite.scala index 72aecb7fd8..29f5f0c358 100644 --- a/bagel/src/test/scala/bagel/BagelSuite.scala +++ b/bagel/src/test/scala/bagel/BagelSuite.scala @@ -20,10 +20,7 @@ class BagelSuite extends FunSuite with Assertions { val msgs = sc.parallelize(Array[(String, TestMessage)]()) val numSupersteps = 5 val result = - Pregel.run(sc, verts, msgs, - Pregel.defaultCreateCombiner[TestMessage], - Pregel.defaultMergeMsg[TestMessage], - Pregel.defaultMergeCombiners[TestMessage], 1) { + Pregel.run(sc, verts, msgs, new DefaultCombiner[TestMessage], 1) { (self: TestVertex, msgs: Option[ArrayBuffer[TestMessage]], superstep: Int) => (new TestVertex(self.id, superstep < numSupersteps - 1, self.age + 1), Array[TestMessage]()) } @@ -37,10 +34,7 @@ class BagelSuite extends FunSuite with Assertions { val msgs = sc.parallelize(Array("a" -> new TestMessage("a"))) val numSupersteps = 5 val result = - Pregel.run(sc, verts, msgs, - Pregel.defaultCreateCombiner[TestMessage], - Pregel.defaultMergeMsg[TestMessage], - Pregel.defaultMergeCombiners[TestMessage], 1) { + Pregel.run(sc, verts, msgs, new DefaultCombiner[TestMessage], 1) { (self: TestVertex, msgs: Option[ArrayBuffer[TestMessage]], superstep: Int) => val msgsOut = msgs match { -- cgit v1.2.3