Netbrain has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118692
Change subject: Added petroleum industry standard for p10/p90 definition
......................................................................
Added petroleum industry standard for p10/p90 definition
Change-Id: If81ffdd0e4637f931f51f9ba1d5821735f4be9af
---
M SemanticHighcharts.php
A SemanticHighcharts.settings.php
M src/charts/FrequencyHistogram.php
3 files changed, 33 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticHighcharts
refs/changes/92/118692/1
diff --git a/SemanticHighcharts.php b/SemanticHighcharts.php
index 5ff43b5..910c7c9 100644
--- a/SemanticHighcharts.php
+++ b/SemanticHighcharts.php
@@ -66,4 +66,7 @@
$smwgResultAliases[$format] =
$formatAliases[$format];
}
}
-};
\ No newline at end of file
+};
+
+
+require_once(__DIR__ . '/SemanticHighcharts.settings.php');
\ No newline at end of file
diff --git a/SemanticHighcharts.settings.php b/SemanticHighcharts.settings.php
new file mode 100644
index 0000000..e36cdea
--- /dev/null
+++ b/SemanticHighcharts.settings.php
@@ -0,0 +1,18 @@
+<?php
+/*
+ * DO NOT EDIT THIS FILE
+ * SETTINGS SHOULD BE SET IN LocalSettings.php
+ */
+global $shcConfig;
+
+const PERCENTILE_DEFINITION = 'percentile definition';
+const PERCENTILE_DEFINITION_DEFAULT = 'default';
+const PERCENTILE_DEFINITION_PETROLEUM_INDUSTRY = 'petroleum industry';
+
+if(!isset($shcConfig)){
+ $shcConfig = array();
+}
+
+if(!isset($shcConfig[PERCENTILE_DEFINITION])){
+ $shcConfig[PERCENTILE_DEFINITION] = PERCENTILE_DEFINITION_DEFAULT;
+}
\ No newline at end of file
diff --git a/src/charts/FrequencyHistogram.php
b/src/charts/FrequencyHistogram.php
index 95537b2..4ebd4af 100644
--- a/src/charts/FrequencyHistogram.php
+++ b/src/charts/FrequencyHistogram.php
@@ -81,6 +81,7 @@
}
protected function getChartJSON() {
+ global $shcConfig;
$title = $this->params['title'];
$subtitle = $this->params['subtitle'];
$ytitle = $this->params['ytitle'];
@@ -90,7 +91,6 @@
$xAxisLabelsRotation = $this->params['xlrotation'];
$frequencyTable = $this->getFrequencyDistributionTable();
- $count = count($frequencyTable);
$total = array_sum($frequencyTable);
@@ -167,9 +167,16 @@
$mean = round($mean,2);
$sortedFrequencyTableValues = array_keys($frequencyTable);
- $p10 = $this->getPercentile(0.1,$sortedFrequencyTableValues);
- $p50 = $this->getPercentile(0.5,$sortedFrequencyTableValues);
- $p90 = $this->getPercentile(0.9,$sortedFrequencyTableValues);
+
+ if($shcConfig[PERCENTILE_DEFINITION] ===
PERCENTILE_DEFINITION_PETROLEUM_INDUSTRY){
+ $p10 =
$this->getPercentile(0.9,$sortedFrequencyTableValues);
+ $p50 =
$this->getPercentile(0.5,$sortedFrequencyTableValues);
+ $p90 =
$this->getPercentile(0.1,$sortedFrequencyTableValues);
+ }else{
+ $p10 =
$this->getPercentile(0.1,$sortedFrequencyTableValues);
+ $p50 =
$this->getPercentile(0.5,$sortedFrequencyTableValues);
+ $p90 =
$this->getPercentile(0.9,$sortedFrequencyTableValues);
+ }
$json = <<<EOT
{
--
To view, visit https://gerrit.wikimedia.org/r/118692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If81ffdd0e4637f931f51f9ba1d5821735f4be9af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticHighcharts
Gerrit-Branch: master
Gerrit-Owner: Netbrain <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
