HuasoFoundries / math_histogram

src/Histogram/Histogram3D.php

Doc Comments +4 added lines, -4 removed lines

@@ -42,8 +42,8 @@ 
      * Sets the binning options. Overrides parent's method.
      *
      * @access  public
-     * @param   array $binOptions  an array of options for binning the data
-     * @return  void
+     * @param   string $binOptions  an array of options for binning the data
+     * @return  boolean
      */
 
     public function setBinOptions($binOptions)
@@ -61,7 +61,7 @@ 
      *
      * @access  public
      * @param   array   $data   the numeric array
-     * @return  mixed   boolean true on success, a \PEAR_Error object otherwise
+     * @return  boolean   boolean true on success, a \PEAR_Error object otherwise
      *
      * @see _clear()
      * @see Math_AbstractHistogram::getData()
@@ -240,7 +240,7 @@ 
      * array
      *
      * @access  private
-     * @param   array   $elem
+     * @param   string   $elem
      * @return  array   of values: array(min, max)
      */
     public function _getMinMax($elem)

Spacing +7 added lines, -7 removed lines

@@ -107,8 +107,8 @@ 
         $this->_bins      = array();
         $this->_stats     = array('x' => new \HuasoFoundries\Math\Stats(), 'y' => new \HuasoFoundries\Math\Stats());
         $this->_statsMode = $statsMode;
-        $deltaX           = ($this->_rangeHigh['x'] - $this->_rangeLow['x']) / $this->_nbins['x'];
-        $deltaY           = ($this->_rangeHigh['y'] - $this->_rangeLow['y']) / $this->_nbins['y'];
+        $deltaX           = ($this->_rangeHigh['x'] - $this->_rangeLow['x'])/$this->_nbins['x'];
+        $deltaY           = ($this->_rangeHigh['y'] - $this->_rangeLow['y'])/$this->_nbins['y'];
         $data             = $this->_histogramData();
         //$dataX = $this->_data['x'];
         //$dataY = $this->_data['y'];
@@ -118,15 +118,15 @@ 
         $cumm       = 0;
         $nData      = count($dataX);
         for ($i = 0; $i < $this->_nbins['x']; $i++) {
-            $loXBin = $this->_rangeLow['x'] + $i * $deltaX;
+            $loXBin = $this->_rangeLow['x'] + $i*$deltaX;
             $hiXBin = $loXBin + $deltaX;
             $xBin   = array('low' => $loXBin, 'high' => $hiXBin,
-                'mid'             => ($hiXBin + $loXBin) / 2);
+                'mid'             => ($hiXBin + $loXBin)/2);
             for ($j = 0; $j < $this->_nbins['y']; $j++) {
-                $loYBin = $this->_rangeLow['y'] + $j * $deltaY;
+                $loYBin = $this->_rangeLow['y'] + $j*$deltaY;
                 $hiYBin = $loYBin + $deltaY;
                 $yBin   = array('low' => $loYBin, 'high' => $hiYBin,
-                    'mid'             => ($hiYBin + $loYBin) / 2);
+                    'mid'             => ($hiYBin + $loYBin)/2);
                 $bin  = array('x' => $xBin, 'y' => $yBin);
                 $freq = 0;
                 for ($k = 0; $k < $nData; $k++) {
@@ -232,7 +232,7 @@ 
             $out[] = implode($separator, $bins[$i]);
         }
 
-        return implode("\n", $out) . "\n";
+        return implode("\n", $out)."\n";
     }
 
     /**

src/Histogram/Histogram4D.php

Spacing +10 added lines, -10 removed lines

@@ -106,9 +106,9 @@ 
         $this->_bins      = array();
         $this->_stats     = array('x' => new \HuasoFoundries\Math\Stats(), 'y' => new \HuasoFoundries\Math\Stats(), 'z' => new \HuasoFoundries\Math\Stats());
         $this->_statsMode = $statsMode;
-        $deltaX           = ($this->_rangeHigh['x'] - $this->_rangeLow['x']) / $this->_nbins['x'];
-        $deltaY           = ($this->_rangeHigh['y'] - $this->_rangeLow['y']) / $this->_nbins['y'];
-        $deltaZ           = ($this->_rangeHigh['z'] - $this->_rangeLow['z']) / $this->_nbins['z'];
+        $deltaX           = ($this->_rangeHigh['x'] - $this->_rangeLow['x'])/$this->_nbins['x'];
+        $deltaY           = ($this->_rangeHigh['y'] - $this->_rangeLow['y'])/$this->_nbins['y'];
+        $deltaZ           = ($this->_rangeHigh['z'] - $this->_rangeLow['z'])/$this->_nbins['z'];
         $data             = $this->_histogramData();
         $dataX            = $data['x'];
         $dataY            = $data['y'];
@@ -117,20 +117,20 @@ 
         $cumm             = 0;
         $nData            = count($dataX);
         for ($i = 0; $i < $this->_nbins['x']; $i++) {
-            $loXBin = $this->_rangeLow['x'] + $i * $deltaX;
+            $loXBin = $this->_rangeLow['x'] + $i*$deltaX;
             $hiXBin = $loXBin + $deltaX;
             $xBin   = array('low' => $loXBin, 'high' => $hiXBin,
-                'mid'             => ($hiXBin + $loXBin) / 2);
+                'mid'             => ($hiXBin + $loXBin)/2);
             for ($j = 0; $j < $this->_nbins['y']; $j++) {
-                $loYBin = $this->_rangeLow['y'] + $j * $deltaY;
+                $loYBin = $this->_rangeLow['y'] + $j*$deltaY;
                 $hiYBin = $loYBin + $deltaY;
                 $yBin   = array('low' => $loYBin, 'high' => $hiYBin,
-                    'mid'             => ($hiYBin + $loYBin) / 2);
+                    'mid'             => ($hiYBin + $loYBin)/2);
                 for ($m = 0; $m < $this->_nbins['z']; $m++) {
-                    $loZBin = $this->_rangeLow['z'] + $m * $deltaZ;
+                    $loZBin = $this->_rangeLow['z'] + $m*$deltaZ;
                     $hiZBin = $loZBin + $deltaZ;
                     $zBin   = array('low' => $loZBin, 'high' => $hiZBin,
-                        'mid'             => ($hiZBin + $loZBin) / 2);
+                        'mid'             => ($hiZBin + $loZBin)/2);
                     $bin  = array('x' => $xBin, 'y' => $yBin, 'z' => $zBin);
                     $freq = 0;
                     for ($k = 0; $k < $nData; $k++) {
@@ -249,7 +249,7 @@ 
             $out[] = implode($separator, $bins[$i]);
         }
 
-        return implode("\n", $out) . "\n";
+        return implode("\n", $out)."\n";
     }
 
     /**

src/Histogram/Histogram.php

Spacing +11 added lines, -11 removed lines

@@ -111,7 +111,7 @@ 
         $this->_stats = new \HuasoFoundries\Math\Stats();
 
         $this->_statsMode = $statsMode;
-        $delta            = ($this->_rangeHigh - $this->_rangeLow) / $this->_nbins;
+        $delta            = ($this->_rangeHigh - $this->_rangeLow)/$this->_nbins;
         $lastpos          = 0;
         $cumm             = 0;
         $data             = $this->_histogramData();
@@ -119,11 +119,11 @@ 
         $ignoreList       = array();
 
         for ($i = 0; $i < $this->_nbins; $i++) {
-            $loBin                   = $this->_rangeLow + $i * $delta;
+            $loBin                   = $this->_rangeLow + $i*$delta;
             $hiBin                   = $loBin + $delta;
             $this->_bins[$i]["low"]  = $loBin;
             $this->_bins[$i]["high"] = $hiBin;
-            $this->_bins[$i]["mid"]  = ($hiBin + $loBin) / 2;
+            $this->_bins[$i]["mid"]  = ($hiBin + $loBin)/2;
             if ($this->_type == self::HISTOGRAM_CUMMULATIVE) {
                 $this->_bins[$i]["count"] = $cumm;
             } else {
@@ -209,7 +209,7 @@ 
             $out[] = "{$bin}{$separator}{$freq}";
         }
 
-        return implode("\n", $out) . "\n";
+        return implode("\n", $out)."\n";
     }
 
     /**
@@ -267,11 +267,11 @@ 
             throw new \PEAR_Exception("histogram has not been calculated");
         }
         $out = ($this->_type == self::HISTOGRAM_CUMMULATIVE) ? "Cummulative Frequency" : "Histogram";
-        $out .= "\n\tNumber of bins: " . $this->_nbins . "\n";
-        $out .= "\tPlot range: [" . $this->_rangeLow . ", " . $this->_rangeHigh . "]\n";
+        $out .= "\n\tNumber of bins: ".$this->_nbins."\n";
+        $out .= "\tPlot range: [".$this->_rangeLow.", ".$this->_rangeHigh."]\n";
         $hdata = $this->_histogramData();
-        $out .= "\tData range: [" . min($hdata) . ", " . max($hdata) . "]\n";
-        $out .= "\tOriginal data range: [" . min($this->_data) . ", " . max($this->_data) . "]\n";
+        $out .= "\tData range: [".min($hdata).", ".max($hdata)."]\n";
+        $out .= "\tOriginal data range: [".min($this->_data).", ".max($this->_data)."]\n";
         $out .= "BIN (FREQUENCY) ASCII_BAR (%)\n";
         $fmt     = "%-4.3f (%-4d) |%s\n";
         $bins    = $this->_filterBins($mode);
@@ -295,14 +295,14 @@ 
      */
     public function _bar($freq, $maxfreq, $total)
     {
-        $fact  = floatval(($maxfreq > 40) ? 40 / $maxfreq : 1);
-        $niter = round($freq * $fact);
+        $fact  = floatval(($maxfreq > 40) ? 40/$maxfreq : 1);
+        $niter = round($freq*$fact);
         $out   = "";
         for ($i = 0; $i < $niter; $i++) {
             $out .= "*";
         }
 
-        return $out . sprintf(" (%.1f%%)", $freq / $total * 100);
+        return $out.sprintf(" (%.1f%%)", $freq/$total*100);
     }
 
     /**

src/Histogram/Printer/Text.php

Spacing +7 added lines, -7 removed lines

@@ -46,8 +46,8 @@ 
         $out     = ($this->_hist->_type == \HuasoFoundries\Histogram\Histogram::HISTOGRAM_CUMMULATIVE) ? "Cummulative Frequency" : "Histogram";
         $out .= "\n\tNumber of bins: {$binopts['nbins']}\n";
         $out .= "\tPlot range: [{$binopts['rangeLow']}, {$binopts['rangeHigh']}]\n";
-        $out .= "\tData range: [" . min($hdata) . ", " . max($hdata) . "]\n";
-        $out .= "\tOriginal data range: [" . min($data) . ", " . max($data) . "]\n";
+        $out .= "\tData range: [".min($hdata).", ".max($hdata)."]\n";
+        $out .= "\tOriginal data range: [".min($data).", ".max($data)."]\n";
         $out .= "BIN (FREQUENCY) ASCII_BAR (%)\n";
         foreach ($bins as $bin => $freq) {
             $out .= sprintf($fmt, $bin, $freq, $this->_bar($freq, $maxfreq, $total));
@@ -104,14 +104,14 @@ 
      */
     public function _bar($freq, $maxfreq, $total)
     {
-        $fact  = floatval(($maxfreq > 40) ? 40 / $maxfreq : 1);
-        $niter = round($freq * $fact);
+        $fact  = floatval(($maxfreq > 40) ? 40/$maxfreq : 1);
+        $niter = round($freq*$fact);
         $out   = "";
         for ($i = 0; $i < $niter; $i++) {
             $out .= "*";
         }
 
-        return $out . sprintf(" (%.1f%%)", $freq / $total * 100);
+        return $out.sprintf(" (%.1f%%)", $freq/$total*100);
     }
 
     /**
@@ -127,8 +127,8 @@ 
         $out = '';
         foreach ($stats as $name => $value) {
             if (is_array($value)) {
-                $out .= $prefix . $name . ":\n";
-                $out .= $this->_printStats($value, $prefix . "\t");
+                $out .= $prefix.$name.":\n";
+                $out .= $this->_printStats($value, $prefix."\t");
             } else {
                 $out .= "{$prefix}{$name}: $value\n";
             }

src/Math/Stats.php

Spacing +43 added lines, -43 removed lines

@@ -178,7 +178,7 @@ 
             $this->_nullOption = $nullOption;
             return true;
         } else {
-            throw new \PEAR_Exception('invalid null handling option expecting: ' .
+            throw new \PEAR_Exception('invalid null handling option expecting: '.
                 'STATS_REJECT_NULL, STATS_IGNORE_NULL or STATS_USE_NULL_AS_ZERO');
         }
     }
@@ -212,12 +212,12 @@ 
         $arr = array();
         if ($this->_dataOption == self::STATS_DATA_CUMMULATIVE) {
             foreach ($this->_data as $val => $freq) {
-                $newval         = ($val - $mean) / $std;
+                $newval         = ($val - $mean)/$std;
                 $arr["$newval"] = $freq;
             }
         } else {
             foreach ($this->_data as $val) {
-                $newval = ($val - $mean) / $std;
+                $newval = ($val - $mean)/$std;
                 $arr[]  = $newval;
             }
         }
@@ -480,11 +480,11 @@ 
         $sumN = 0;
         if ($this->_dataOption == self::STATS_DATA_CUMMULATIVE) {
             foreach ($this->_data as $val => $freq) {
-                $sumN += $freq * pow((double) $val, (double) $n);
+                $sumN += $freq*pow((double)$val, (double)$n);
             }
         } else {
             foreach ($this->_data as $val) {
-                $sumN += pow((double) $val, (double) $n);
+                $sumN += pow((double)$val, (double)$n);
             }
         }
         return $sumN;
@@ -536,8 +536,8 @@ 
                 if ($val == 0) {
                     return 0.0;
                 }
-                $prodN *= $freq * pow((double) $val, (double) $n);
-                if ($prodN > 10000 * $n) {
+                $prodN *= $freq*pow((double)$val, (double)$n);
+                if ($prodN > 10000*$n) {
                     $partial[] = $prodN;
                     $prodN     = 1.0;
                 }
@@ -547,8 +547,8 @@ 
                 if ($val == 0) {
                     return 0.0;
                 }
-                $prodN *= pow((double) $val, (double) $n);
-                if ($prodN > 10 * $n) {
+                $prodN *= pow((double)$val, (double)$n);
+                if ($prodN > 10*$n) {
                     $partial[] = $prodN;
                     $prodN     = 1.0;
                 }
@@ -615,7 +615,7 @@ 
                 } catch (\PEAR_Exception $e) {
                     return $count;
                 }
-                $this->_calculatedValues['mean'] = $sum / $count;
+                $this->_calculatedValues['mean'] = $sum/$count;
             } catch (\PEAR_Exception $e) {
                 return $sum;
             }
@@ -814,7 +814,7 @@ 
                 return $count;
             }
 
-            $this->_calculatedValues['skewness'] = ($sumdiff3 / ($count * pow($stDev, 3)));
+            $this->_calculatedValues['skewness'] = ($sumdiff3/($count*pow($stDev, 3)));
         }
         return $this->_calculatedValues['skewness'];
     }
@@ -856,7 +856,7 @@ 
                 return $count;
             }
 
-            $this->_calculatedValues['kurtosis'] = ($sumdiff4 / ($count * pow($stDev, 4))) - 3;
+            $this->_calculatedValues['kurtosis'] = ($sumdiff4/($count*pow($stDev, 4))) - 3;
         }
         return $this->_calculatedValues['kurtosis'];
     }
@@ -891,9 +891,9 @@ 
                 return $n;
             }
 
-            $h = intval($n / 2);
-            if ($n % 2 == 0) {
-                $median = ($arr[$h] + $arr[$h - 1]) / 2;
+            $h = intval($n/2);
+            if ($n%2 == 0) {
+                $median = ($arr[$h] + $arr[$h - 1])/2;
             } else {
                 $median = $arr[$h];
             }
@@ -971,7 +971,7 @@ 
                 return $min;
             }
 
-            $this->_calculatedValues['midrange'] = (($max + $min) / 2);
+            $this->_calculatedValues['midrange'] = (($max + $min)/2);
         }
         return $this->_calculatedValues['midrange'];
     }
@@ -1002,7 +1002,7 @@ 
             if (is_array($prod)) {
                 $geomMean = 1.0;
                 foreach ($prod as $val) {
-                    $geomMean *= pow($val, 1 / $count);
+                    $geomMean *= pow($val, 1/$count);
                 }
                 $this->_calculatedValues['geometricMean'] = $geomMean;
             } else {
@@ -1012,7 +1012,7 @@ 
                 if ($prod < 0) {
                     throw new \PEAR_Exception('The product of the data set is negative, geometric mean undefined.');
                 }
-                $this->_calculatedValues['geometricMean'] = pow($prod, 1 / $count);
+                $this->_calculatedValues['geometricMean'] = pow($prod, 1/$count);
             }
         }
         return $this->_calculatedValues['geometricMean'];
@@ -1042,21 +1042,21 @@ 
             if ($this->_dataOption == self::STATS_DATA_CUMMULATIVE) {
                 foreach ($this->_data as $val => $freq) {
                     if ($val == 0) {
-                        throw new \PEAR_Exception('cannot calculate a ' .
+                        throw new \PEAR_Exception('cannot calculate a '.
                             'harmonic mean with data values of zero.');
                     }
-                    $invsum += $freq / $val;
+                    $invsum += $freq/$val;
                 }
             } else {
                 foreach ($this->_data as $val) {
                     if ($val == 0) {
-                        throw new \PEAR_Exception('cannot calculate a ' .
+                        throw new \PEAR_Exception('cannot calculate a '.
                             'harmonic mean with data values of zero.');
                     }
-                    $invsum += 1 / $val;
+                    $invsum += 1/$val;
                 }
             }
-            $this->_calculatedValues['harmonicMean'] = $count / $invsum;
+            $this->_calculatedValues['harmonicMean'] = $count/$invsum;
         }
         return $this->_calculatedValues['harmonicMean'];
     }
@@ -1089,7 +1089,7 @@ 
             return $count;
         }
         if ($count == 0) {
-            throw new \PEAR_Exception("Cannot calculate {$n}th sample moment, " .
+            throw new \PEAR_Exception("Cannot calculate {$n}th sample moment, ".
                 'there are zero data entries');
         }
         try {
@@ -1097,7 +1097,7 @@ 
         } catch (\PEAR_Exception $e) {
             return $sum;
         }
-        return ($sum / $count);
+        return ($sum/$count);
     }
 
     /**
@@ -1125,7 +1125,7 @@ 
             return $count;
         }
         if ($count == 0) {
-            throw new \PEAR_Exception("Cannot calculate {$n}th raw moment, " .
+            throw new \PEAR_Exception("Cannot calculate {$n}th raw moment, ".
                 'there are zero data entries.');
         }
         try {
@@ -1133,7 +1133,7 @@ 
         } catch (\PEAR_Exception $e) {
             return $sum;
         }
-        return ($sum / $count);
+        return ($sum/$count);
     }
 
     /**
@@ -1158,7 +1158,7 @@ 
             }
 
             if ($mean == 0.0) {
-                throw new \PEAR_Exception('cannot calculate the coefficient ' .
+                throw new \PEAR_Exception('cannot calculate the coefficient '.
                     'of variation, mean of sample is zero');
             }
             try {
@@ -1167,7 +1167,7 @@ 
                 return $stDev;
             }
 
-            $this->_calculatedValues['coeffOfVariation'] = $stDev / $mean;
+            $this->_calculatedValues['coeffOfVariation'] = $stDev/$mean;
         }
         return $this->_calculatedValues['coeffOfVariation'];
     }
@@ -1202,7 +1202,7 @@ 
             } catch (\PEAR_Exception $e) {
                 return $stDev;
             }
-            $this->_calculatedValues['stdErrorOfMean'] = $stDev / sqrt($count);
+            $this->_calculatedValues['stdErrorOfMean'] = $stDev/sqrt($count);
         }
         return $this->_calculatedValues['stdErrorOfMean'];
     }
@@ -1309,10 +1309,10 @@ 
                 }
             }
             if ($n == 0) {
-                throw new \PEAR_Exception('error calculating interquartile mean, ' .
+                throw new \PEAR_Exception('error calculating interquartile mean, '.
                     'empty interquartile range of values.');
             }
-            $this->_calculatedValues['interquartileMean'] = $sum / $n;
+            $this->_calculatedValues['interquartileMean'] = $sum/$n;
         }
         return $this->_calculatedValues['interquartileMean'];
     }
@@ -1365,7 +1365,7 @@ 
             } catch (\PEAR_Exception $e) {
                 return $iqr;
             }
-            $this->_calculatedValues['quartileDeviation'] = $iqr / 2;
+            $this->_calculatedValues['quartileDeviation'] = $iqr/2;
         }
         return $this->_calculatedValues['quartileDeviation'];
     }
@@ -1394,7 +1394,7 @@ 
             $q1                                                      = $quart['25'];
             $d                                                       = $q3 - $q1;
             $s                                                       = $q3 + $q1;
-            $this->_calculatedValues['quartileVariationCoefficient'] = 100 * $d / $s;
+            $this->_calculatedValues['quartileVariationCoefficient'] = 100*$d/$s;
         }
         return $this->_calculatedValues['quartileVariationCoefficient'];
     }
@@ -1423,9 +1423,9 @@ 
             $q3                                                     = $quart['75'];
             $q2                                                     = $quart['50'];
             $q1                                                     = $quart['25'];
-            $d                                                      = $q3 - 2 * $q2 + $q1;
+            $d                                                      = $q3 - 2*$q2 + $q1;
             $s                                                      = $q3 - $q1;
-            $this->_calculatedValues['quartileSkewnessCoefficient'] = $d / $s;
+            $this->_calculatedValues['quartileSkewnessCoefficient'] = $d/$s;
         }
         return $this->_calculatedValues['quartileSkewnessCoefficient'];
     }
@@ -1467,7 +1467,7 @@ 
         } else {
             $data = &$this->_data;
         }
-        $obsidx = $p * ($count + 1) / 100;
+        $obsidx = $p*($count + 1)/100;
         if (intval($obsidx) == $obsidx) {
             return $data[($obsidx - 1)];
         } elseif ($obsidx < 1) {
@@ -1477,7 +1477,7 @@ 
         } else {
             $left  = floor($obsidx - 1);
             $right = ceil($obsidx - 1);
-            return ($data[$left] + $data[$right]) / 2;
+            return ($data[$left] + $data[$right])/2;
         }
     }
 
@@ -1511,11 +1511,11 @@ 
         $sdiff = 0;
         if ($this->_dataOption == self::STATS_DATA_CUMMULATIVE) {
             foreach ($this->_data as $val => $freq) {
-                $sdiff += $freq * pow((double) ($val - $mean), (double) $power);
+                $sdiff += $freq*pow((double)($val - $mean), (double)$power);
             }
         } else {
             foreach ($this->_data as $val) {
-                $sdiff += pow((double) ($val - $mean), (double) $power);
+                $sdiff += pow((double)($val - $mean), (double)$power);
             }
         }
         return $sdiff;
@@ -1550,7 +1550,7 @@ 
         if ($count == 1) {
             throw new \PEAR_Exception('cannot calculate variance of a singe data point');
         }
-        return ($sumdiff2 / ($count - 1));
+        return ($sumdiff2/($count - 1));
     }
 
     /**
@@ -1579,7 +1579,7 @@ 
             return $count;
         }
 
-        return $sumabsdev / $count;
+        return $sumabsdev/$count;
     }
 
     /**
@@ -1603,7 +1603,7 @@ 
         $sdev = 0;
         if ($this->_dataOption == self::STATS_DATA_CUMMULATIVE) {
             foreach ($this->_data as $val => $freq) {
-                $sdev += $freq * abs($val - $mean);
+                $sdev += $freq*abs($val - $mean);
             }
         } else {
             foreach ($this->_data as $val) {