Skip to content
Snippets Groups Projects
Commit 1a961dd1 authored by Dan Crankshaw's avatar Dan Crankshaw
Browse files

Fixed connected components CL params

parent 1e5535cf
No related branches found
No related tags found
No related merge requests found
...@@ -161,11 +161,15 @@ object Analytics extends Logging { ...@@ -161,11 +161,15 @@ object Analytics extends Logging {
case "cc" => { case "cc" => {
var numIter = Int.MaxValue var numIter = Int.MaxValue
var numVPart = 4
var numEPart = 4
var isDynamic = false var isDynamic = false
options.foreach{ options.foreach{
case ("numIter", v) => numIter = v.toInt case ("numIter", v) => numIter = v.toInt
case ("dynamic", v) => isDynamic = v.toBoolean 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) case (opt, _) => throw new IllegalArgumentException("Invalid option: " + opt)
} }
...@@ -182,7 +186,8 @@ object Analytics extends Logging { ...@@ -182,7 +186,8 @@ object Analytics extends Logging {
println("======================================") println("======================================")
val sc = new SparkContext(host, "ConnectedComponents(" + fname + ")") 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 = Analytics.connectedComponents(graph, numIter)
//val cc = if(isDynamic) Analytics.dynamicConnectedComponents(graph, numIter) //val cc = if(isDynamic) Analytics.dynamicConnectedComponents(graph, numIter)
// else Analytics.connectedComponents(graph, numIter) // else Analytics.connectedComponents(graph, numIter)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment