HuasoFoundries / math_histogram

docs/examples_stats/ex_stats_simple.php

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

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

docs/examples_stats/ex_stats_cummulative_data.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
  * @package	Math_Stats
  */
 
-require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__.'/../../vendor/autoload.php';
 
 
 // making some cummulative data sets
@@ -46,7 +46,7 @@ 
 print_r($dnulls);
 echo "Generating an error by using data with nulls\n";
 try {
-	print_r($s->setData($dnulls,  \PEAR\Math\Stats::STATS_DATA_CUMMULATIVE));	
+	print_r($s->setData($dnulls, \PEAR\Math\Stats::STATS_DATA_CUMMULATIVE));	
 } catch (\Exception $e) {
 	echo "\n\t Exception: ".$e->getMessage()."\n\n";
 }
@@ -54,8 +54,8 @@ 
 
 // let's ignore nulls
 echo "Ignoring the nulls and trying again\n";
-$s->setNullOption( \PEAR\Math\Stats::STATS_IGNORE_NULL);
-$s->setData($dnulls,  \PEAR\Math\Stats::STATS_DATA_CUMMULATIVE);
+$s->setNullOption(\PEAR\Math\Stats::STATS_IGNORE_NULL);
+$s->setData($dnulls, \PEAR\Math\Stats::STATS_DATA_CUMMULATIVE);
 try {
 	print_r($s->calcBasic());
 } catch (\Exception $e) {
@@ -64,8 +64,8 @@ 
 
 // let's assume null == zero
 echo "Assuming that nulls are zero\n";
-$s->setNullOption( \PEAR\Math\Stats::STATS_USE_NULL_AS_ZERO);
-$s->setData($dnulls,  \PEAR\Math\Stats::STATS_DATA_CUMMULATIVE);
+$s->setNullOption(\PEAR\Math\Stats::STATS_USE_NULL_AS_ZERO);
+$s->setData($dnulls, \PEAR\Math\Stats::STATS_DATA_CUMMULATIVE);
 try {
 	print_r($s->calcFull());
 } catch (\Exception $e) {

docs/examples_histogram/ex_histogram_printer.php

Spacing +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
-require_once __DIR__ . '/../../vendor/autoload.php';;
+require_once __DIR__.'/../../vendor/autoload.php'; ;
 
 // create a boring array
 $vals = array(
-			1.5,2,3,4,0,3.2,0.1,0,0,5,3,2,3,4,1,2,4,5,1,3,2,4,5,2,3,4,1,2,
-			1.5,2,3,4,0,3.2,0.1,0,0,5,3,2,3,4,1,2,4,5,1,3,2,4,5,2,3,4,1,2,
-			1.5,2,3,4,0,3.2,0.1,0,0,5,3,2,3,4,1,2,4,5,1,3,2,4,5,2,3,4,1,2
+			1.5, 2, 3, 4, 0, 3.2, 0.1, 0, 0, 5, 3, 2, 3, 4, 1, 2, 4, 5, 1, 3, 2, 4, 5, 2, 3, 4, 1, 2,
+			1.5, 2, 3, 4, 0, 3.2, 0.1, 0, 0, 5, 3, 2, 3, 4, 1, 2, 4, 5, 1, 3, 2, 4, 5, 2, 3, 4, 1, 2,
+			1.5, 2, 3, 4, 0, 3.2, 0.1, 0, 0, 5, 3, 2, 3, 4, 1, 2, 4, 5, 1, 3, 2, 4, 5, 2, 3, 4, 1, 2
 		);
 
 // create an instance 
@@ -27,14 +27,14 @@ 
 
 // let us read a bigger data set:
 $data = array();
-foreach(file("ex_histogram.data") as $item) {
+foreach (file("ex_histogram.data") as $item) {
 	$data[] = floatval(trim($item));
 }
 
 // let's do a simple histogram
 $h->setType(\PEAR\Histogram\AbstractHistogram::HISTOGRAM_SIMPLE);
 // and set new bin options
-$h->setBinOptions(20,1.7,2.7);
+$h->setBinOptions(20, 1.7, 2.7);
 // then set a the big data set
 $h->setData($data);
 // and calculate using full stats

docs/examples_histogram/ex_histogram3d.php

Spacing +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__.'/../../vendor/autoload.php';
 
 // let's generate some values;
-for ($i=0; $i < 100; $i++) {
-	$a['x'][$i] = rand(-1,6);
-	$a['y'][$i] = rand(-1,6);
+for ($i = 0; $i < 100; $i++) {
+	$a['x'][$i] = rand(-1, 6);
+	$a['y'][$i] = rand(-1, 6);
 }
 
 $h = new \PEAR\Histogram\Histogram3D();
@@ -19,9 +19,9 @@ 
 // now, let's change the options a wee bit
 $h->setBinOptions(
 	array(
-		'low' => array( 'x' => 0, 'y' => 0),
-		'high' => array( 'x' => 5, 'y' => 5),
-		'nbins' => array( 'x' => 5, 'y' => 5)
+		'low' => array('x' => 0, 'y' => 0),
+		'high' => array('x' => 5, 'y' => 5),
+		'nbins' => array('x' => 5, 'y' => 5)
 		)
 	);
 $h->setType(\PEAR\Histogram\AbstractHistogram::HISTOGRAM_CUMMULATIVE);

docs/examples_histogram/ex_histogram4d.php

Spacing +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
-require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__.'/../../vendor/autoload.php';
 
 // let's generate some data
-for ($i=0; $i < 100; $i++) {
-	$a['x'][$i] = rand(0,4);
-	$a['y'][$i] = rand(0,4);
-	$a['z'][$i] = rand(0,4);
+for ($i = 0; $i < 100; $i++) {
+	$a['x'][$i] = rand(0, 4);
+	$a['y'][$i] = rand(0, 4);
+	$a['z'][$i] = rand(0, 4);
 }
 
 // and create a histogram from the data 
@@ -14,9 +14,9 @@ 
 $h = new \PEAR\Histogram\Histogram4D();
 $h->setBinOptions(
 	array(
-		'low' => array( 'x' => 0, 'y' => 0, 'z'=>0),
-		'high' => array( 'x' => 4.0, 'y' => 4.0, 'z'=>4.0),
-		'nbins' => array( 'x' => 4, 'y' => 4, 'z'=>4)
+		'low' => array('x' => 0, 'y' => 0, 'z'=>0),
+		'high' => array('x' => 4.0, 'y' => 4.0, 'z'=>4.0),
+		'nbins' => array('x' => 4, 'y' => 4, 'z'=>4)
 		)
 	);
 $h->setData($a);

docs/examples_histogram/ex_histogram.php

Spacing +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
-require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__.'/../../vendor/autoload.php';
 
 // create a boring array
 $vals = array(
-			1.5,2,3,4,0,3.2,0.1,0,0,5,3,2,3,4,1,2,4,5,1,3,2,4,5,2,3,4,1,2,
-			1.5,2,3,4,0,3.2,0.1,0,0,5,3,2,3,4,1,2,4,5,1,3,2,4,5,2,3,4,1,2,
-			1.5,2,3,4,0,3.2,0.1,0,0,5,3,2,3,4,1,2,4,5,1,3,2,4,5,2,3,4,1,2
+			1.5, 2, 3, 4, 0, 3.2, 0.1, 0, 0, 5, 3, 2, 3, 4, 1, 2, 4, 5, 1, 3, 2, 4, 5, 2, 3, 4, 1, 2,
+			1.5, 2, 3, 4, 0, 3.2, 0.1, 0, 0, 5, 3, 2, 3, 4, 1, 2, 4, 5, 1, 3, 2, 4, 5, 2, 3, 4, 1, 2,
+			1.5, 2, 3, 4, 0, 3.2, 0.1, 0, 0, 5, 3, 2, 3, 4, 1, 2, 4, 5, 1, 3, 2, 4, 5, 2, 3, 4, 1, 2
 		);
 
 // create an instance 
@@ -23,13 +23,13 @@ 
 
 // let us read a bigger data set:
 $data = array();
-foreach(file(__DIR__."/../../tests/_data/ex_histogram.data") as $item)
+foreach (file(__DIR__."/../../tests/_data/ex_histogram.data") as $item)
 	$data[] = floatval(trim($item));
 
 // let's do a simple histogram
 $h->setType(\PEAR\Histogram\AbstractHistogram::HISTOGRAM_SIMPLE);
 // and set new bin options
-$h->setBinOptions(20,1.7,2.7);
+$h->setBinOptions(20, 1.7, 2.7);
 // then set a the big data set
 $h->setData($data);
 // and calculate using full stats

src/Histogram/Histogram.php

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

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'];