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/Persistence.php

Spacing +1 added lines, -1 removed lines

@@ -244,7 +244,7 @@
      * @param $config Configuration
      *
      */
-    public static function findIdByTimeUser($pdo, $config, $by=[]) {
+    public static function findIdByTimeUser($pdo, $config, $by = []) {
         return OptionsDAO::findIdByTimeUser($pdo, $config, $by);
     }
     

src/Matrix.php

Indentation +3 added lines, -3 removed lines

@@ -91,9 +91,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;

Spacing +21 added lines, -21 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;

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

src/ML.php

Indentation +6 added lines, -6 removed lines

@@ -92,12 +92,12 @@
      * @param
      */
     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 +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
         $npoints = count($data);
         if (count($npoints) <= 0) throw new Exception("Not enough data. ");    
         $ndimensions = count($npoints[0]);
-        $centroids = initCentroids($nclusters, $ndimensions, function(){return rand(0,100)/100;});   
+        $centroids = initCentroids($nclusters, $ndimensions, function() {return rand(0, 100) / 100; });   
         while (!$finished) {
     
             // Assign each one of the points to one centroid        
@@ -41,7 +41,7 @@ 
                 $bdist = INF;
                 for ($i = 0; $i < $nclusters; $i++) {
                     $ndist = eclideanDistance($npoints[$j], $nclusters[$i]);
-                    if($bdist > $ndist) {
+                    if ($bdist > $ndist) {
                         $bdist = $ndist;
                         $best = $i;
                     }            
@@ -50,10 +50,10 @@ 
             }
         
             // Check change 
-            if(count($resp)!=0) {
+            if (count($resp)!=0) {
                 $finished = true;
                 for ($j = 0; $j < $npoints; $j++) {        
-                    if($resp[$j]!==$nresp[$j]){
+                    if ($resp[$j]!==$nresp[$j]) {
                         $finished = false;
                         break;
                     }
@@ -62,7 +62,7 @@ 
             }
                 
             /** Recalculate the centroids*/
-            $centroids = initCentroids($nclusters, $ndimensions, function(){return 0;});
+            $centroids = initCentroids($nclusters, $ndimensions, function() {return 0; });
             $counts = array_fill(0, $nclusters, 0);
             for ($j = 0; $j < $npoints; $j++) {              
                 sumCentroid($centroids[$resp[$j]], $data[$j]);
@@ -94,7 +94,7 @@ 
     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

@@ -29,7 +29,9 @@
         $resp = [];
         $finished = false;
         $npoints = count($data);
-        if (count($npoints) <= 0) throw new Exception("Not enough data. ");    
+        if (count($npoints) <= 0) {
+            throw new Exception("Not enough data. ");
+        }
         $ndimensions = count($npoints[0]);
         $centroids = initCentroids($nclusters, $ndimensions, function(){return rand(0,100)/100;});   
         while (!$finished) {

src/SiteAnalyzer.php

Spacing +2 added lines, -2 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);
@@ -186,7 +186,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 +1 added lines, -2 removed lines

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