rdorado / site-analyzer

src/Configuration.php

Spacing +1 added lines, -1 removed lines

@@ -197,7 +197,7 @@
      */
     private static function getStringParameter($config, $section, $name)
     {    
-        return isset($config[$section][$name]) ?  $config[$section][$name] : NULL;
+        return isset($config[$section][$name]) ? $config[$section][$name] : NULL;
     }
     
     /*

src/Matrix.php

Braces +24 added lines, -8 removed lines

@@ -24,10 +24,14 @@ 
     public static function submatrix($matrix, $columns)
     {
         $n = count($matrix);
-        if ($n == 0) return [];
+        if ($n == 0) {
+            return [];
+        }
        
         $m = count($matrix[0]);
-        if ($m == 0) return $matrix;
+        if ($m == 0) {
+            return $matrix;
+        }
        
         $result = [];       
         for ($i=0; $i<$n; $i++) {
@@ -47,7 +51,9 @@ 
     public static function toSquareMatrix($matrix, $ncol, $mcol, $vcol, $sparse = False)
     {
         $n = count($matrix);
-        if ($n == 0) return [];
+        if ($n == 0) {
+            return [];
+        }
         
         $labels = [];
         $id = 0;
@@ -64,7 +70,9 @@ 
             $val = $matrix[$i][$vcol];
             $data[] = [$nid, $mid, $val];
         }
-        if ($sparse) return ["data" => $data, "labels" => $labels];
+        if ($sparse) {
+            return ["data" => $data, "labels" => $labels];
+        }
         $nlab = count($labels);
         $result = [];
         for ($i=0; $i<$nlab; $i++) {           
@@ -84,7 +92,9 @@ 
     {
         $result = [];
         $n = count($matrix1);        
-        if ($n != count($matrix2)) throw new \Exception("Summing non compatible matrices. ");
+        if ($n != count($matrix2)) {
+            throw new \Exception("Summing non compatible matrices. ");
+        }
         $m = count($matrix1[0]);
         for ($i=0;$i<$n;$i++) {
             $tmp = [];
@@ -107,7 +117,9 @@ 
         $n2 = count($matrix2);        
         $m2 = count($matrix2[0]);
         
-        if ($n2 !== $m1) throw new \Exception("Incompatible matrices: matrix1.columns != matrix2.rows");
+        if ($n2 !== $m1) {
+            throw new \Exception("Incompatible matrices: matrix1.columns != matrix2.rows");
+        }
 
         $result = [];
         for ($i=0; $i<$n1; $i++) {           
@@ -154,9 +166,13 @@ 
      */
     public static function power($matrix, $n)
     {
-        if($n <= 1) return $matrix;        
+        if($n <= 1) {
+            return $matrix;
+        }
         $resp = self::multiply($matrix, $matrix);
-        if($n == 2) return $resp;
+        if($n == 2) {
+            return $resp;
+        }
         for($i=2; $i<$n; $i++) {
             $resp = self::multiply($resp, $matrix);
         }

Spacing +22 added lines, -22 removed lines

@@ -24,13 +24,13 @@ 
     public static function submatrix($matrix, $columns)
     {
         $n = count($matrix);
-        if ($n == 0) return [];
+        if ($n==0) return [];
        
         $m = count($matrix[0]);
-        if ($m == 0) return $matrix;
+        if ($m==0) return $matrix;
        
         $result = [];       
-        for ($i=0; $i<$n; $i++) {
+        for ($i = 0; $i < $n; $i++) {
             $tmp = [];
             foreach ($columns as $col) {
                 $tmp[] = $matrix[$i][$col];
@@ -47,17 +47,17 @@ 
     public static function toSquareMatrix($matrix, $ncol, $mcol, $vcol, $sparse = False)
     {
         $n = count($matrix);
-        if ($n == 0) return [];
+        if ($n==0) return [];
         
         $labels = [];
         $id = 0;
         $data = [];
-        for ($i=0; $i<$n; $i++) {  
-            if (!array_key_exists($matrix[$i][$ncol],$labels)) {
+        for ($i = 0; $i < $n; $i++) {  
+            if (!array_key_exists($matrix[$i][$ncol], $labels)) {
                 $labels[$matrix[$i][$ncol]] = $id++;
             }      
             $nid = $labels[$matrix[$i][$ncol]];
-            if (!array_key_exists($matrix[$i][$mcol],$labels)) {
+            if (!array_key_exists($matrix[$i][$mcol], $labels)) {
                 $labels[$matrix[$i][$mcol]] = $id++;
             }
             $mid = $labels[$matrix[$i][$mcol]];
@@ -67,7 +67,7 @@ 
         if ($sparse) return ["data" => $data, "labels" => $labels];
         $nlab = count($labels);
         $result = [];
-        for ($i=0; $i<$nlab; $i++) {           
+        for ($i = 0; $i < $nlab; $i++) {           
             $tmp = array_fill(0, $nlab, 0);
             $result[] = $tmp;
         }
@@ -84,11 +84,11 @@ 
     {
         $result = [];
         $n = count($matrix1);        
-        if ($n != count($matrix2)) throw new \Exception("Summing non compatible matrices. ");
+        if ($n!=count($matrix2)) throw new \Exception("Summing non compatible matrices. ");
         $m = count($matrix1[0]);
-        for ($i=0;$i<$n;$i++) {
+        for ($i = 0; $i < $n; $i++) {
             $tmp = [];
-            for($j=0;$j<$m;$j++) {
+            for ($j = 0; $j < $m; $j++) {
                 $tmp[] = $matrix1[$i][$j] + $matrix2[$i][$j];
             }
             $result[] = $tmp;
@@ -107,16 +107,16 @@ 
         $n2 = count($matrix2);        
         $m2 = count($matrix2[0]);
         
-        if ($n2 !== $m1) throw new \Exception("Incompatible matrices: matrix1.columns != matrix2.rows");
+        if ($n2!==$m1) throw new \Exception("Incompatible matrices: matrix1.columns != matrix2.rows");
 
         $result = [];
-        for ($i=0; $i<$n1; $i++) {           
+        for ($i = 0; $i < $n1; $i++) {           
             $result[] = array_fill(0, $m2, 0);                    
         }
-        for ($i=0; $i<$n1; $i++) {
-            for ($j=0; $j<$m2; $j++) {
-                 for ($k=0; $k<$n2; $k++) {
-                     $result[$i][$j] += $matrix1[$i][$k]*$matrix2[$k][$j];
+        for ($i = 0; $i < $n1; $i++) {
+            for ($j = 0; $j < $m2; $j++) {
+                 for ($k = 0; $k < $n2; $k++) {
+                     $result[$i][$j] += $matrix1[$i][$k] * $matrix2[$k][$j];
                  }
             }
         }        
@@ -131,7 +131,7 @@ 
         foreach ($matrix as $row) {
             $tmp = [];
             foreach ($row as $dat) {
-                $tmp[] = $dat == 0 ? 0 : 1;
+                $tmp[] = $dat==0 ? 0 : 1;
             }
             $resp[] = $tmp;
         }
@@ -154,10 +154,10 @@ 
      */
     public static function power($matrix, $n)
     {
-        if($n <= 1) return $matrix;        
+        if ($n <= 1) return $matrix;        
         $resp = self::multiply($matrix, $matrix);
-        if($n == 2) return $resp;
-        for($i=2; $i<$n; $i++) {
+        if ($n==2) return $resp;
+        for ($i = 2; $i < $n; $i++) {
             $resp = self::multiply($resp, $matrix);
         }
         return $resp;
@@ -169,7 +169,7 @@ 
     public static function sumArray($array1, $array2) {
         $resp = [];
         $n = min([count($array1), count($array2)]);
-        for ($i=0;$i<$n;$i++){
+        for ($i = 0; $i < $n; $i++) {
             $resp[] = $array1[$i] + $array2[$i];
         }
         return $resp;

Indentation +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
     {
         $resp = [];
         foreach ($matrix as $row) {
-           $resp[] = $row[$col];
+            $resp[] = $row[$col];
         }
         return $resp;
     }
@@ -127,9 +127,9 @@ 
         }
         for ($i=0; $i<$n1; $i++) {
             for ($j=0; $j<$m2; $j++) {
-                 for ($k=0; $k<$n2; $k++) {
-                     $result[$i][$j] += $matrix1[$i][$k]*$matrix2[$k][$j];
-                 }
+                    for ($k=0; $k<$n2; $k++) {
+                        $result[$i][$j] += $matrix1[$i][$k]*$matrix2[$k][$j];
+                    }
             }
         }        
         return $result;

src/Persistence.php

Spacing +3 added lines, -3 removed lines

@@ -175,7 +175,7 @@ 
      * @param $config Configuration
      *
      */
-    public static function getCountsFromTest($pdo, $config, $tests){
+    public static function getCountsFromTest($pdo, $config, $tests) {
         $resp = [];
         foreach ($tests as $test) {
             $counts = self::getCountsById($pdo, $config, $test[0]);
@@ -189,7 +189,7 @@ 
      * @param $config Configuration
      *
      */
-    public static function getFromByTest($pdo, $config, $tests){
+    public static function getFromByTest($pdo, $config, $tests) {
         $resp = [];
         foreach ($tests as $test) {
             $counts = FromDAO::findByFromById($pdo, $config, $test[1][1], $test[1][0]);
@@ -274,7 +274,7 @@ 
      * @param $config Configuration
      *
      */
-    public static function findIdByTimeUser($pdo, $config, $by=[]) {
+    public static function findIdByTimeUser($pdo, $config, $by = []) {
         return OptionsDAO::findIdByTimeUser($pdo, $config, $by);
     }
     

Braces +3 added lines, -1 removed lines

@@ -179,7 +179,9 @@
         $resp = [];
         foreach ($tests as $test) {
             $counts = self::getCountsById($pdo, $config, $test[0]);
-            if (count($counts) > 0) $resp[] = $counts;            
+            if (count($counts) > 0) {
+                $resp[] = $counts;
+            }
         }   
         return $resp;
     }

src/FromDAO.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
         $dbFromtable = $config->getFromTableName();
         $qdata = [$id];
         $tquery = "SELECT f.* FROM $dbFromtable f WHERE f.id = ?";
-        if ($from_id != null) {
+        if ($from_id!=null) {
             $tquery = $tquery." AND f.from_id = ?";
             $qdata[] = $from_id;
         }

src/SiteAnalyzer.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
      */
     public static function getPDO($config, $options)
     {
-        if (array_key_exists("pdo",$options)) {
+        if (array_key_exists("pdo", $options)) {
             return $options["pdo"];
         }         
         return  Persistence::getPDO($config);
@@ -185,7 +185,7 @@ 
         }
         
         $result = $data;
-        for ($i=1;$i<$level;$i++) {
+        for ($i = 1; $i < $level; $i++) {
             $tmp = Matrix::multiply($result, $data);
             $result = Matrix::sum($result, $tmp);
         }
@@ -218,7 +218,7 @@ 
         }
         
         $result = $data;
-        for ($i=1;$i<$level;$i++) {
+        for ($i = 1; $i < $level; $i++) {
             $tmp = Matrix::multiply($result, $data);
             $result = Matrix::sum($result, $tmp);
         }

Braces +2 added lines, -4 removed lines

@@ -179,8 +179,7 @@ 
         
         if (array_key_exists("level", $options)) {
             $level = $options["level"];
-        }
-        else {
+        } else {
             $level = count($labels) - 1;
         }
         
@@ -212,8 +211,7 @@ 
         
         if (array_key_exists("level", $options)) {
             $level = $options["level"];
-        }
-        else {
+        } else {
             $level = count($labels) - 1;
         }
         

src/Statistics.php

Spacing +5 added lines, -5 removed lines

@@ -26,14 +26,14 @@
     public static function ABtest($testCounts, $targetCounts, $options)
     {
         $ntotal = 0;
-        $resp  = [];
-        foreach($testCounts as $testCount) {
+        $resp = [];
+        foreach ($testCounts as $testCount) {
             $ntotal += $testCount[1];
         }
-        foreach($testCounts as $testCount) {
+        foreach ($testCounts as $testCount) {
             foreach ($targetCounts as $targetCount) {
-                if ($testCount[0] === $targetCount[1]) {
-                    $resp[] = [$testCount[0], $testCount[1], $testCount[1]/$ntotal, $targetCount[2], $targetCount[2]/$testCount[1],$targetCount[2]/$ntotal];
+                if ($testCount[0]===$targetCount[1]) {
+                    $resp[] = [$testCount[0], $testCount[1], $testCount[1] / $ntotal, $targetCount[2], $targetCount[2] / $testCount[1], $targetCount[2] / $ntotal];
                 }                
             }
             

src/ML.php

Indentation +6 added lines, -6 removed lines

@@ -122,12 +122,12 @@
      * @param
      */
     public static function eclideanDistance($p1, $p2) {
-       $len = count($p1);
-       $acum = 0;
-       for($i=0; $i<$len; $i++) {
-           $acum += ($p1[$i] - $p2[$i])**2;
-       }
-       return sqrt($acum);
+        $len = count($p1);
+        $acum = 0;
+        for($i=0; $i<$len; $i++) {
+            $acum += ($p1[$i] - $p2[$i])**2;
+        }
+        return sqrt($acum);
     }
     
 }

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
         $niter = 0;
         $maxiter = 100;
         $npoints = count($data);
-        if ($npoints <= 0) throw new \Exception("Not enough data. ");    
+        if ($npoints <= 0) {
+            throw new \Exception("Not enough data. ");
+        }
         $ndimensions = count($data[0]);
         $centroids = [];
         for ($i=0;$i<$nclusters;$i++){

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
         if ($npoints <= 0) throw new \Exception("Not enough data. ");    
         $ndimensions = count($data[0]);
         $centroids = [];
-        for ($i=0;$i<$nclusters;$i++){
+        for ($i = 0; $i < $nclusters; $i++) {
             $centroids[] = $data[$i];
         }
         //$centroids = self::initCentroids($nclusters, $ndimensions, function(){return rand(0,100)/100;});   
@@ -47,7 +47,7 @@ 
                 $bdist = INF;
                 for ($i = 0; $i < $nclusters; $i++) {
                     $ndist = self::eclideanDistance($data[$j], $centroids[$i]);
-                    if($bdist > $ndist) {
+                    if ($bdist > $ndist) {
                         $bdist = $ndist;
                         $best = $i;
                     }            
@@ -59,7 +59,7 @@ 
             // Check change 
             $finished = true;
             if (count($resp) > 0) {
-                for ($j=0; $j < $npoints; $j++) {        
+                for ($j = 0; $j < $npoints; $j++) {        
                     if ($resp[$j]!==$nresp[$j]) {
                         $finished = false;
                         break;
@@ -71,7 +71,7 @@ 
             $resp = $nresp;
             
             // Recalculate the centroids
-            $centroids = self::initCentroids($nclusters, $ndimensions, function(){return 0;});
+            $centroids = self::initCentroids($nclusters, $ndimensions, function() {return 0; });
             $counts = array_fill(0, $nclusters, 0);
             for ($j = 0; $j < $npoints; $j++) {    
                 $centroids[$resp[$j]] = Matrix::sumArray($centroids[$resp[$j]], $data[$j]);
@@ -91,10 +91,10 @@ 
         $resp = [];
         $n = count($centroids);
         $d = count($centroids[0]);
-        for ($i=0;$i<$n;$i++) {
+        for ($i = 0; $i < $n; $i++) {
             $tmp = [];
-            for ($j=0;$j<$d;$j++){
-                $tmp[] = $centroids[$i][$j]/$counts[$i];
+            for ($j = 0; $j < $d; $j++) {
+                $tmp[] = $centroids[$i][$j] / $counts[$i];
             }
             $resp[] = $tmp;
         }
@@ -123,7 +123,7 @@ 
     public static function eclideanDistance($p1, $p2) {
        $len = count($p1);
        $acum = 0;
-       for($i=0; $i<$len; $i++) {
+       for ($i = 0; $i < $len; $i++) {
            $acum += ($p1[$i] - $p2[$i])**2;
        }
        return sqrt($acum);

src/CategoricalDataset.php

Spacing +9 added lines, -9 removed lines

@@ -60,7 +60,7 @@ 
         $array = sort($array);
         $this->encodedValues = [];
         $this->sortedEncodedFeatures = $array;
-        foreach($this->sortedEncodedFeatures as $col){
+        foreach ($this->sortedEncodedFeatures as $col) {
             $vals = $this->getUniqueValues($col);
             $this->encodedValues[] = $vals;
             $this->featIndexMap[$col] = count($vals);
@@ -92,7 +92,7 @@ 
     private function encodeFeature($size) 
     {
         $resp = [];
-        for ($i=0;$i<$size;$i++) {
+        for ($i = 0; $i < $size; $i++) {
             $tmp = array_fill(0, $size, 0);
             $tmp[$i] = 1;  
             $resp[] = $tmp;
@@ -103,20 +103,20 @@ 
     /*
      * @param
      */  
-    public function encode(){
-        $transformer  = [];
+    public function encode() {
+        $transformer = [];
         $n = count($this->data);
         $ndim = count($this->data[0]);
-        for ($j=0; $j<$ndim; $j++) {
-            $transformer[] = function($val){ return [$val]; };
+        for ($j = 0; $j < $ndim; $j++) {
+            $transformer[] = function($val) { return [$val]; };
         }
-        foreach($this->sortedEncodedFeatures as $col) {
+        foreach ($this->sortedEncodedFeatures as $col) {
             $transformer[$col] = function($val) { return $this->featEncode[$col][$val]; };
         }
         $ndata = [];
-        for ($i=0; $i<$n; $i++) {
+        for ($i = 0; $i < $n; $i++) {
             $npoint = [];
-            for ($j=0; $j<$ndim; $j++) {
+            for ($j = 0; $j < $ndim; $j++) {
                 $npoint += $transformer[$j]($data[$i][$j]);
             }
             $ndata[] = $npoint;