You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2018/05/21 21:13:10 UTC
[incubator-echarts] 01/02: Move the math helper.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 65b71f85b502a4f3fff358d812aabdd1aa455554
Author: sushuang <su...@gmail.com>
AuthorDate: Tue May 22 05:10:55 2018 +0800
Move the math helper.
---
extension-src/dataTool/prepareBoxplotData.js | 7 ++---
extension-src/dataTool/quantile.js | 43 ---------------------------
src/util/number.js | 44 ++++++++++++++++++++++++++++
3 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/extension-src/dataTool/prepareBoxplotData.js b/extension-src/dataTool/prepareBoxplotData.js
index 1503526..690a8de 100644
--- a/extension-src/dataTool/prepareBoxplotData.js
+++ b/extension-src/dataTool/prepareBoxplotData.js
@@ -17,7 +17,6 @@
* under the License.
*/
-import quantile from './quantile';
import * as numberUtil from '../../src/util/number';
/**
@@ -58,9 +57,9 @@ export default function (rawData, opt) {
axisData.push(i + '');
var ascList = numberUtil.asc(rawData[i].slice());
- var Q1 = quantile(ascList, 0.25);
- var Q2 = quantile(ascList, 0.5);
- var Q3 = quantile(ascList, 0.75);
+ var Q1 = numberUtil.quantile(ascList, 0.25);
+ var Q2 = numberUtil.quantile(ascList, 0.5);
+ var Q3 = numberUtil.quantile(ascList, 0.75);
var min = ascList[0];
var max = ascList[ascList.length - 1];
diff --git a/extension-src/dataTool/quantile.js b/extension-src/dataTool/quantile.js
deleted file mode 100644
index bfcc3d2..0000000
--- a/extension-src/dataTool/quantile.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * BSD 3-Clause
- *
- * Copyright (c) 2010-2015, Michael Bostock
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * The name Michael Bostock may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * @see <https://github.com/mbostock/d3/blob/master/src/arrays/quantile.js>
- * @see <http://en.wikipedia.org/wiki/Quantile>
- * @param {Array.<number>} ascArr
- */
-export default function(ascArr, p) {
- var H = (ascArr.length - 1) * p + 1,
- h = Math.floor(H),
- v = +ascArr[h - 1],
- e = H - h;
- return e ? v + e * (ascArr[h] - v) : v;
-}
diff --git a/src/util/number.js b/src/util/number.js
index a66f3f0..f3dad2d 100644
--- a/src/util/number.js
+++ b/src/util/number.js
@@ -410,6 +410,50 @@ export function nice(val, round) {
}
/**
+ * BSD 3-Clause
+ *
+ * Copyright (c) 2010-2015, Michael Bostock
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * * The name Michael Bostock may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @see <https://github.com/mbostock/d3/blob/master/src/arrays/quantile.js>
+ * @see <http://en.wikipedia.org/wiki/Quantile>
+ * @param {Array.<number>} ascArr
+ */
+export function quantile(ascArr, p) {
+ var H = (ascArr.length - 1) * p + 1;
+ var h = Math.floor(H);
+ var v = +ascArr[h - 1];
+ var e = H - h;
+ return e ? v + e * (ascArr[h] - v) : v;
+}
+
+/**
* Order intervals asc, and split them when overlap.
* expect(numberUtil.reformIntervals([
* {interval: [18, 62], close: [1, 1]},
--
To stop receiving notification emails like this one, please contact
sushuang@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org