Skip to content

Commit 8433922

Browse files
committed
use extractor for vectors in NaiveBayes.scala and Normalizer.scala
1 parent d83c7ca commit 8433922

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

mllib/src/main/scala/org/apache/spark/mllib/classification/NaiveBayes.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ class NaiveBayes private (private var lambda: Double) extends Serializable with
9393
def run(data: RDD[LabeledPoint]) = {
9494
val requireNonnegativeValues: Vector => Unit = (v: Vector) => {
9595
val values = v match {
96-
case sv: SparseVector =>
97-
sv.values
98-
case dv: DenseVector =>
99-
dv.values
96+
case SparseVector(size, indices, values) =>
97+
values
98+
case DenseVector(values) =>
99+
values
100100
}
101101
if (!values.forall(_ >= 0.0)) {
102102
throw new SparkException(s"Naive Bayes requires nonnegative feature values but found $v.")

mllib/src/main/scala/org/apache/spark/mllib/feature/Normalizer.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,24 @@ class Normalizer(p: Double) extends VectorTransformer {
5252
// However, for sparse vector, the `index` array will not be changed,
5353
// so we can re-use it to save memory.
5454
vector match {
55-
case dv: DenseVector =>
56-
val values = dv.values.clone()
55+
case DenseVector(vs) =>
56+
val values = vs.clone()
5757
val size = values.size
5858
var i = 0
5959
while (i < size) {
6060
values(i) /= norm
6161
i += 1
6262
}
6363
Vectors.dense(values)
64-
case sv: SparseVector =>
65-
val values = sv.values.clone()
64+
case SparseVector(size, ids, vs) =>
65+
val values = vs.clone()
6666
val nnz = values.size
6767
var i = 0
6868
while (i < nnz) {
6969
values(i) /= norm
7070
i += 1
7171
}
72-
Vectors.sparse(sv.size, sv.indices, values)
72+
Vectors.sparse(size, ids, values)
7373
case v => throw new IllegalArgumentException("Do not support vector type " + v.getClass)
7474
}
7575
} else {

0 commit comments

Comments
 (0)