You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by me...@apache.org on 2015/03/23 21:30:25 UTC
spark git commit: [SPARK-6308] [MLlib] [Sql] Override TypeName in
VectorUDT and MatrixUDT
Repository: spark
Updated Branches:
refs/heads/master 9f3273bd9 -> 474d1320c
[SPARK-6308] [MLlib] [Sql] Override TypeName in VectorUDT and MatrixUDT
Author: MechCoder <ma...@gmail.com>
Closes #5118 from MechCoder/spark-6308 and squashes the following commits:
6c8ffab [MechCoder] Add test for simpleString
b966242 [MechCoder] [SPARK-6308] [MLlib][Sql] VectorUDT is displayed as vecto in dtypes
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/474d1320
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/474d1320
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/474d1320
Branch: refs/heads/master
Commit: 474d1320c9b93c501710ad1cfa836b8284562a2c
Parents: 9f3273b
Author: MechCoder <ma...@gmail.com>
Authored: Mon Mar 23 13:30:21 2015 -0700
Committer: Xiangrui Meng <me...@databricks.com>
Committed: Mon Mar 23 13:30:21 2015 -0700
----------------------------------------------------------------------
mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala | 2 ++
mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala | 2 ++
.../test/scala/org/apache/spark/mllib/linalg/MatricesSuite.scala | 2 ++
.../test/scala/org/apache/spark/mllib/linalg/VectorsSuite.scala | 2 ++
4 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/474d1320/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala
index 849f442..d1a1740 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala
@@ -187,6 +187,8 @@ private[spark] class MatrixUDT extends UserDefinedType[Matrix] {
override def hashCode(): Int = 1994
+ override def typeName: String = "matrix"
+
private[spark] override def asNullable: MatrixUDT = this
}
http://git-wip-us.apache.org/repos/asf/spark/blob/474d1320/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
index 2cda9b2..328dbe2 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
@@ -185,6 +185,8 @@ private[spark] class VectorUDT extends UserDefinedType[Vector] {
override def hashCode: Int = 7919
+ override def typeName: String = "vector"
+
private[spark] override def asNullable: VectorUDT = this
}
http://git-wip-us.apache.org/repos/asf/spark/blob/474d1320/mllib/src/test/scala/org/apache/spark/mllib/linalg/MatricesSuite.scala
----------------------------------------------------------------------
diff --git a/mllib/src/test/scala/org/apache/spark/mllib/linalg/MatricesSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/linalg/MatricesSuite.scala
index 96f677d..0d2cec5 100644
--- a/mllib/src/test/scala/org/apache/spark/mllib/linalg/MatricesSuite.scala
+++ b/mllib/src/test/scala/org/apache/spark/mllib/linalg/MatricesSuite.scala
@@ -436,5 +436,7 @@ class MatricesSuite extends FunSuite {
Seq(dm1, dm2, dm3, sm1, sm2, sm3).foreach {
mat => assert(mat.toArray === mUDT.deserialize(mUDT.serialize(mat)).toArray)
}
+ assert(mUDT.typeName == "matrix")
+ assert(mUDT.simpleString == "matrix")
}
}
http://git-wip-us.apache.org/repos/asf/spark/blob/474d1320/mllib/src/test/scala/org/apache/spark/mllib/linalg/VectorsSuite.scala
----------------------------------------------------------------------
diff --git a/mllib/src/test/scala/org/apache/spark/mllib/linalg/VectorsSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/linalg/VectorsSuite.scala
index 5def899..2839c4c 100644
--- a/mllib/src/test/scala/org/apache/spark/mllib/linalg/VectorsSuite.scala
+++ b/mllib/src/test/scala/org/apache/spark/mllib/linalg/VectorsSuite.scala
@@ -187,6 +187,8 @@ class VectorsSuite extends FunSuite {
for (v <- Seq(dv0, dv1, sv0, sv1)) {
assert(v === udt.deserialize(udt.serialize(v)))
}
+ assert(udt.typeName == "vector")
+ assert(udt.simpleString == "vector")
}
test("fromBreeze") {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org