Improved SparseVector constructor

src/SparseVector.php

@@ -10,12 +10,24 @@ class SparseVector
 
     public function __construct($value, $dimensions = null)
     {
+        $numArgs = func_num_args();
+
         if (is_string($value)) {
+            if ($numArgs > 1) {
+                throw new \InvalidArgumentException("Extra argument");
+            }
+
             $this->fromString($value);
-        } elseif (!is_null($dimensions)) {
-            $this->fromMap($value, $dimensions);
         } else {
-            $this->fromDense($value);
+            if (!is_array($value)) {
+                throw new \InvalidArgumentException("Expected array");
+            }
+
+            if ($numArgs > 1) {
+                $this->fromMap($value, $dimensions);
+            } else {
+                $this->fromDense($value);
+            }
         }
     }
 
@@ -27,7 +39,7 @@ private function fromDense($value)
 
         foreach ($value as $i => $v) {
             if ($v != 0) {
-                $this->indices[] = $i;
+                $this->indices[] = intval($i);
                 $this->values[] = floatval($v);
             }
         }

tests/SparseVectorTest.php

@@ -31,6 +31,22 @@ public function testFromString()
         $this->assertEquals([1, 2, 3], $embedding->values());
     }
 
+    public function testFromStringDimensions()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Extra argument');
+
+        new SparseVector('{1:1,3:2,5:3}/6', 6);
+    }
+
+    public function testInvalidInteger()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Expected array');
+
+        new SparseVector(1);
+    }
+
     public function testToString()
     {
         $embedding = new SparseVector([1, 0, 2, 0, 3, 0]);