Merge pull request #624 from criteo-forks/fix-vector-builder

Fixed 'initialNonZero' handling in 'VectorBuilder'
scalanlp · Apr 12, 2017 · 5ae0579 · 5ae0579
2 parents 8e42651 + 2c72e1c
commit 5ae0579
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/math/src/main/scala/breeze/linalg/VectorBuilder.scala b/math/src/main/scala/breeze/linalg/VectorBuilder.scala
@@ -53,7 +53,9 @@ class VectorBuilder[@spec(Double, Int, Float, Long) E](private var _index: Array
 
   def this(length: Int, initialNonZero: Int = 0)(implicit ring: Semiring[E],
                                                  man: ClassTag[E],
-                                                 zero: Zero[E]) = this(new Array[Int](0), new Array[E](0), 0, length)
+                                                 zero: Zero[E]) = {
+    this(new Array[Int](initialNonZero), new Array[E](initialNonZero), 0, length)
+  }
 
   def this()(implicit ring: Semiring[E],
              man: ClassTag[E],
@@ -311,7 +313,7 @@ class VectorBuilder[@spec(Double, Int, Float, Long) E](private var _index: Array
 
 object VectorBuilder extends VectorBuilderOps {
 
-  def zeros[@spec(Double, Int, Float, Long) V: ClassTag:Semiring:Zero](size: Int, initialNonzero: Int = 16) = new VectorBuilder(size, initialNonzero)
+  def zeros[@spec(Double, Int, Float, Long) V: ClassTag:Semiring:Zero](size: Int, initialNonZero: Int = 16) = new VectorBuilder(size, initialNonZero)
   def apply[@spec(Double, Int, Float, Long) V:Semiring:Zero](values: Array[V]) = new VectorBuilder(Array.range(0,values.length), values, values.length, values.length)
 
   def apply[V:ClassTag:Semiring:Zero](values: V*):VectorBuilder[V] = apply(values.toArray)

diff --git a/math/src/test/scala/breeze/linalg/VectorBuilderTest.scala b/math/src/test/scala/breeze/linalg/VectorBuilderTest.scala
@@ -14,6 +14,11 @@ import breeze.numerics.closeTo
  */
 @RunWith(classOf[JUnitRunner])
 class VectorBuilderTest extends FunSuite with Checkers {
+  test("VectorBuilder respects initialNonZero") {
+    val vb = new VectorBuilder[Double](32, initialNonZero = 4)
+    assert(vb.index.length === 4)
+    assert(vb.data.length === 4)
+  }
 
   test("Basic VectorBuilder result tests") {
     val vb = VectorBuilder[Double](0.0, 1.0, 3.0)