Merge branch 'master' of https://github.com/RubixML/Tensor

Author: andrewdalpino

src/Matrix.php

@@ -813,10 +813,11 @@ public function dot(Vector $b) : ColumnVector
      * Convolve this matrix with another matrix.
      * 
      * @param  \Rubix\Tensor\Matrix  $b
+     * @param  int  $stride
      * @throws \InvalidArgumentException
      * @return self
      */
-    public function convolve(Matrix $b) : self
+    public function convolve(Matrix $b, int $stride = 1) : self
     {
         list($m, $n) = $b->shape();
 
@@ -825,21 +826,26 @@ public function convolve(Matrix $b) : self
                 . ' larger than Matrix A.');
         }
 
+        if ($stride < 1) {
+            throw new InvalidArgumentException('Stride cannot be'
+                . " less than 1, $stride given.");
+        }
+
         $p = intdiv($m, 2);
         $q = intdiv($n, 2);
 
         $c = [];
 
-        for ($i = 0; $i < $this->m; $i++) {
+        for ($i = 0; $i < $this->m; $i += $stride) {
             $temp = [];
 
-            for ($j = 0; $j < $this->n; $j++) {
+            for ($j = 0; $j < $this->n; $j += $stride) {
                 $sigma = 0;
 
                 foreach ($b as $k => $rowB) {
                     foreach ($rowB as $l => $valueB) {
-                        $x = $i + ($p - (int) $k);
-                        $y = $j + ($q - (int) $l);
+                        $x = $i + $p - (int) $k;
+                        $y = $j + $q - (int) $l;
 
                         if ($x < 0 or $x >= $this->n or $y < 0 or $y >= $this->m) {
                             continue 1;

src/Vector.php

@@ -560,19 +560,25 @@ public function cross(Vector $b) : self
      * Convolve this vector with another vector.
      * 
      * @param  \Rubix\Tensor\Vector  $b
+     * @param  int  $stride
      * @throws \InvalidArgumentException
      * @return self
      */
-    public function convolve(Vector $b) : self
+    public function convolve(Vector $b, int $stride = 1) : self
     {
         if ($b->size() > $this->n) {
             throw new InvalidArgumentException('Vector B cannot be'
                 . ' longer than Vector A.');
         }
 
+        if ($stride < 1) {
+            throw new InvalidArgumentException('Stride cannot be'
+                . " less than 1, $stride given.");
+        }
+
         $c = [];
 
-        for ($i = 0; $i < $this->n; $i++) {
+        for ($i = 0; $i < $this->n; $i += $stride) {
             $sigma = 0;
 
             foreach ($b as $j => $valueB) {

tests/MatrixTest.php

@@ -575,7 +575,7 @@ public function test_convolve()
             [6, 9, 69, 5, 2, 33, 35],
         ]);
 
-        $z = $input->convolve($this->a);
+        $z = $input->convolve($this->a, 1);
 
         $y = [
             [254, 792, 1565, 811, 499, 195],

tests/VectorTest.php

@@ -333,7 +333,7 @@ public function test_cross()
 
     public function test_convolve()
     {
-        $z = $this->a->convolve($this->c);
+        $z = $this->a->convolve($this->c, 1);
 
         $y = [-60.0, 2.5, 259.0, -144., 40.5, 370.1, 462.20000000000005, 9.999999999999886];