php-ai / php-ml

src/Phpml/Classification/Ensemble/Bagging.php

Doc Comments +1 added lines

@@ -114,6 +114,7 @@
     }
 
     /**
+     * @param integer $index
      * @return array
      */
     protected function getRandomSubset($index)

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/Ensemble/RandomForest.php

Unused Use Statements -2 removed lines

@@ -4,8 +4,6 @@
 namespace Phpml\Classification\Ensemble;
 
 use Phpml\Classification\Ensemble\Bagging;
-use Phpml\Classification\DecisionTree;
-use Phpml\Classification\NaiveBayes;
 
 class RandomForest extends Bagging
 {

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Phpml\Classification\Ensemble;
 
@@ -35,7 +35,7 @@ 
     {
         list($subset, $targets) = parent::getRandomSubset($index);
 
-        $featureCount = (int)ceil($this->featureSubsetRatio * $this->featureCount);
+        $featureCount = (int) ceil($this->featureSubsetRatio * $this->featureCount);
         if ($featureCount >= $this->featureCount) {
             $featureCount = $this->featureCount;
         }
@@ -49,7 +49,7 @@ 
         foreach ($features as $colIndex) {
             $columns[] = array_column($subset, $colIndex);
         }
-        $subset= array_map(null, ...$columns);
+        $subset = array_map(null, ...$columns);
 
         return [$subset, $targets];
     }
@@ -61,7 +61,7 @@ 
     protected function predictSample(array $sample)
     {
         $predictions = [];
-        for ($i=0; $i<count($this->classifiers); $i++) {
+        for ($i = 0; $i < count($this->classifiers); $i++) {
             $samplePiece = [];
             foreach ($this->classifierColumns[$i] as $colIndex) {
                 $samplePiece[] = $sample[$colIndex];

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 +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Phpml\Classification;
 
@@ -76,7 +76,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;
@@ -96,7 +96,7 @@ 
             $this->actualDepth = $depth;
         }
         $leftRecords = [];
-        $rightRecords= [];
+        $rightRecords = [];
         $remainingTargets = [];
         $prevRecord = null;
         $allSame = true;
@@ -109,10 +109,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;
             }
         }
@@ -127,7 +127,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;
@@ -144,7 +144,7 @@ 
         $samples = array_combine($records, $this->preprocess($samples));
         $bestGiniVal = 1;
         $bestSplit = null;
-        for ($i=0; $i<$this->featureCount; $i++) {
+        for ($i = 0; $i < $this->featureCount; $i++) {
             $colValues = [];
             foreach ($samples as $index => $row) {
                 $colValues[$index] = $row[$i];
@@ -183,7 +183,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) {
@@ -205,7 +205,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>';
         }