HuasoFoundries / math_histogram

src/Histogram/AbstractHistogram.php

Doc Comments +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
      *
      * @access  public
      * @param   int $type one of HISTOGRAM_SIMPLE or HISTOGRAM_CUMMULATIVE
-     * @return  mixed   boolean true on success, a PEAR_Error object otherwise
+     * @return  boolean   boolean true on success, a PEAR_Error object otherwise
      */
     public function setType($type)
     {
@@ -117,7 +117,7 @@ 
      *
      * @access  public
      * @param   array   $binOptions associative array of bin options
-     * @return  mixed   true on succcess, a PEAR_Error object otherwise
+     * @return  boolean   true on succcess, a PEAR_Error object otherwise
      */
     public function setBinOptions($binOptions)
     {

src/Histogram/Histogram.php

Doc Comments +3 added lines, -3 removed lines

@@ -67,7 +67,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()
@@ -106,7 +106,7 @@ 
      *
      * @access  public
      * @param   optional    $statsMode  calculate basic statistics (STATS_BASIC) or full (STATS_FULL)
-     * @return  mixed   boolean true on success, a \PEAR_Error object otherwise
+     * @return  boolean   boolean true on success, a \PEAR_Error object otherwise
      *
      * @see Math_Stats
      */
@@ -270,7 +270,7 @@ 
      * @deprecated
      * @access  public
      * @param   optional    int $mode   one of HISTOGRAM_LO_BINS, HISTOGRAM_MID_BINS, or HISTOGRAM_HI_BINS (default)
-     * @return  mixed   a string on success, a \PEAR_Error object otherwise
+     * @return  string   a string on success, a \PEAR_Error object otherwise
      */
     public function printHistogram($mode = self::HISTOGRAM_HI_BINS)
     {

Spacing +11 added lines, -11 removed lines

@@ -116,7 +116,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();
@@ -124,11 +124,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 {
@@ -217,7 +217,7 @@ 
             $out[] = "{$bin}{$separator}{$freq}";
         }
 
-        return implode("\n", $out) . "\n";
+        return implode("\n", $out)."\n";
     }
 
     /**
@@ -279,11 +279,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);
@@ -308,14 +308,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/Histogram3D.php

Doc Comments +4 added lines, -4 removed lines

@@ -43,8 +43,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)
@@ -64,7 +64,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()
@@ -248,7 +248,7 @@ 
      * array
      *
      * @access  private
-     * @param   array   $elem
+     * @param   string   $elem
      * @return  array   of values: array(min, max)
      */
     public function _getMinMax($elem)

Spacing +8 added lines, -8 removed lines

@@ -112,8 +112,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'];
@@ -123,15 +123,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++) {
@@ -240,7 +240,7 @@ 
             $out[] = implode($separator, $bins[$i]);
         }
 
-        return implode("\n", $out) . "\n";
+        return implode("\n", $out)."\n";
     }
 
     /**
@@ -300,7 +300,7 @@ 
             && is_array($binOptions['low'])
             && is_array($binOptions['high'])
             && is_array($binOptions['nbins']));
-        if(!$barray) {
+        if (!$barray) {
             return false;
         }
         $low = $binOptions['low'];

src/Histogram/Histogram4D.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)
     {
@@ -62,7 +62,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()
@@ -265,7 +265,7 @@ 
      * array
      *
      * @access  private
-     * @param   array   $elem
+     * @param   string   $elem
      * @return  array   of values: array(min, max)
      */
     public function _getMinMax($elem)

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     {
 
         $this->setType($type);
-         try {
+            try {
             $this->setBinOptions($binOptions);
         } catch (\PEAR_Exception $e) {
             // Falling back to default options

Spacing +11 added lines, -11 removed lines

@@ -111,9 +111,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'];
@@ -122,20 +122,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++) {
@@ -257,7 +257,7 @@ 
             $out[] = implode($separator, $bins[$i]);
         }
 
-        return implode("\n", $out) . "\n";
+        return implode("\n", $out)."\n";
     }
 
     /**
@@ -319,7 +319,7 @@ 
             && is_array($binOptions['high'])
             && is_array($binOptions['nbins']));
 
-        if(!$barray) {
+        if (!$barray) {
             return false;
         }
         $low = $binOptions['low'];

src/Histogram/Printer/Common.php

Doc Comments +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
      *              Common options:
      *              'useHTTPHeaders' (default = false), whether to output HTTP headers when using printOutput()
      *              'outputStatistics' (default = false), whether to include histogram statistics when generating the output
-     * @return  boolean TRUE on success, FALSE otherwise
+     * @return  boolean|null TRUE on success, FALSE otherwise
      */
     public function setOptions($options)
     {
@@ -142,7 +142,7 @@ 
      *
      * @static
      * @access private
-     * @param object $printer An instance of a Histogram_Printer_* class
+     * @param Text $printer An instance of a Histogram_Printer_* class
      * @param object Histogram $hist A Histogram instance
      * @param array $options An array of options for the printer object
      * @return boolean|PEAR_Error TRUE on success, a \PEAR_Error otherwise

src/Histogram/Printer/Text.php

Doc Comments +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
      * Returns a string representation of a Histogram plot
      *
      * @access public
-     * @return string|PEAR_Error A string on succcess, a \PEAR_Error otherwise
+     * @return string A string on succcess, a \PEAR_Error otherwise
      */
     public function generateOutput()
     {
@@ -64,7 +64,7 @@ 
      * Prints out a graphic representation of a Histogram
      *
      * @access public
-     * @return boolean|PEAR_Error TRUE on success, a \PEAR_Error otherwise
+     * @return string|null TRUE on success, a \PEAR_Error otherwise
      */
     public function printOutput()
     {

Spacing +7 added lines, -7 removed lines

@@ -47,8 +47,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));
@@ -108,14 +108,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);
 
     }
 
@@ -133,8 +133,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

Doc Comments +9 added lines, -9 removed lines

@@ -120,7 +120,7 @@ 
      * @access public
      * @param   array   $arr    the data set
      * @param   optional    int $opt    data format: STATS_DATA_CUMMULATIVE or STATS_DATA_SIMPLE (default)
-     * @return  mixed   true on success, a PEAR_Error object otherwise
+     * @return  boolean   true on success, a PEAR_Error object otherwise
      */
     public function setData($arr, $opt = self::STATS_DATA_SIMPLE)
     {
@@ -170,7 +170,7 @@ 
      * Must be called before assigning a new data set containing null values
      *
      * @access  public
-     * @return  mixed   true on success, a PEAR_Error object otherwise
+     * @return  boolean   true on success, a PEAR_Error object otherwise
      * @see _validate()
      */
     public function setNullOption($nullOption)
@@ -481,7 +481,7 @@ 
      * Handles cummulative data sets correctly
      *
      * @access  public
-     * @param   numeric $n  the exponent
+     * @param   integer $n  the exponent
      * @return  mixed   the sum on success, a PEAR_Error object otherwise
      * @see calc()
      * @see sum()
@@ -536,7 +536,7 @@ 
      * Handles cummulative data sets correctly
      *
      * @access  public
-     * @param   numeric $n  the exponent
+     * @param   integer $n  the exponent
      * @return  numeric|array|PEAR_Error  the product as a number or an array of numbers
      *                                    (if there is numeric overflow) on success,
      *                                    a PEAR_Error object otherwise
@@ -731,7 +731,7 @@ 
      *
      * @access  public
      * @param   numeric $mean   the fixed mean value
-     * @return  mixed   the variance on success, a PEAR_Error object otherwise
+     * @return  double   the variance on success, a PEAR_Error object otherwise
      * @see __sumdiff()
      * @see count()
      * @see variance()
@@ -1502,7 +1502,7 @@ 
      * @todo need to double check generality of the algorithm
      *
      * @access public
-     * @param numeric $p the percentile to estimate, e.g. 25 for 25th percentile
+     * @param integer $p the percentile to estimate, e.g. 25 for 25th percentile
      * @return mixed a numeric value on success, a PEAR_Error otherwise
      * @see quartiles()
      * @see median()
@@ -1540,7 +1540,7 @@ 
      * Utility function to calculate: SUM { (xi - mean)^n }
      *
      * @access private
-     * @param   numeric $power  the exponent
+     * @param   integer $power  the exponent
      * @param   optional    double   $mean   the data set mean value
      * @return  mixed   the sum on success, a PEAR_Error object otherwise
      *
@@ -1678,7 +1678,7 @@ 
      *
      * @access private
      * @param mixed $v value to be formatted
-     * @param boolean $returnErrorObject whether the raw PEAR_Error (when true, default),
+     * @param boolean $useErrorObject whether the raw PEAR_Error (when true, default),
      *                  or only the error message will be returned (when false)
      * @return mixed if the value is a PEAR_Error object, and $useErrorObject
      *              is false, then a string with the error message will be returned,
@@ -1699,7 +1699,7 @@ 
      * according to the current null handling option
      *
      * @access  private
-     * @return  mixed true on success, a PEAR_Error object otherwise
+     * @return  boolean true on success, a PEAR_Error object otherwise
      *
      * @see setData()
      */

Indentation +13 added lines, -13 removed lines

@@ -18,8 +18,8 @@ 
      */
     const STATS_BASIC = 1;
 /**
- * STATS_FULL to generate also higher moments, mode, median, etc.
- */
+     * STATS_FULL to generate also higher moments, mode, median, etc.
+     */
     const STATS_FULL = 2;
 
 // Constants describing the data set format
@@ -29,11 +29,11 @@ 
      */
     const STATS_DATA_SIMPLE = 0;
 /**
- * STATS_DATA_CUMMULATIVE for an associative array of frequency values,
- * where in each array entry, the index is the data point and the
- * value the count (frequency):
- * e.g. $data = array(3=>4, 2.3=>5, 1.25=>6, 0.5=>3)
- */
+     * STATS_DATA_CUMMULATIVE for an associative array of frequency values,
+     * where in each array entry, the index is the data point and the
+     * value the count (frequency):
+     * e.g. $data = array(3=>4, 2.3=>5, 1.25=>6, 0.5=>3)
+     */
     const STATS_DATA_CUMMULATIVE = 1;
 
 // Constants defining how to handle nulls
@@ -43,14 +43,14 @@ 
      */
     const STATS_REJECT_NULL = -1;
 /**
- * STATS_IGNORE_NULL, ignore null values and prune them from the data.
- * Any non-numeric value is considered a null in this context.
- */
+     * STATS_IGNORE_NULL, ignore null values and prune them from the data.
+     * Any non-numeric value is considered a null in this context.
+     */
     const STATS_IGNORE_NULL = -2;
 /**
- * STATS_USE_NULL_AS_ZERO, assign the value of 0 (zero) to null values.
- * Any non-numeric value is considered a null in this context.
- */
+     * STATS_USE_NULL_AS_ZERO, assign the value of 0 (zero) to null values.
+     * Any non-numeric value is considered a null in this context.
+     */
     const STATS_USE_NULL_AS_ZERO = -3;
 
     // properties

Spacing +43 added lines, -43 removed lines

@@ -182,7 +182,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');
         }
     }
@@ -217,12 +217,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;
             }
         }
@@ -496,11 +496,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;
@@ -555,8 +555,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;
                 }
@@ -566,8 +566,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;
                 }
@@ -637,7 +637,7 @@ 
                 } catch (\PEAR_Exception $e) {
                     return $count;
                 }
-                $this->_calculatedValues['mean'] = $sum / $count;
+                $this->_calculatedValues['mean'] = $sum/$count;
             } catch (\PEAR_Exception $e) {
                 return $sum;
             }
@@ -847,7 +847,7 @@ 
                 return $count;
             }
 
-            $this->_calculatedValues['skewness'] = ($sumdiff3 / ($count * pow($stDev, 3)));
+            $this->_calculatedValues['skewness'] = ($sumdiff3/($count*pow($stDev, 3)));
         }
         return $this->_calculatedValues['skewness'];
     }
@@ -891,7 +891,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'];
     }
@@ -927,9 +927,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];
             }
@@ -1010,7 +1010,7 @@ 
                 return $min;
             }
 
-            $this->_calculatedValues['midrange'] = (($max + $min) / 2);
+            $this->_calculatedValues['midrange'] = (($max + $min)/2);
         }
         return $this->_calculatedValues['midrange'];
     }
@@ -1042,7 +1042,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 {
@@ -1052,7 +1052,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'];
@@ -1083,21 +1083,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'];
     }
@@ -1131,7 +1131,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 {
@@ -1139,7 +1139,7 @@ 
         } catch (\PEAR_Exception $e) {
             return $sum;
         }
-        return ($sum / $count);
+        return ($sum/$count);
     }
 
     /**
@@ -1168,7 +1168,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 {
@@ -1176,7 +1176,7 @@ 
         } catch (\PEAR_Exception $e) {
             return $sum;
         }
-        return ($sum / $count);
+        return ($sum/$count);
     }
 
     /**
@@ -1202,7 +1202,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 {
@@ -1211,7 +1211,7 @@ 
                 return $stDev;
             }
 
-            $this->_calculatedValues['coeffOfVariation'] = $stDev / $mean;
+            $this->_calculatedValues['coeffOfVariation'] = $stDev/$mean;
         }
         return $this->_calculatedValues['coeffOfVariation'];
     }
@@ -1247,7 +1247,7 @@ 
             } catch (\PEAR_Exception $e) {
                 return $stDev;
             }
-            $this->_calculatedValues['stdErrorOfMean'] = $stDev / sqrt($count);
+            $this->_calculatedValues['stdErrorOfMean'] = $stDev/sqrt($count);
         }
         return $this->_calculatedValues['stdErrorOfMean'];
     }
@@ -1358,10 +1358,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'];
     }
@@ -1416,7 +1416,7 @@ 
             } catch (\PEAR_Exception $e) {
                 return $iqr;
             }
-            $this->_calculatedValues['quartileDeviation'] = $iqr / 2;
+            $this->_calculatedValues['quartileDeviation'] = $iqr/2;
         }
         return $this->_calculatedValues['quartileDeviation'];
     }
@@ -1446,7 +1446,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'];
     }
@@ -1476,9 +1476,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'];
     }
@@ -1520,7 +1520,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) {
@@ -1530,7 +1530,7 @@ 
         } else {
             $left = floor($obsidx - 1);
             $right = ceil($obsidx - 1);
-            return ($data[$left] + $data[$right]) / 2;
+            return ($data[$left] + $data[$right])/2;
         }
     }
 
@@ -1566,11 +1566,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);
             }
 
         }
@@ -1607,7 +1607,7 @@ 
         if ($count == 1) {
             throw new \PEAR_Exception('cannot calculate variance of a singe data point');
         }
-        return ($sumdiff2 / ($count - 1));
+        return ($sumdiff2/($count - 1));
     }
 
     /**
@@ -1637,7 +1637,7 @@ 
             return $count;
         }
 
-        return $sumabsdev / $count;
+        return $sumabsdev/$count;
     }
 
     /**
@@ -1662,7 +1662,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) {

docs/examples_stats/ex_stats_simple.php

Indentation +6 added lines, -6 removed lines

@@ -42,9 +42,9 @@ 
 print_r($dnulls);
 echo "Let's generate an error\n";
 try {
-	print_r($s->setData($dnulls));
+    print_r($s->setData($dnulls));
 } catch (\Exception $e) {
-	echo "\n\t Exception: ".$e->getMessage()."\n\n";
+    echo "\n\t Exception: ".$e->getMessage()."\n\n";
 }
 
 echo "Ignoring nulls and trying again\n";
@@ -54,9 +54,9 @@ 
 print_r($s->getData());
 echo "---> stats\n";
 try {
-	print_r($s->calcBasic());
+    print_r($s->calcBasic());
 } catch (\Exception $e) {
-	echo "\n\t Exception: ".$e->getMessage()."\n\n";
+    echo "\n\t Exception: ".$e->getMessage()."\n\n";
 }
 
 echo "Assuming nulls are zeros and doing a full stats calculation\n";
@@ -66,7 +66,7 @@ 
 print_r($s->getData());
 echo "---> stats\n";
 try {
-	print_r($s->calcFull());
+    print_r($s->calcFull());
 } catch (\Exception $e) {
-	echo "\n\t Exception: ".$e->getMessage()."\n\n";
+    echo "\n\t Exception: ".$e->getMessage()."\n\n";
 }

Spacing +3 added lines, -3 removed lines

@@ -23,11 +23,11 @@
  * @package	Math_Stats
  */
 
-require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__.'/../../vendor/autoload.php';
 
 // making some data sets
-$data = array (2,2.3,4.5,2,2,3.2,5.3,3,4,5,1,6);
-$dnulls = array (1.1650,null, "foo",0.6268, 0.6268, 0.0751, 0.3516, -0.6965);
+$data = array(2, 2.3, 4.5, 2, 2, 3.2, 5.3, 3, 4, 5, 1, 6);
+$dnulls = array(1.1650, null, "foo", 0.6268, 0.6268, 0.0751, 0.3516, -0.6965);
 
 // instantiating a Math_Stats object
 $s = new \PEAR\Math\Stats();

docs/examples_stats/ex_stats_bigdataset.php

Indentation +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
     //require_once 'Math/Stats.php';
-   require_once __DIR__ . '/../../vendor/autoload.php';
+    require_once __DIR__ . '/../../vendor/autoload.php';
 
 
     $data = array();
@@ -19,7 +19,7 @@ 
     try {
     $stats = $s ->calcFull();
 
-       //print_r($stats);
+        //print_r($stats);
     echo "Using Math_Stats:\n"
         . "mean = {$stats['mean']}\n"
         . "SEmean = {$stats['std_error_of_mean']}\n"
@@ -41,8 +41,8 @@ 
         . "max = 41\n"
         . "count = 4255666\n";
         
-      //Name,Mean,SEMean,StDev,Q1,Median,Q3,Min,Max,N
-      //SPSS,2.8627,0.0005,1.0630,2,3,4,1,41,4255666
+        //Name,Mean,SEMean,StDev,Q1,Median,Q3,Min,Max,N
+        //SPSS,2.8627,0.0005,1.0630,2,3,4,1,41,4255666
     } catch (\Exception $e) {
         echo "\n\t Exception: ".$e->getMessage()."\n\n";
     }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
     //require_once 'Math/Stats.php';
-   require_once __DIR__ . '/../../vendor/autoload.php';
+   require_once __DIR__.'/../../vendor/autoload.php';
 
 
     $data = array();