diff options
author | Ankur Dave <ankurdave@gmail.com> | 2014-01-11 00:28:18 -0800 |
---|---|---|
committer | Ankur Dave <ankurdave@gmail.com> | 2014-01-11 00:30:10 -0800 |
commit | feaa07802203b79f454454445c0a12a2784ccfeb (patch) | |
tree | c4241bf86188fa18c3dad331e869be18a75411a6 /graphx/src | |
parent | 56a245c6bc5147c7f6b11d241bf518c9781cdbe1 (diff) | |
download | spark-feaa07802203b79f454454445c0a12a2784ccfeb.tar.gz spark-feaa07802203b79f454454445c0a12a2784ccfeb.tar.bz2 spark-feaa07802203b79f454454445c0a12a2784ccfeb.zip |
algorithms -> lib
Diffstat (limited to 'graphx/src')
-rw-r--r-- | graphx/src/main/scala/org/apache/spark/graphx/Graph.scala | 4 | ||||
-rw-r--r-- | graphx/src/main/scala/org/apache/spark/graphx/lib/Algorithms.scala (renamed from graphx/src/main/scala/org/apache/spark/graphx/algorithms/Algorithms.scala) | 14 | ||||
-rw-r--r-- | graphx/src/main/scala/org/apache/spark/graphx/lib/Analytics.scala (renamed from graphx/src/main/scala/org/apache/spark/graphx/algorithms/Analytics.scala) | 2 | ||||
-rw-r--r-- | graphx/src/main/scala/org/apache/spark/graphx/lib/ConnectedComponents.scala (renamed from graphx/src/main/scala/org/apache/spark/graphx/algorithms/ConnectedComponents.scala) | 2 | ||||
-rw-r--r-- | graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala (renamed from graphx/src/main/scala/org/apache/spark/graphx/algorithms/PageRank.scala) | 2 | ||||
-rw-r--r-- | graphx/src/main/scala/org/apache/spark/graphx/lib/SVDPlusPlus.scala (renamed from graphx/src/main/scala/org/apache/spark/graphx/algorithms/SVDPlusPlus.scala) | 2 | ||||
-rw-r--r-- | graphx/src/main/scala/org/apache/spark/graphx/lib/StronglyConnectedComponents.scala (renamed from graphx/src/main/scala/org/apache/spark/graphx/algorithms/StronglyConnectedComponents.scala) | 2 | ||||
-rw-r--r-- | graphx/src/main/scala/org/apache/spark/graphx/lib/TriangleCount.scala (renamed from graphx/src/main/scala/org/apache/spark/graphx/algorithms/TriangleCount.scala) | 2 | ||||
-rw-r--r-- | graphx/src/main/scala/org/apache/spark/graphx/lib/package.scala (renamed from graphx/src/main/scala/org/apache/spark/graphx/algorithms/package.scala) | 2 | ||||
-rw-r--r-- | graphx/src/test/scala/org/apache/spark/graphx/lib/ConnectedComponentsSuite.scala (renamed from graphx/src/test/scala/org/apache/spark/graphx/algorithms/ConnectedComponentsSuite.scala) | 2 | ||||
-rw-r--r-- | graphx/src/test/scala/org/apache/spark/graphx/lib/PageRankSuite.scala (renamed from graphx/src/test/scala/org/apache/spark/graphx/algorithms/PageRankSuite.scala) | 4 | ||||
-rw-r--r-- | graphx/src/test/scala/org/apache/spark/graphx/lib/SVDPlusPlusSuite.scala (renamed from graphx/src/test/scala/org/apache/spark/graphx/algorithms/SVDPlusPlusSuite.scala) | 2 | ||||
-rw-r--r-- | graphx/src/test/scala/org/apache/spark/graphx/lib/StronglyConnectedComponentsSuite.scala (renamed from graphx/src/test/scala/org/apache/spark/graphx/algorithms/StronglyConnectedComponentsSuite.scala) | 2 | ||||
-rw-r--r-- | graphx/src/test/scala/org/apache/spark/graphx/lib/TriangleCountSuite.scala (renamed from graphx/src/test/scala/org/apache/spark/graphx/algorithms/TriangleCountSuite.scala) | 2 |
14 files changed, 22 insertions, 22 deletions
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/Graph.scala b/graphx/src/main/scala/org/apache/spark/graphx/Graph.scala index 64d44c3e06..56513cac20 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/Graph.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/Graph.scala @@ -16,8 +16,8 @@ import org.apache.spark.storage.StorageLevel * operations return new graphs. * * @note [[GraphOps]] contains additional convenience operations. - * [[algorithms.Algorithms]] contains graph algorithms; to access these, - * import `org.apache.spark.graphx.algorithms._`. + * [[lib.Algorithms]] contains graph algorithms; to access these, + * import `org.apache.spark.graphx.lib._`. * * @tparam VD the vertex attribute type * @tparam ED the edge attribute type diff --git a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/Algorithms.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/Algorithms.scala index 558d8da310..cbcd9c24a0 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/Algorithms.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/Algorithms.scala @@ -1,4 +1,4 @@ -package org.apache.spark.graphx.algorithms +package org.apache.spark.graphx.lib import scala.reflect.ClassTag @@ -9,7 +9,7 @@ import org.apache.spark.graphx._ * conversion. * @example * {{{ - * import org.apache.spark.graph.algorithms._ + * import org.apache.spark.graph.lib._ * val graph: Graph[_, _] = loadGraph() * graph.connectedComponents() * }}} @@ -19,7 +19,7 @@ class Algorithms[VD: ClassTag, ED: ClassTag](self: Graph[VD, ED]) { * Run a dynamic version of PageRank returning a graph with vertex attributes containing the * PageRank and edge attributes containing the normalized edge weight. * - * @see [[org.apache.spark.graphx.algorithms.PageRank]], method `runUntilConvergence`. + * @see [[org.apache.spark.graphx.lib.PageRank]], method `runUntilConvergence`. */ def pageRank(tol: Double, resetProb: Double = 0.15): Graph[Double, Double] = { PageRank.runUntilConvergence(self, tol, resetProb) @@ -29,7 +29,7 @@ class Algorithms[VD: ClassTag, ED: ClassTag](self: Graph[VD, ED]) { * Run PageRank for a fixed number of iterations returning a graph with vertex attributes * containing the PageRank and edge attributes the normalized edge weight. * - * @see [[org.apache.spark.graphx.algorithms.PageRank]], method `run`. + * @see [[org.apache.spark.graphx.lib.PageRank]], method `run`. */ def staticPageRank(numIter: Int, resetProb: Double = 0.15): Graph[Double, Double] = { PageRank.run(self, numIter, resetProb) @@ -39,7 +39,7 @@ class Algorithms[VD: ClassTag, ED: ClassTag](self: Graph[VD, ED]) { * Compute the connected component membership of each vertex and return a graph with the vertex * value containing the lowest vertex id in the connected component containing that vertex. * - * @see [[org.apache.spark.graphx.algorithms.ConnectedComponents]] + * @see [[org.apache.spark.graphx.lib.ConnectedComponents]] */ def connectedComponents(): Graph[VertexID, ED] = { ConnectedComponents.run(self) @@ -48,7 +48,7 @@ class Algorithms[VD: ClassTag, ED: ClassTag](self: Graph[VD, ED]) { /** * Compute the number of triangles passing through each vertex. * - * @see [[org.apache.spark.graphx.algorithms.TriangleCount]] + * @see [[org.apache.spark.graphx.lib.TriangleCount]] */ def triangleCount(): Graph[Int, ED] = { TriangleCount.run(self) @@ -58,7 +58,7 @@ class Algorithms[VD: ClassTag, ED: ClassTag](self: Graph[VD, ED]) { * Compute the strongly connected component (SCC) of each vertex and return a graph with the * vertex value containing the lowest vertex id in the SCC containing that vertex. * - * @see [[org.apache.spark.graphx.algorithms.StronglyConnectedComponents]] + * @see [[org.apache.spark.graphx.lib.StronglyConnectedComponents]] */ def stronglyConnectedComponents(numIter: Int): Graph[VertexID, ED] = { StronglyConnectedComponents.run(self, numIter) diff --git a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/Analytics.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/Analytics.scala index f09685402a..191e2aa051 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/Analytics.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/Analytics.scala @@ -1,4 +1,4 @@ -package org.apache.spark.graphx.algorithms +package org.apache.spark.graphx.lib import org.apache.spark._ import org.apache.spark.graphx._ diff --git a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/ConnectedComponents.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/ConnectedComponents.scala index 137a81f4d5..4a83e2dbb8 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/ConnectedComponents.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/ConnectedComponents.scala @@ -1,4 +1,4 @@ -package org.apache.spark.graphx.algorithms +package org.apache.spark.graphx.lib import scala.reflect.ClassTag diff --git a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/PageRank.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala index ab447d5422..809b6d0855 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/PageRank.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala @@ -1,4 +1,4 @@ -package org.apache.spark.graphx.algorithms +package org.apache.spark.graphx.lib import scala.reflect.ClassTag diff --git a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/SVDPlusPlus.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/SVDPlusPlus.scala index 2a13553d79..f5570daec1 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/SVDPlusPlus.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/SVDPlusPlus.scala @@ -1,4 +1,4 @@ -package org.apache.spark.graphx.algorithms +package org.apache.spark.graphx.lib import org.apache.spark.rdd._ import org.apache.spark.graphx._ diff --git a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/StronglyConnectedComponents.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/StronglyConnectedComponents.scala index 864f0ec57c..9bd227309a 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/StronglyConnectedComponents.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/StronglyConnectedComponents.scala @@ -1,4 +1,4 @@ -package org.apache.spark.graphx.algorithms +package org.apache.spark.graphx.lib import scala.reflect.ClassTag diff --git a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/TriangleCount.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/TriangleCount.scala index b5a93c1bd1..c6b1c736dd 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/TriangleCount.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/TriangleCount.scala @@ -1,4 +1,4 @@ -package org.apache.spark.graphx.algorithms +package org.apache.spark.graphx.lib import scala.reflect.ClassTag diff --git a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/package.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/package.scala index fbabf1257c..f6f2626c9d 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/algorithms/package.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/package.scala @@ -2,7 +2,7 @@ package org.apache.spark.graphx import scala.reflect.ClassTag -package object algorithms { +package object lib { implicit def graphToAlgorithms[VD: ClassTag, ED: ClassTag]( graph: Graph[VD, ED]): Algorithms[VD, ED] = new Algorithms(graph) } diff --git a/graphx/src/test/scala/org/apache/spark/graphx/algorithms/ConnectedComponentsSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/lib/ConnectedComponentsSuite.scala index 16fc3fe5a2..66612b381f 100644 --- a/graphx/src/test/scala/org/apache/spark/graphx/algorithms/ConnectedComponentsSuite.scala +++ b/graphx/src/test/scala/org/apache/spark/graphx/lib/ConnectedComponentsSuite.scala @@ -1,4 +1,4 @@ -package org.apache.spark.graphx.algorithms +package org.apache.spark.graphx.lib import org.scalatest.FunSuite diff --git a/graphx/src/test/scala/org/apache/spark/graphx/algorithms/PageRankSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/lib/PageRankSuite.scala index de2c2d1107..fe7e4261f8 100644 --- a/graphx/src/test/scala/org/apache/spark/graphx/algorithms/PageRankSuite.scala +++ b/graphx/src/test/scala/org/apache/spark/graphx/lib/PageRankSuite.scala @@ -1,11 +1,11 @@ -package org.apache.spark.graphx.algorithms +package org.apache.spark.graphx.lib import org.scalatest.FunSuite import org.apache.spark.SparkContext import org.apache.spark.SparkContext._ import org.apache.spark.graphx._ -import org.apache.spark.graphx.algorithms._ +import org.apache.spark.graphx.lib._ import org.apache.spark.graphx.util.GraphGenerators import org.apache.spark.rdd._ diff --git a/graphx/src/test/scala/org/apache/spark/graphx/algorithms/SVDPlusPlusSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/lib/SVDPlusPlusSuite.scala index 7bd93e0e6c..a4a1cdab18 100644 --- a/graphx/src/test/scala/org/apache/spark/graphx/algorithms/SVDPlusPlusSuite.scala +++ b/graphx/src/test/scala/org/apache/spark/graphx/lib/SVDPlusPlusSuite.scala @@ -1,4 +1,4 @@ -package org.apache.spark.graphx.algorithms +package org.apache.spark.graphx.lib import org.scalatest.FunSuite diff --git a/graphx/src/test/scala/org/apache/spark/graphx/algorithms/StronglyConnectedComponentsSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/lib/StronglyConnectedComponentsSuite.scala index fee7d20161..0458311661 100644 --- a/graphx/src/test/scala/org/apache/spark/graphx/algorithms/StronglyConnectedComponentsSuite.scala +++ b/graphx/src/test/scala/org/apache/spark/graphx/lib/StronglyConnectedComponentsSuite.scala @@ -1,4 +1,4 @@ -package org.apache.spark.graphx.algorithms +package org.apache.spark.graphx.lib import org.scalatest.FunSuite diff --git a/graphx/src/test/scala/org/apache/spark/graphx/algorithms/TriangleCountSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/lib/TriangleCountSuite.scala index b85b289da6..a286b7d03b 100644 --- a/graphx/src/test/scala/org/apache/spark/graphx/algorithms/TriangleCountSuite.scala +++ b/graphx/src/test/scala/org/apache/spark/graphx/lib/TriangleCountSuite.scala @@ -1,4 +1,4 @@ -package org.apache.spark.graphx.algorithms +package org.apache.spark.graphx.lib import org.scalatest.FunSuite |