Skip to content

add DenseVector and SparseVector to mllib, and replace all Array[Double] with Vectors #736

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
soulmachine wants to merge 6 commits into from
Closed

add DenseVector and SparseVector to mllib, and replace all Array[Double] with Vectors #736

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a0c7fcc
add DenseVector(based on jblas) and SparseVector(based on colt)
soulmachine Jul 25, 2013
9dc2db4
add distance measures
soulmachine Jul 25, 2013
d6d997a
replace Array[Double] with Vector
soulmachine Jul 25, 2013
bb3dfbc
replace all Array[Double] with Vector
soulmachine Jul 26, 2013
6f943b1
port mahout vector to spark
soulmachine Aug 4, 2013
416fded
Renamed several functions according to Scala's naming convention
liancheng Aug 5, 2013
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
port mahout vector to spark
  • Loading branch information
@soulmachine
soulmachine committed Aug 4, 2013
commit 6f943b140b816ba5373d63d724c132b9d0dcb8a8
4 changes: 2 additions & 2 deletions mllib/src/main/scala/spark/mllib/clustering/KMeans.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class KMeans private (
val k = activeCenters(0).length
val dims = activeCenters(0)(0).dimension

val sums = Array.fill(runs, k)(activeCenters(0)(0).like)
val sums = Array.fill(runs, k)(activeCenters(0)(0).like())
val counts = Array.fill(runs, k)(0L)

for (point <- points; (centers, runIndex) <- activeCenters.zipWithIndex) {
Expand All @@ -155,7 +155,7 @@ class KMeans private (
sums(runIndex)(bestCenter) += point
counts(runIndex)(bestCenter) += 1
}

val contribs = for (i <- 0 until runs; j <- 0 until k) yield {
((i, j), (sums(i)(j), counts(i)(j)))
}
Expand Down
2 changes: 1 addition & 1 deletion mllib/src/main/scala/spark/mllib/clustering/LocalKMeans.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package spark.mllib.clustering

import scala.util.Random

import spark.mllib.math.vector.{Vector, DenseVector, SparseVector}
import spark.mllib.math.vector.{Vector, DenseVector, RandomAccessSparseVector}

import org.jblas.{DoubleMatrix, SimpleBlas}

Expand Down
Loading