Skip to content

[SPARK-9222] [MLlib] Make class instantiation variables in DistributedLDAModel private[clustering] #7573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MechCoder wants to merge 1 commit into from
Closed

[SPARK-9222] [MLlib] Make class instantiation variables in DistributedLDAModel private[clustering] #7573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions mllib/src/main/scala/org/apache/spark/mllib/clustering/LDAModel.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,12 @@ object LocalLDAModel extends Loader[LocalLDAModel] {
*/
@Experimental
class DistributedLDAModel private (
private val graph: Graph[LDA.TopicCounts, LDA.TokenCount],
private val globalTopicTotals: LDA.TopicCounts,
private[clustering] val graph: Graph[LDA.TopicCounts, LDA.TokenCount],
private[clustering] val globalTopicTotals: LDA.TopicCounts,
val k: Int,
val vocabSize: Int,
private val docConcentration: Double,
private val topicConcentration: Double,
private[clustering] val docConcentration: Double,
private[clustering] val topicConcentration: Double,
private[spark] val iterationTimes: Array[Double]) extends LDAModel {

import LDA._
Expand Down
15 changes: 15 additions & 0 deletions mllib/src/test/scala/org/apache/spark/mllib/clustering/LDASuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package org.apache.spark.mllib.clustering
import breeze.linalg.{DenseMatrix => BDM}

import org.apache.spark.SparkFunSuite
import org.apache.spark.graphx.Edge
import org.apache.spark.mllib.linalg.{DenseMatrix, Matrix, Vector, Vectors}
import org.apache.spark.mllib.util.MLlibTestSparkContext
import org.apache.spark.mllib.util.TestingUtils._
Expand Down Expand Up @@ -318,6 +319,20 @@ class LDASuite extends SparkFunSuite with MLlibTestSparkContext {
assert(distributedModel.k === sameDistributedModel.k)
assert(distributedModel.vocabSize === sameDistributedModel.vocabSize)
assert(distributedModel.iterationTimes === sameDistributedModel.iterationTimes)
assert(distributedModel.docConcentration === sameDistributedModel.docConcentration)
assert(distributedModel.topicConcentration === sameDistributedModel.topicConcentration)
assert(distributedModel.globalTopicTotals === sameDistributedModel.globalTopicTotals)

val graph = distributedModel.graph
val sameGraph = sameDistributedModel.graph
assert(graph.vertices.sortByKey().collect() === sameGraph.vertices.sortByKey().collect())
val edge = graph.edges.map {
case Edge(sid: Long, did: Long, nos: Double) => (sid, did, nos)
}.sortBy(x => (x._1, x._2)).collect()
val sameEdge = sameGraph.edges.map {
case Edge(sid: Long, did: Long, nos: Double) => (sid, did, nos)
}.sortBy(x => (x._1, x._2)).collect()
assert(edge === sameEdge)
} finally {
Utils.deleteRecursively(tempDir1)
Utils.deleteRecursively(tempDir2)
Expand Down