aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorPillis <pillis.work@gmail.com>2014-01-09 10:16:19 +0100
committerPillis <pillis.work@gmail.com>2014-01-09 10:16:19 +0100
commit181471906ed590347cbbe3422bd92e9b82f9e1bf (patch)
tree8ccf31c524aa2f65dd958a8c71d5d47139741494 /core
parentdceedb466032eca38f943cb97a8dca27496ca914 (diff)
downloadspark-181471906ed590347cbbe3422bd92e9b82f9e1bf.tar.gz
spark-181471906ed590347cbbe3422bd92e9b82f9e1bf.tar.bz2
spark-181471906ed590347cbbe3422bd92e9b82f9e1bf.zip
SPARK-961 Add a Vector.random() method
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/util/Vector.scala4
-rw-r--r--core/src/test/scala/org/apache/spark/util/VectorSuite.scala46
2 files changed, 50 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/util/Vector.scala b/core/src/main/scala/org/apache/spark/util/Vector.scala
index fe710c58ac..f9c6cdf2be 100644
--- a/core/src/main/scala/org/apache/spark/util/Vector.scala
+++ b/core/src/main/scala/org/apache/spark/util/Vector.scala
@@ -17,6 +17,8 @@
package org.apache.spark.util
+import scala.util.Random
+
class Vector(val elements: Array[Double]) extends Serializable {
def length = elements.length
@@ -124,6 +126,8 @@ object Vector {
def ones(length: Int) = Vector(length, _ => 1)
+ def random(length: Int, random: Random = new Random()) = Vector(length, _ => random.nextDouble());
+
class Multiplier(num: Double) {
def * (vec: Vector) = vec * num
}
diff --git a/core/src/test/scala/org/apache/spark/util/VectorSuite.scala b/core/src/test/scala/org/apache/spark/util/VectorSuite.scala
new file mode 100644
index 0000000000..23d1bdb193
--- /dev/null
+++ b/core/src/test/scala/org/apache/spark/util/VectorSuite.scala
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.util
+
+import scala.util.Random
+
+import org.scalatest.FunSuite
+
+/**
+ * Tests org.apache.spark.util.Vector functionality
+ */
+class VectorSuite extends FunSuite {
+
+ def verifyVector(vector: Vector, expectedLength: Int) = {
+ assert(vector.length == expectedLength); // Array must be of expected length
+ assert(vector.length == vector.elements.distinct.length); // Values should not repeat
+ assert(vector.sum > 0); // All values must not be 0
+ assert(vector.sum < vector.length); // All values must not be 1
+ assert(vector.elements.product > 0); // No value is 0
+ }
+
+ test("random with default random number generator") {
+ val vector100 = Vector.random(100);
+ verifyVector(vector100, 100);
+ }
+
+ test("random with given random number generator") {
+ val vector100 = Vector.random(100, new Random(100));
+ verifyVector(vector100, 100);
+ }
+}