rdorado / site-analyzer

src/CategoricalDataset.php

Spacing +13 added lines, -13 removed lines

@@ -21,11 +21,11 @@ 
     /*
      * @param
      */    
-    function setEncodedFeatures($array){
+    function setEncodedFeatures($array) {
         $array = sort($array);
         $this->encodedValues = [];
         $this->sortedEncodedFeatures = $array;
-        foreach($this->sortedEncodedFeatures as $feat){
+        foreach ($this->sortedEncodedFeatures as $feat) {
             $vals = getUniqueValues($this->sortedEncodedFeatures, $feat);
             $this->encodedValues[] = $vals;
             $this->encodedFeatMapSize[$feat] = count($vals);
@@ -35,26 +35,26 @@ 
     /*
      * @param
      */
-    function getUniqueValues($feat){
+    function getUniqueValues($feat) {
         
     }
     
     /*
      * @param
      */  
-    function encode(){
-        $transformer  = [];
+    function encode() {
+        $transformer = [];
         $ndata = [];
-        for ($j=0; $j<$ndim; $j++) {
-            $transformer[] = function($val){ return $val; };
+        for ($j = 0; $j < $ndim; $j++) {
+            $transformer[] = function($val) { return $val; };
         }
-        foreach( as $key => $val) {
+        foreach (as $key => $val) {
             $transformer[$key] = function($val) { return $this->featEncode[$key][$val]; };
         }
         $ndata = [];
-        for ($i=0; $i<$npoints; $i++) {
+        for ($i = 0; $i < $npoints; $i++) {
             $npoint = [];
-            for ($j=0; $j<$ndim; $j++) {
+            for ($j = 0; $j < $ndim; $j++) {
                 $npoint[] = $transformer[$j]($data[$i][$j]);
             }
             $ndata[] = $npoint;
@@ -65,12 +65,12 @@ 
     /*
      * @param
      */  
-    function decode($ndata){
+    function decode($ndata) {
         $resp = [];
-        for ($i=0; $i<$npoints; $i++) {
+        for ($i = 0; $i < $npoints; $i++) {
             //$point = array_fill(0, $nexpdim; null);
             $point = array($ndata[$i]);
-            foreach ( as $key => $val) {
+            foreach (as $key => $val) {
                 $this->featDecode[$key]($point);            
             }
             $point = $this->removeNulls($point);

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);
     }
     
 }

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;
                     }            
@@ -60,7 +60,7 @@ 
  
             $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;
@@ -72,7 +72,7 @@ 
             $resp = $nresp;
             var_dump($resp);    
             // 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]);
@@ -92,10 +92,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;
         }
@@ -124,7 +124,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);

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++){

src/Matrix.php

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;