php-ai / php-ml

src/Phpml/Classification/Ensemble/Bagging.php

Unused Use Statements -2 removed lines

@@ -6,10 +6,8 @@
 
 use Phpml\Helper\Predictable;
 use Phpml\Helper\Trainable;
-use Phpml\Math\Statistic\Mean;
 use Phpml\Classification\Classifier;
 use Phpml\Classification\DecisionTree;
-use Phpml\Classification\NaiveBayes;
 
 class Bagging implements Classifier
 {

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Phpml\Classification\Ensemble;
 
@@ -118,13 +118,13 @@ 
      */
     protected function getRandomSubset($index)
     {
-        $subsetLength = (int)ceil(sqrt($this->numSamples));
+        $subsetLength = (int) ceil(sqrt($this->numSamples));
         $denom = $this->subsetRatio / 2;
         $subsetLength = $this->numSamples / (1 / $denom);
         $index = $index * $subsetLength % $this->numSamples;
         $samples = [];
         $targets = [];
-        for ($i=0; $i<$subsetLength * 2; $i++) {
+        for ($i = 0; $i < $subsetLength * 2; $i++) {
             $rand = rand($index, $this->numSamples - 1);
             $samples[] = $this->samples[$rand];
             $targets[] = $this->targets[$rand];
@@ -138,7 +138,7 @@ 
     protected function initClassifiers()
     {
         $classifiers = [];
-        for ($i=0; $i<$this->numClassifier; $i++) {
+        for ($i = 0; $i < $this->numClassifier; $i++) {
             $ref = new \ReflectionClass($this->classifier);
             if ($this->classifierOptions) {
                 $obj = $ref->newInstanceArgs($this->classifierOptions);

src/Phpml/Classification/DecisionTree.php

Doc Comments +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 
     /**
      * @param array $records
-     * @return DecisionTreeLeaf[]
+     * @return null|DecisionTreeLeaf
      */
     protected function getBestSplit($records)
     {

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Phpml\Classification;
 
@@ -81,7 +81,7 @@ 
     protected function getColumnTypes(array $samples)
     {
         $types = [];
-        for ($i=0; $i<$this->featureCount; $i++) {
+        for ($i = 0; $i < $this->featureCount; $i++) {
             $values = array_column($samples, $i);
             $isCategorical = $this->isCategoricalColumn($values);
             $types[] = $isCategorical ? self::NOMINAL : self::CONTINUOS;
@@ -101,7 +101,7 @@ 
             $this->actualDepth = $depth;
         }
         $leftRecords = [];
-        $rightRecords= [];
+        $rightRecords = [];
         $remainingTargets = [];
         $prevRecord = null;
         $allSame = true;
@@ -114,10 +114,10 @@ 
             if ($split->evaluate($record)) {
                 $leftRecords[] = $recordNo;
             } else {
-                $rightRecords[]= $recordNo;
+                $rightRecords[] = $recordNo;
             }
             $target = $this->targets[$recordNo];
-            if (! in_array($target, $remainingTargets)) {
+            if (!in_array($target, $remainingTargets)) {
                 $remainingTargets[] = $target;
             }
         }
@@ -132,7 +132,7 @@ 
                 $split->leftLeaf = $this->getSplitLeaf($leftRecords, $depth + 1);
             }
             if ($rightRecords) {
-                $split->rightLeaf= $this->getSplitLeaf($rightRecords, $depth + 1);
+                $split->rightLeaf = $this->getSplitLeaf($rightRecords, $depth + 1);
             }
         }
         return $split;
@@ -210,7 +210,7 @@ 
             $countMatrix[$label][$rowIndex]++;
         }
         $giniParts = [0, 0];
-        for ($i=0; $i<=1; $i++) {
+        for ($i = 0; $i <= 1; $i++) {
             $part = 0;
             $sum = array_sum(array_column($countMatrix, $i));
             if ($sum > 0) {
@@ -232,7 +232,7 @@ 
         // Detect and convert continuous data column values into
         // discrete values by using the median as a threshold value
         $columns = [];
-        for ($i=0; $i<$this->featureCount; $i++) {
+        for ($i = 0; $i < $this->featureCount; $i++) {
             $values = array_column($samples, $i);
             if ($this->columnTypes[$i] == self::CONTINUOS) {
                 $median = Mean::median($values);

src/Phpml/Classification/DecisionTree/DecisionTreeLeaf.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Phpml\Classification\DecisionTree;
 
@@ -25,7 +25,7 @@ 
     /**
      * @var DecisionTreeLeaf
      */
-    public $rightLeaf= null;
+    public $rightLeaf = null;
 
     /**
      * @var array
@@ -64,7 +64,7 @@ 
         $recordField = $record[$this->columnIndex];
         if (is_string($this->value) && preg_match("/^([<>=]{1,2})\s*(.*)/", $this->value, $matches)) {
             $op = $matches[1];
-            $value= floatval($matches[2]);
+            $value = floatval($matches[2]);
             $recordField = strval($recordField);
             eval("\$result = $recordField $op $value;");
             return $result;
@@ -79,25 +79,25 @@ 
         } else {
             $value = $this->value;
             $col = "col_$this->columnIndex";
-            if (! preg_match("/^[<>=]{1,2}/", $value)) {
+            if (!preg_match("/^[<>=]{1,2}/", $value)) {
                 $value = "=$value";
             }
-            $value = "<b>$col $value</b><br>Gini: ". number_format($this->giniIndex, 2);
+            $value = "<b>$col $value</b><br>Gini: ".number_format($this->giniIndex, 2);
         }
         $str = "<table ><tr><td colspan=3 align=center style='border:1px solid;'>
 				$value</td></tr>";
         if ($this->leftLeaf || $this->rightLeaf) {
-            $str .='<tr>';
+            $str .= '<tr>';
             if ($this->leftLeaf) {
-                $str .="<td valign=top><b>| Yes</b><br>$this->leftLeaf</td>";
+                $str .= "<td valign=top><b>| Yes</b><br>$this->leftLeaf</td>";
             } else {
-                $str .='<td></td>';
+                $str .= '<td></td>';
             }
-            $str .='<td>&nbsp;</td>';
+            $str .= '<td>&nbsp;</td>';
             if ($this->rightLeaf) {
-                $str .="<td valign=top align=right><b>No |</b><br>$this->rightLeaf</td>";
+                $str .= "<td valign=top align=right><b>No |</b><br>$this->rightLeaf</td>";
             } else {
-                $str .='<td></td>';
+                $str .= '<td></td>';
             }
             $str .= '</tr>';
         }

src/Phpml/Classification/Ensemble/RandomForest.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Phpml\Classification\Ensemble;
 
@@ -70,11 +70,11 @@ 
     protected function initSingleClassifier($classifier, $index)
     {
         if (is_float($this->featureSubsetRatio)) {
-            $featureCount = (int)($this->featureSubsetRatio * $this->featureCount);
+            $featureCount = (int) ($this->featureSubsetRatio * $this->featureCount);
         } elseif ($this->featureCount == 'sqrt') {
-            $featureCount = (int)sqrt($this->featureCount) + 1;
+            $featureCount = (int) sqrt($this->featureCount) + 1;
         } else {
-            $featureCount = (int)log($this->featureCount, 2) + 1;
+            $featureCount = (int) log($this->featureCount, 2) + 1;
         }
 
         if ($featureCount >= $this->featureCount) {