From 6a0fbc037417575fec248c7fb2d2249bf031fa07 Mon Sep 17 00:00:00 2001
From: "Joseph E. Gonzalez" <joseph.e.gonzalez@gmail.com>
Date: Sat, 26 Oct 2013 15:44:19 -0700
Subject: [PATCH] Updating the GraphLab API to match the changes made to the
 Pregel API.

---
 .../scala/org/apache/spark/graph/GraphLab.scala  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/graph/src/main/scala/org/apache/spark/graph/GraphLab.scala b/graph/src/main/scala/org/apache/spark/graph/GraphLab.scala
index 2f2a624592..b8503ab7fd 100644
--- a/graph/src/main/scala/org/apache/spark/graph/GraphLab.scala
+++ b/graph/src/main/scala/org/apache/spark/graph/GraphLab.scala
@@ -33,14 +33,14 @@ object GraphLab {
    * @tparam A The type accumulated during the gather phase
    * @return the resulting graph after the algorithm converges
    */
-  def iterate[VD: ClassManifest, ED: ClassManifest, A: ClassManifest](graph: Graph[VD, ED])(
-    gatherFunc: (Vid, EdgeTriplet[VD, ED]) => A,
-    mergeFunc: (A, A) => A,
-    applyFunc: (Vid, VD, Option[A]) => VD,
-    scatterFunc: (Vid, EdgeTriplet[VD, ED]) => Boolean,
-    numIter: Int = Integer.MAX_VALUE,
-    gatherDirection: EdgeDirection = EdgeDirection.In,
-    scatterDirection: EdgeDirection = EdgeDirection.Out): Graph[VD, ED] = {
+  def apply[VD: ClassManifest, ED: ClassManifest, A: ClassManifest]
+    (graph: Graph[VD, ED], numIter: Int,  
+     gatherDirection: EdgeDirection = EdgeDirection.In,
+     scatterDirection: EdgeDirection = EdgeDirection.Out)
+    (gatherFunc: (Vid, EdgeTriplet[VD, ED]) => A,
+     mergeFunc: (A, A) => A,
+     applyFunc: (Vid, VD, Option[A]) => VD,
+     scatterFunc: (Vid, EdgeTriplet[VD, ED]) => Boolean): Graph[VD, ED] = {
 
 
     // Add an active attribute to all vertices to track convergence.