Skip to content

[SPARK-8018][MLlib]KMeans should accept initial cluster centers as param #6737

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
FlytxtRnD wants to merge 16 commits into from
Closed

[SPARK-8018][MLlib]KMeans should accept initial cluster centers as param #6737

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6959861
Accept initial cluster centers in KMeans
FlytxtRnD Jun 10, 2015
e9c35d7
Remove getInitialModel and match cluster count criteria
FlytxtRnD Jun 11, 2015
16f1b53
Merge branch 'Kmeans-8018', remote-tracking branch 'upstream/master' …
FlytxtRnD Jun 15, 2015
cd5dc5c
Merge remote-tracking branch 'upstream/master' into Kmeans-8018
FlytxtRnD Jun 19, 2015
3f5fc8e
test case modified and one runs condition added
FlytxtRnD Jun 19, 2015
582e6d9
Merge remote-tracking branch 'upstream/master' into Kmeans-8018
FlytxtRnD Jun 22, 2015
60c8ce2
ignore runs parameter and initialModel test suite changed
FlytxtRnD Jun 22, 2015
714acb5
added numRuns
FlytxtRnD Jun 25, 2015
242ead1
corrected == to === in assert
FlytxtRnD Jun 29, 2015
e721dfe
Merge remote-tracking branch 'upstream/master' into Kmeans-8018
FlytxtRnD Jun 29, 2015
07f8554
remove setRuns from setIntialModel
FlytxtRnD Jun 30, 2015
d12336e
numRuns variable modifications
FlytxtRnD Jul 3, 2015
06d13ef
numRuns corrected
FlytxtRnD Jul 6, 2015
c446c58
documentation and numRuns warning change
FlytxtRnD Jul 8, 2015
ef95ee2
style correction
FlytxtRnD Jul 14, 2015
94b56df
style correction
FlytxtRnD Jul 14, 2015
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
Prev Previous commit
Next Next commit
added numRuns
  • Loading branch information
@FlytxtRnD
FlytxtRnD committed Jun 25, 2015
commit 714acb5667753a934005591f7f928bdb0df06c4f
10 changes: 6 additions & 4 deletions mllib/src/main/scala/org/apache/spark/mllib/clustering/KMeans.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,11 @@ class KMeans private (

val initStartTime = System.nanoTime()

val numRuns = if (initialModel.nonEmpty) runs else 1
Copy link
Member

@jkbradley jkbradley Jun 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These values should be switched


val centers = initialModel match {
case Some(kMeansCenters) => {
Array.tabulate(runs)(r => kMeansCenters.clusterCenters
Array.tabulate(numRuns)(r => kMeansCenters.clusterCenters
Copy link
Member

@jkbradley jkbradley Jun 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to use numRuns or Array.tabulate here since you know there is only 1 run

.map(s => new VectorWithNorm(s, Vectors.norm(s, 2.0))))
}
case None => {
Expand All @@ -227,10 +229,10 @@ class KMeans private (
logInfo(s"Initialization with $initializationMode took " + "%.3f".format(initTimeInSeconds) +
" seconds.")

val active = Array.fill(runs)(true)
val costs = Array.fill(runs)(0.0)
val active = Array.fill(numRuns)(true)
val costs = Array.fill(numRuns)(0.0)

var activeRuns = new ArrayBuffer[Int] ++ (0 until runs)
var activeRuns = new ArrayBuffer[Int] ++ (0 until numRuns)
var iteration = 0

val iterationStartTime = System.nanoTime()
Expand Down