From 1a961dd1f27ce94a5f79faa60a746bde21470682 Mon Sep 17 00:00:00 2001 From: Dan Crankshaw Date: Sat, 12 Oct 2013 01:47:38 +0000 Subject: [PATCH] Fixed connected components CL params --- .../src/main/scala/org/apache/spark/graph/Analytics.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/graph/src/main/scala/org/apache/spark/graph/Analytics.scala b/graph/src/main/scala/org/apache/spark/graph/Analytics.scala index 59af021c8d..6aa6f50317 100644 --- a/graph/src/main/scala/org/apache/spark/graph/Analytics.scala +++ b/graph/src/main/scala/org/apache/spark/graph/Analytics.scala @@ -161,11 +161,15 @@ object Analytics extends Logging { case "cc" => { var numIter = Int.MaxValue + var numVPart = 4 + var numEPart = 4 var isDynamic = false options.foreach{ case ("numIter", v) => numIter = v.toInt case ("dynamic", v) => isDynamic = v.toBoolean + case ("numEPart", v) => numEPart = v.toInt + case ("numVPart", v) => numVPart = v.toInt case (opt, _) => throw new IllegalArgumentException("Invalid option: " + opt) } @@ -182,7 +186,8 @@ object Analytics extends Logging { println("======================================") val sc = new SparkContext(host, "ConnectedComponents(" + fname + ")") - val graph = GraphLoader.textFile(sc, fname, a => 1.0F) + //val graph = GraphLoader.textFile(sc, fname, a => 1.0F) + val graph = GraphLoader.textFile(sc, fname, a => 1.0F, numEPart).withPartitioner(numVPart, numEPart).cache() val cc = Analytics.connectedComponents(graph, numIter) //val cc = if(isDynamic) Analytics.dynamicConnectedComponents(graph, numIter) // else Analytics.connectedComponents(graph, numIter)