ghostjat / Np

src/decompositions/cholesky.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace Np\decompositions;
 
@@ -27,7 +27,7 @@ 
      * @return matrix|null
      * 
      */
-    public static function factory(matrix $m): matrix|null {
+    public static function factory(matrix $m): matrix | null {
         if ($m->isSquare()) {
             $ar = $m->copy();
             $lp = lapack::potrf($ar);

src/vector.php

Indentation +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
  * @copyright (c) 2020-2021, Shubham Chaudhary
  * 
  */
- class vector extends nd {
-     use ops, linAlg;
+    class vector extends nd {
+        use ops, linAlg;
 
     /**
      * Factory method to build a new vector.

Spacing +19 added lines, -19 removed lines

@@ -134,7 +134,7 @@ 
      * @param int $dtype
      * @return vector
      */
-    public static function full(int $col, int|float $val, int $dtype = self::FLOAT): vector {
+    public static function full(int $col, int | float $val, int $dtype = self::FLOAT): vector {
         $ar = self::factory($col, $dtype);
         for ($i = 0; $i < $col; ++$i) {
             $ar->data[$i] = $val;
@@ -151,7 +151,7 @@ 
      * @param int $dtype 
      * @return vector
      */
-    public static function range(int|float $start, int|float $end, int|float $interval = 1, int $dtype = self::FLOAT): vector {
+    public static function range(int | float $start, int | float $end, int | float $interval = 1, int $dtype = self::FLOAT): vector {
         return self::ar(range($start, $end, $interval), $dtype);
     }
 
@@ -285,7 +285,7 @@ 
      * @param int|float|matrix|vector $d
      * @return matrix|vector
      */
-    public function divide(int|float|matrix|vector $d): matrix|vector {
+    public function divide(int | float | matrix | vector $d): matrix | vector {
         if ($d instanceof matrix) {
             return $this->divideMatrix($d);
         } elseif ($d instanceof self) {
@@ -332,7 +332,7 @@ 
      * @param int|float $s
      * @return vector
      */
-    protected function divideScalar(int|float $s): vector {
+    protected function divideScalar(int | float $s): vector {
         $vr = self::factory($this->col, $this->dtype);
         for ($i = 0; $i < $this->col; ++$i) {
             $vr->data[$i] = $this->data[$i] / $s;
@@ -345,7 +345,7 @@ 
      * @param int|float|matrix|vector $d
      * @return matrix|vector
      */
-    public function multiply(int|float|matrix|vector $d): matrix|vector {
+    public function multiply(int | float | matrix | vector $d): matrix | vector {
         if ($d instanceof matrix) {
             return $this->multiplyMatrix($d);
         } elseif ($d instanceof self) {
@@ -392,7 +392,7 @@ 
      * @param int|float $s
      * @return vector
      */
-    protected function multiplyScalar(int|float $s): vector {
+    protected function multiplyScalar(int | float $s): vector {
         $vr = $this->copy();
         blas::scale($s, $vr);
         return $vr;
@@ -403,7 +403,7 @@ 
      * @param int|float|matrix|vector $d
      * @return matrix|vector
      */
-    public function add(int|float|matrix|vector $d): matrix|vector {
+    public function add(int | float | matrix | vector $d): matrix | vector {
         if ($d instanceof matrix) {
             return $this->addMatrix($d);
         } elseif ($d instanceof self) {
@@ -450,7 +450,7 @@ 
      * @param int|float $s
      * @return vector
      */
-    protected function addScalar(int|float $s): vector {
+    protected function addScalar(int | float $s): vector {
         $vr = $this->copy();
         for ($i = 0; $i < $this->col; ++$i) {
             $vr->data[$i] += $s;
@@ -463,7 +463,7 @@ 
      * @param int|float|\Np\matrix|\Np\vector $d
      * @return matrix|vector
      */
-    public function pow(int|float|\Np\matrix|\Np\vector $d): matrix|vector {
+    public function pow(int | float | \Np\matrix | \Np\vector $d): matrix | vector {
         if ($d instanceof matrix) {
             return $this->powMatrix($d);
         } elseif ($d instanceof vector) {
@@ -510,7 +510,7 @@ 
      * @param int|float $s
      * @return vector
      */
-    protected function powScalar(int|float $s): vector {
+    protected function powScalar(int | float $s): vector {
         $v = $this->copy();
         for ($i = 0; $i < $this->col; ++$i) {
             $v->data[$i] = $v->data[$i] ** $s;
@@ -523,7 +523,7 @@ 
      * @param int|float|\Np\matrix|\Np\vector $d
      * @return matrix|vector
      */
-    public function mod(int|float|\Np\matrix|\Np\vector $d): matrix|vector {
+    public function mod(int | float | \Np\matrix | \Np\vector $d): matrix | vector {
         if ($d instanceof matrix) {
             return $this->powMatrix($d);
         } elseif ($d instanceof vector) {
@@ -569,7 +569,7 @@ 
      * 
      * @param int|float $s
      */
-    protected function modScalar(int|float $s) {
+    protected function modScalar(int | float $s) {
         $v = $this->copy();
         for ($i = 0; $i < $this->col; ++$i) {
             $v->data[$i] = $v->data[$i] % $s;
@@ -581,7 +581,7 @@ 
      * @param int|float|matrix|vector $d
      * @return matrix|vector
      */
-    public function subtract(int|float|matrix|vector $d): matrix|vector {
+    public function subtract(int | float | matrix | vector $d): matrix | vector {
         if ($d instanceof matrix) {
             return $this->subtractMatrix($d);
         } elseif ($d instanceof self) {
@@ -628,7 +628,7 @@ 
      * @param \Np\vector $scalar
      * @return \Np\vector
      */
-    protected function substractScalar(int|float $scalar): vector {
+    protected function substractScalar(int | float $scalar): vector {
         $vr = self::factory($this->col, $this->dtype);
         for ($i = 0; $i < $this->col; ++$i) {
             $vr->data[$i] = $this->data[$i] - $scalar;
@@ -701,15 +701,15 @@ 
      * 
      * @return int|float
      */
-    public function mean():int|float {
-        return $this->sum()/ $this->col;
+    public function mean():int | float {
+        return $this->sum() / $this->col;
     }
     
     /**
      * 
      * @return int|float
      */
-    public function median():int|float {
+    public function median():int | float {
         $mid = intdiv($this->col, 2);
 
         $a = $this->copy()->sort();
@@ -756,7 +756,7 @@ 
      * set data to vector
      * @param int|float|array $data
      */
-    public function setData(int|float|array $data) {
+    public function setData(int | float | array $data) {
         if (is_array($data) && !is_array($data[0])) {
             for ($i = 0; $i < $this->col; ++$i) {
                 $this->data[$i] = $data[$i];
@@ -796,7 +796,7 @@ 
     }
 
     public function __toString() {
-        return (string) $this->printVector();
+        return (string)$this->printVector();
     }
 
     protected function __construct(public int $col, int $dtype = self::FLOAT) {

src/ops.php

Spacing +11 added lines, -11 removed lines

@@ -19,7 +19,7 @@ 
      * @param matrix|vector $d
      * @return matrix|vector
      */
-    public function max(matrix|vector $d): matrix|vector {
+    public function max(matrix | vector $d): matrix | vector {
         if ($this instanceof matrix && $d instanceof matrix && $this->checkShape($this, $d) && $this->checkDtype($this, $d)) {
             $r = self::factory($this->row, $this->col, $this->dtype);
         } elseif ($this instanceof vector && $d instanceof vector && $this->checkShape($this, $d) && $this->checkDtype($this, $d)) {
@@ -36,7 +36,7 @@ 
      * @param matrix|vector $d
      * @return matrix|vector
      */
-    public function min(matrix|vector $d): matrix|vector {
+    public function min(matrix | vector $d): matrix | vector {
         if ($this instanceof matrix && $d instanceof matrix && $this->checkShape($this, $d) && $this->checkDtype($this, $d)) {
             $r = self::factory($this->row, $this->col, $this->dtype);
         } elseif ($this instanceof vector && $d instanceof vector && $this->checkShape($this, $d) && $this->checkDtype($this, $d)) {
@@ -53,7 +53,7 @@ 
      * @param callable $func
      * @return matrix|vector
      */
-    public function map(callable $func): matrix|vector {
+    public function map(callable $func): matrix | vector {
         if ($this instanceof matrix) {
             $r = self::factory($this->row, $this->col, $this->dtype);
         } else {
@@ -65,23 +65,23 @@ 
         return $r;
     }
 
-    public function abs(): matrix|vector {
+    public function abs(): matrix | vector {
         return $this->map('abs');
     }
 
-    public function sqrt(): matrix|vector {
+    public function sqrt(): matrix | vector {
         return $this->map('sqrt');
     }
 
-    public function exp(): matrix|vector {
+    public function exp(): matrix | vector {
         return $this->map('exp');
     }
 
-    public function exp1(): matrix|vector {
+    public function exp1(): matrix | vector {
         return $this->map('exp1');
     }
 
-    public function log(float $b = M_E): matrix|vector {
+    public function log(float $b = M_E): matrix | vector {
         $ar = $this->copy();
         for ($i = 0; $i < $ar->ndim; ++$i) {
             log($ar->data[$i], $b);
@@ -137,7 +137,7 @@ 
      * make a copy of matrix|vector;
      * @return matrix|vector
      */
-    public function copy(): matrix|vector {
+    public function copy(): matrix | vector {
         return clone $this;
     }
 
@@ -149,7 +149,7 @@ 
      * @param float $max
      * @return matrix
      */
-    public function clip(float $min, float $max): matrix|vector {
+    public function clip(float $min, float $max): matrix | vector {
         if ($this instanceof matrix) {
             $ar = self::factory($this->row, $this->col, $this->dtype);
         } else {
@@ -196,7 +196,7 @@ 
      * @param float $max
      * @return matrix
      */
-    public function clipUpper(float $max): matrix|vector {
+    public function clipUpper(float $max): matrix | vector {
         if ($this instanceof matrix) {
             $ar = self::factory($this->row, $this->col, $this->dtype);
         } else {

src/reductions/rref.php

Braces +4 added lines, -2 removed lines

@@ -26,8 +26,10 @@
         $lead = 0;
         $ar = $m->copy();
         for ($r = 0; $r < $ar->row; ++$r) {
-            if ($lead >= $ar->col)
-                break; {
+            if ($lead >= $ar->col) {
+                            break;
+            }
+            {
                 $i = $r;
                 while ($ar->data[$i * $ar->col + $lead] == 0) {
                     $i++;

src/matrix.php

Spacing +38 added lines, -38 removed lines

@@ -24,9 +24,9 @@ 
  * @email     ghost.jat@gmail.com
  * @copyright (c) 2020-2021, Shubham Chaudhary
  */
-class matrix extends nd{
+class matrix extends nd {
     
-    use ops,linAlg;
+    use ops, linAlg;
     /**
      * create empty 2d matrix for given data type
      * @param int $row  num of rows 
@@ -310,7 +310,7 @@ 
      * @param int|float|matrix|vector $m
      * @return matrix|vector
      */
-    public function multiply(int|float|matrix|vector $m): matrix|vector {
+    public function multiply(int | float | matrix | vector $m): matrix | vector {
         if ($m instanceof self) {
             return $this->multiplyMatrix($m);
         } else if ($m instanceof vector) {
@@ -376,7 +376,7 @@ 
      * @param int|float|matrix|vector $m
      * @return matrix
      */
-    public function sum(int|float|matrix|vector $m): matrix {
+    public function sum(int | float | matrix | vector $m): matrix {
         if ($m instanceof self) {
             return $this->sumMatrix($m);
         } elseif ($m instanceof vector) {
@@ -386,7 +386,7 @@ 
         }
     }
 
-    protected function sumScalar(int|float $s): matrix {
+    protected function sumScalar(int | float $s): matrix {
         $ar = self::factory($this->row, $this->col, $this->dtype);
         for ($i = 0; $i < $this->ndim; ++$i) {
             $ar->data[$i] = $this->data[$i] + $s;
@@ -421,7 +421,7 @@ 
      * @param int|float|matrix|vector $d matrix|$scalar to subtract this matrix
      * @return \Np\matrix
      */
-    public function subtract(int|float|matrix|vector $d): matrix {
+    public function subtract(int | float | matrix | vector $d): matrix {
         if ($d instanceof self) {
             return $this->subtractMatrix($d);
         } elseif ($d instanceof vector) {
@@ -431,7 +431,7 @@ 
         }
     }
 
-    protected function subtractScalar(int|float $s): matrix {
+    protected function subtractScalar(int | float $s): matrix {
         $ar = self::factory($this->row, $this->col, $this->dtype);
         for ($i = 0; $i < $this->ndim; ++$i) {
             $ar->data[$i] = $this->data[$i] - $s;
@@ -460,7 +460,7 @@ 
      * @return matrix
      */
     protected function subtractVector(vector $v): matrix {
-        if ($this->checkDimensions($v, $this) && $this->checkDtype($this,$v)) {
+        if ($this->checkDimensions($v, $this) && $this->checkDtype($this, $v)) {
             $ar = self::factory($this->row, $this->col, $this->dtype);
             for ($i = 0; $i < $this->row; ++$i) {
                 for ($j = 0; $j < $this->col; ++$j) {
@@ -493,7 +493,7 @@ 
      * @param int|float|matrix $d
      * @return matrix
      */
-    public function divide(int|float|matrix|vector $d): matrix {
+    public function divide(int | float | matrix | vector $d): matrix {
         if ($d instanceof self) {
             return $this->divideMatrix($d);
         } elseif ($d instanceof vector) {
@@ -525,7 +525,7 @@ 
         }
     }
 
-    protected function divideScalar(int|float $s): matrix {
+    protected function divideScalar(int | float $s): matrix {
         $ar = self::factory($this->row, $this->col, $this->dtype);
         for ($i = 0; $i < $this->ndim; ++$i) {
             $ar->data[$i] = $this->data[$i] / $s;
@@ -540,7 +540,7 @@ 
      * @param int|float|matrix $m
      * @return matrix
      */
-    public function pow(int|float|matrix|vector $d): matrix {
+    public function pow(int | float | matrix | vector $d): matrix {
         if ($d instanceof self) {
             return $this->powMatrix($d);
         } else if ($d instanceof vector) {
@@ -572,7 +572,7 @@ 
         }
     }
 
-    protected function powScalar(int|float $s): matrix {
+    protected function powScalar(int | float $s): matrix {
         $ar = $this->copy();
         for ($i = 0; $i < $this->ndim; ++$i) {
             $ar->data[$i] **= $s;
@@ -585,7 +585,7 @@ 
      * @param int|float|matrix|vector $d
      * @return matrix
      */
-    public function mod(int|float|matrix|vector $d): matrix {
+    public function mod(int | float | matrix | vector $d): matrix {
         if ($d instanceof self) {
             $this->modMatrix($d);
         } else if ($d instanceof vector) {
@@ -617,7 +617,7 @@ 
         }
     }
 
-    protected function modScalar(int|float $s): matrix {
+    protected function modScalar(int | float $s): matrix {
         $ar = $this->copy();
         for ($i = 0; $i < $this->ndim; ++$i) {
             $ar->data[$i] %= $s;
@@ -729,7 +729,7 @@ 
      * @param int|float $scalar
      * @return matrix
      */
-    public function scale(int|float $scalar): matrix {
+    public function scale(int | float $scalar): matrix {
         if ($scalar == 0) {
             return self::zeros($this->row, $this->col, $this->dtype);
         }
@@ -747,7 +747,7 @@ 
      * @param int $row
      * @param int|float $c
      */
-    public function scaleRow(int $row, int|float $c) {
+    public function scaleRow(int $row, int | float $c) {
         for ($i = 0; $i < $this->col; ++$i) {
             $this->data[$row * $this->col + $i] *= $c;
         }
@@ -758,7 +758,7 @@ 
      * @param int $col
      * @param int|float $c
      */
-    public function scaleCol(int $col, int|float $c) {
+    public function scaleCol(int $col, int | float $c) {
         for ($i = 0; $i < $this->row; ++$i) {
             $this->data[$i * $this->col + $col] *= $c;
         }
@@ -769,14 +769,14 @@ 
      * @param int|float $c
      * @param bool $lDig
      */
-    public function scaleDigonalCol(int|float $c, bool $lDig = true) {
-        if($lDig){
-            for ($i = 0; $i < $this->row ; ++$i) {
+    public function scaleDigonalCol(int | float $c, bool $lDig = true) {
+        if ($lDig) {
+            for ($i = 0; $i < $this->row; ++$i) {
                 $this->data[$i * $this->col + $i] *= $c;
             }
         }
-        else{
-            for ($i = $this->row; $i > 0 ; --$i) {
+        else {
+            for ($i = $this->row; $i > 0; --$i) {
                 $this->data[$i * $this->col - $i] *= $c;
             }
         }
@@ -823,7 +823,7 @@ 
      * @return matrix
      */
     public function joinRight(matrix $m): matrix {
-        if ($this->row != $m->row && !$this->checkDtype($this,$m)) {
+        if ($this->row != $m->row && !$this->checkDtype($this, $m)) {
             self::_err('Error::Invalid size! or DataType!');
         }
         $col = $this->col + $m->col;
@@ -889,7 +889,7 @@ 
      *
      * @return matrix|null
      */
-    public function ref(): matrix|null {
+    public function ref(): matrix | null {
         return ref::factory($this);
     }
 
@@ -898,7 +898,7 @@ 
      *
      * @return matrix|null
      */
-    public function cholesky(): matrix|null {
+    public function cholesky(): matrix | null {
         return cholesky::factory($this);
     }
 
@@ -973,7 +973,7 @@ 
      * @param bool $dignoal
      * @return void
      */
-    public function setData(int|float|array $data, bool $dignoal = false): void {
+    public function setData(int | float | array $data, bool $dignoal = false): void {
         if ($dignoal == false) {
             if (is_array($data) && is_array($data[0])) {
                 $f = $this->flattenArray($data);
@@ -1005,7 +1005,7 @@ 
      * @return object
      */
     public function getShape(): object {
-        return (object) ['m' => $this->row, 'n' => $this->col];
+        return (object)['m' => $this->row, 'n' => $this->col];
     }
 
     /**
@@ -1187,7 +1187,7 @@ 
      * @param vector|null $mean
      * @return vector
      */
-    public function variance(vector|null $mean = null): vector {
+    public function variance(vector | null $mean = null): vector {
         if (isset($mean)) {
             if (!$mean instanceof vector) {
                 self::_invalidArgument('mean must be a vector!');
@@ -1229,7 +1229,7 @@ 
      * @param vector|null $mean
      * @return matrix
      */
-    public function covariance(vector|null $mean = null): matrix {
+    public function covariance(vector | null $mean = null): matrix {
         if (isset($mean)) {
             if ($mean->col !== $this->row) {
                 self::_err('Err:: given mean vector dimensionality mismatched!');
@@ -1257,7 +1257,7 @@ 
      * @param int|float|matrix|vector $d
      * @return matrix
      */
-    public function equal(int|float|matrix|vector $d): matrix {
+    public function equal(int | float | matrix | vector $d): matrix {
         if ($d instanceof self) {
             return $this->equalMatrix($d);
         } elseif ($d instanceof vector) {
@@ -1289,7 +1289,7 @@ 
         }
     }
 
-    protected function equalScalar(int|float $s): matrix {
+    protected function equalScalar(int | float $s): matrix {
         $ar = self::factory($this->row, $this->col, $this->dtype);
         for ($i = 0; $i < $this->ndim; ++$i) {
             $ar->data[$i] = $this->data[$i] == $s ? 1 : 0;
@@ -1302,7 +1302,7 @@ 
      * @param int|float|matrix|vector $d
      * @return matrix
      */
-    public function greater(int|float|matrix|vector $d): matrix {
+    public function greater(int | float | matrix | vector $d): matrix {
         if ($d instanceof self) {
             return $this->greaterMatrix($d);
         } elseif ($d instanceof vector) {
@@ -1313,7 +1313,7 @@ 
     }
 
     protected function greaterMatrix(matrix $m): matrix {
-        if ($this->checkShape($this, $m) && $this->checkDtype($this,$m)) {
+        if ($this->checkShape($this, $m) && $this->checkDtype($this, $m)) {
             $ar = self::factory($this->row, $this->col, $this->dtype);
             for ($i = 0; $i < $this->ndim; ++$i) {
                 $ar->data[$i] = $this->data[$i] > $m->data[$i] ? 1 : 0;
@@ -1323,7 +1323,7 @@ 
     }
 
     protected function greaterVector(vector $v): matrix {
-        if ($this->checkDimensions($v, $this) && $this->checkDtype($this,$v)) {
+        if ($this->checkDimensions($v, $this) && $this->checkDtype($this, $v)) {
             $ar = self::factory($this->row, $this->col, $this->dtype);
             for ($i = 0; $i < $this->row; ++$i) {
                 for ($j = 0; $j < $this->col; ++$j) {
@@ -1334,7 +1334,7 @@ 
         }
     }
 
-    protected function greaterScalar(int|float $s): matrix {
+    protected function greaterScalar(int | float $s): matrix {
         $ar = self::factory($this->row, $this->col, $this->dtype);
         for ($i = 0; $i < $this->ndim; ++$i) {
             $ar->data[$i] = $this->data[$i] > $s ? 1 : 0;
@@ -1347,10 +1347,10 @@ 
      * @param int|float|matrix $m
      * @return matrix
      */
-    public function less(int|float|matrix $m): matrix {
+    public function less(int | float | matrix $m): matrix {
         $ar = self::factory($this->row, $this->col, $this->dtype);
         if ($m instanceof self) {
-            if ($this->checkShape($this,$m)) {
+            if ($this->checkShape($this, $m)) {
                 for ($i = 0; $i < $this->ndim; ++$i) {
                     $ar->data[$i] = $this->data[$i] < $m->data[$i] ? 1 : 0;
                 }
@@ -1398,7 +1398,7 @@ 
     }
 
     public function __toString() {
-        return (string) $this->printMatrix();
+        return (string)$this->printMatrix();
     }
 
     private function flattenArray(array $ar) {

src/linAlg.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
      * @param \Np\matrix|\Np\vector $d
      * @return matrix|vector
      */
-    public function dot(matrix|vector $d): matrix|vector {
+    public function dot(matrix | vector $d): matrix | vector {
         if ($this instanceof matrix) {
             if ($d instanceof self) {
                 return $this->dotMatrix($d);
@@ -43,7 +43,7 @@ 
      * @return \Np\matrix
      */
     protected function dotMatrix(matrix $matrix): matrix {
-        if ($this->checkDtype($this, $matrix) && $this->checkDimensions($this,$matrix)) {
+        if ($this->checkDtype($this, $matrix) && $this->checkDimensions($this, $matrix)) {
             $ar = self::factory($this->row, $this->col, $this->dtype);
             blas::gemm($this, $matrix, $ar);
             return $ar;
@@ -91,7 +91,7 @@ 
      * Compute the (Moore-Penrose) pseudo inverse of the general matrix.
      * @return matrix|null
      */
-    public function pseudoInverse(): matrix|null {
+    public function pseudoInverse(): matrix | null {
         $k = min($this->row, $this->col);
         $s = vector::factory($k, $this->dtype);
         $u = self::factory($this->row, $this->row, $this->dtype);