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/04/16 06:52:30 UTC
spark git commit: SPARK-6938: All require statements now have an
informative error message.
Repository: spark
Updated Branches:
refs/heads/master 8a53de16f -> 52c3439a8
SPARK-6938: All require statements now have an informative error message.
This pr adds informative error messages to all require statements in the Vectors class that did not previously have them. This references [SPARK-6938](https://issues.apache.org/jira/browse/SPARK-6938).
Author: Juliet Hougland <ju...@cloudera.com>
Closes #5532 from jhlch/SPARK-6938 and squashes the following commits:
ab321bb [Juliet Hougland] Remove braces from string interpolation when not required.
1221f94 [Juliet Hougland] All require statements now have an informative error message.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/52c3439a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/52c3439a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/52c3439a
Branch: refs/heads/master
Commit: 52c3439a8a107ce1fc10e4f0b59fd7881e851622
Parents: 8a53de1
Author: Juliet Hougland <ju...@cloudera.com>
Authored: Wed Apr 15 21:52:25 2015 -0700
Committer: Xiangrui Meng <me...@databricks.com>
Committed: Wed Apr 15 21:52:25 2015 -0700
----------------------------------------------------------------------
.../org/apache/spark/mllib/linalg/Vectors.scala | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/52c3439a/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 328dbe2..4ef171f 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
@@ -227,7 +227,7 @@ object Vectors {
* @param elements vector elements in (index, value) pairs.
*/
def sparse(size: Int, elements: Seq[(Int, Double)]): Vector = {
- require(size > 0)
+ require(size > 0, "The size of the requested sparse vector must be greater than 0.")
val (indices, values) = elements.sortBy(_._1).unzip
var prev = -1
@@ -235,7 +235,8 @@ object Vectors {
require(prev < i, s"Found duplicate indices: $i.")
prev = i
}
- require(prev < size)
+ require(prev < size, s"You may not write an element to index $prev because the declared " +
+ s"size of your vector is $size")
new SparseVector(size, indices.toArray, values.toArray)
}
@@ -309,7 +310,8 @@ object Vectors {
* @return norm in L^p^ space.
*/
def norm(vector: Vector, p: Double): Double = {
- require(p >= 1.0)
+ require(p >= 1.0, "To compute the p-norm of the vector, we require that you specify a p>=1. " +
+ s"You specified p=$p.")
val values = vector match {
case DenseVector(vs) => vs
case SparseVector(n, ids, vs) => vs
@@ -360,7 +362,8 @@ object Vectors {
* @return squared distance between two Vectors.
*/
def sqdist(v1: Vector, v2: Vector): Double = {
- require(v1.size == v2.size, "vector dimension mismatch")
+ require(v1.size == v2.size, s"Vector dimensions do not match: Dim(v1)=${v1.size} and Dim(v2)" +
+ s"=${v2.size}.")
var squaredDistance = 0.0
(v1, v2) match {
case (v1: SparseVector, v2: SparseVector) =>
@@ -518,7 +521,9 @@ class SparseVector(
val indices: Array[Int],
val values: Array[Double]) extends Vector {
- require(indices.length == values.length)
+ require(indices.length == values.length, "Sparse vectors require that the dimension of the" +
+ s" indices match the dimension of the values. You provided ${indices.size} indices and " +
+ s" ${values.size} values.")
override def toString: String =
"(%s,%s,%s)".format(size, indices.mkString("[", ",", "]"), values.mkString("[", ",", "]"))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org