rdorado / site-analyzer

src/ML.php

Spacing +9 added lines, -9 removed lines

@@ -34,10 +34,10 @@ 
         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];
         }
-        print( SiteAnalyzer::transform($centroids, "html") );
+        print(SiteAnalyzer::transform($centroids, "html"));
         //$centroids = self::initCentroids($nclusters, $ndimensions, function(){return rand(0,100)/100;});   
         while (!$finished && $niter < $maxiter) {
             // Assign each one of the points to one centroid   
@@ -48,7 +48,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 @@ 
             // 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]);
@@ -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);

src/SiteAnalyzer.php

Spacing +4 added lines, -4 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);
         }
@@ -279,7 +279,7 @@ 
         $cdata = new CategoricalDataset($data);
         $cdata->setEncodedFeatures([0, 1]);
         $tdata = $cdata->encode();
-        print( SiteAnalyzer::transform($tdata, "html") );
+        print(SiteAnalyzer::transform($tdata, "html"));
         $clusters = ML::kmeans($tdata, $nprofiles);        
         
         return [$clusters];

src/CategoricalDataset.php

Spacing +12 added lines, -12 removed lines

@@ -59,7 +59,7 @@ 
         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);
@@ -81,7 +81,7 @@ 
         $tmp = Matrix::getColumn($this->data, $col);
         $n = count($tmp);
         $resp = [];
-        for ($i=0; $i<$n; $i++) {
+        for ($i = 0; $i < $n; $i++) {
             if (!in_array($tmp[$i], $resp)) {
                 $resp[] = $tmp[$i];
             }
@@ -97,7 +97,7 @@ 
     {
         $size = count($array);
         $resp = [];
-        for ($i=0;$i<$size;$i++) {
+        for ($i = 0; $i < $size; $i++) {
             $tmp = array_fill(0, $size, 0);
             $tmp[$i] = 1;  
             $resp[$array[$i]] = $tmp;
@@ -108,22 +108,22 @@ 
     /*
      * @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) {
-            $transformer[$col] = function ($val) use ($col) { return $this->featEncode[$col][$val]; };
+        foreach ($this->sortedEncodedFeatures as $col) {
+            $transformer[$col] = function($val) use ($col) { 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++) {
-                $npoint = array_merge($npoint,$transformer[$j]($this->data[$i][$j]));
+            for ($j = 0; $j < $ndim; $j++) {
+                $npoint = array_merge($npoint, $transformer[$j]($this->data[$i][$j]));
             }            
             $ndata[] = $npoint;
         }