fix tests and corner cases

sgratzl · Jul 19, 2020 · 118b53c · 118b53c
1 parent 6fb67cf
commit 118b53c
Show file tree

Hide file tree

Showing 25 changed files with 39 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.10.5",
-    "@sgratzl/boxplots": "^1.2.0",
+    "@sgratzl/boxplots": "^1.2.1",
     "@sgratzl/science": "^2.0.0"
   },
   "devDependencies": {

diff --git a/samples/animation.html b/samples/animation.html
@@ -32,7 +32,7 @@
             borderWidth: 1,
             outlierRadius: 3,
             itemRadius: 3,
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
             data: [randomValues(100, 1, 9).concat([14, 16, 0]), randomValues(100, 0, 10)],
           },
         ],

diff --git a/samples/datalimits.html b/samples/datalimits.html
@@ -36,15 +36,15 @@
             borderColor: window.chartColors.red,
             borderWidth: 1,
             data: samples.boxplots({ count: 7, random: random }),
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
           },
           {
             label: 'Dataset 2',
             backgroundColor: color(window.chartColors.blue).alpha(0.5).rgbString(),
             borderColor: window.chartColors.blue,
             borderWidth: 1,
             data: samples.boxplotsArray({ count: 7, random: random }),
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
           },
         ],
       };

diff --git a/samples/datastructures.html b/samples/datastructures.html
@@ -30,12 +30,11 @@
             backgroundColor: 'rgba(255,0,0,0.2)',
             borderColor: 'red',
             borderWidth: 1,
-            outlierColor: '#999999',
             padding: 10,
             itemRadius: 2,
             itemStyle: 'circle',
             itemBackgroundColor: '#000',
-            outlierColor: '#000',
+            outlierBackgroundColor: '#000',
             data: [
               [1, 2, 3, 4, 5],
               {

diff --git a/samples/default.html b/samples/default.html
@@ -39,16 +39,16 @@
             borderColor: window.chartColors.red,
             borderWidth: 1,
             data: samples.boxplots({ count: 7, random: random }),
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
           },
           {
             label: 'Dataset 2',
             backgroundColor: color(window.chartColors.blue).alpha(0.5).rgbString(),
             borderColor: window.chartColors.blue,
             borderWidth: 1,
             data: samples.boxplotsArray({ count: 7, random: random }),
-            outlierColor: '#999999',
-            lowerColor: '#461e7d',
+            outlierBackgroundColor: '#999999',
+            lowerBackgroundColor: '#461e7d',
           },
         ],
       };

diff --git a/samples/empty.html b/samples/empty.html
@@ -32,7 +32,7 @@
             borderWidth: 1,
             outlierRadius: 3,
             itemRadius: 3,
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
             data: [[], randomValues(100, 0, 10)],
           },
         ],

diff --git a/samples/items.html b/samples/items.html
@@ -40,7 +40,7 @@
             borderWidth: 1,
             itemRadius: 2,
             data: samples.boxplots({ count: 7, random: random }),
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
           },
           {
             label: 'Dataset 2',
@@ -49,8 +49,8 @@
             borderWidth: 1,
             itemRadius: 2,
             data: samples.boxplotsArray({ count: 7, random: random }),
-            outlierColor: '#999999',
-            lowerColor: '#461e7d',
+            outlierBackgroundColor: '#999999',
+            lowerBackgroundColor: '#461e7d',
           },
         ],
       };

diff --git a/samples/mediancolor.html b/samples/mediancolor.html
@@ -33,7 +33,7 @@
             borderWidth: 1,
             outlierRadius: 3,
             itemRadius: 3,
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
             data: [randomValues(100, 1, 9).concat([14, 16, 0]), randomValues(100, 0, 10)],
           },
         ],

diff --git a/src/controllers/BoxPlotController.spec.js b/src/controllers/BoxPlotController.spec.js
@@ -1,13 +1,13 @@
 import matchChart from '../__tests__/matchChart';
 import { BoxPlotController } from './BoxPlotController';
 import { Samples } from './__tests__/utils';
-import { registry } from '@sgratzl/chartjs-esm-facade';
+import { registry, BarController, LineController, Point, Rectangle, Line } from '@sgratzl/chartjs-esm-facade';
 import { BoxAndWiskers } from '../elements';
 
 describe('boxplot', () => {
   beforeAll(() => {
-    registry.addControllers(BoxPlotController);
-    registry.addElements(BoxAndWiskers);
+    registry.addControllers(BoxPlotController, BarController, LineController);
+    registry.addElements(BoxAndWiskers, Point, Rectangle, Line);
   });
 
   test('default', () => {
@@ -23,15 +23,15 @@ describe('boxplot', () => {
             backgroundColor: 'red',
             borderWidth: 1,
             data: samples.boxplots({ count: 7 }),
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
           },
           {
             label: 'Dataset 2',
             backgroundColor: 'blue',
             borderWidth: 1,
             data: samples.boxplotsArray({ count: 7 }),
-            outlierColor: '#999999',
-            lowerColor: '#461e7d',
+            outlierBackgroundColor: '#999999',
+            lowerBackgroundColor: '#461e7d',
           },
         ],
       },
@@ -70,7 +70,7 @@ describe('boxplot', () => {
             borderWidth: 1,
             outlierRadius: 3,
             itemRadius: 3,
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
             data: [
               samples.numbers({ count: 100, min: 1, max: 9 }).concat([14, 16, 0]),
               samples.numbers({ count: 100, min: 0, max: 10 }),
@@ -130,16 +130,16 @@ describe('boxplot', () => {
             borderWidth: 1,
             itemRadius: 2,
             data: samples.boxplots({ count: 7 }),
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
           },
           {
             label: 'Dataset 2',
             backgroundColor: 'blue',
             borderWidth: 1,
             itemRadius: 2,
             data: samples.boxplotsArray({ count: 7 }),
-            outlierColor: '#999999',
-            lowerColor: '#461e7d',
+            outlierBackgroundColor: '#999999',
+            lowerBackgroundColor: '#461e7d',
           },
         ],
       },
@@ -233,14 +233,14 @@ describe('boxplot', () => {
             backgroundColor: 'red',
             borderWidth: 1,
             data: samples.boxplots({ count: 7 }),
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
           },
           {
             label: 'Dataset 2',
             backgroundColor: 'blue',
             borderWidth: 1,
             data: samples.boxplotsArray({ count: 7 }),
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
           },
         ],
       },
@@ -266,12 +266,11 @@ describe('boxplot', () => {
             backgroundColor: 'rgba(255,0,0,0.2)',
             borderColor: 'red',
             borderWidth: 1,
-            outlierColor: '#999999',
             padding: 10,
             itemRadius: 2,
             itemStyle: 'circle',
             itemBackgroundColor: '#000',
-            outlierColor: '#000',
+            outlierBackgroundColor: '#000',
             data: [
               [1, 2, 3, 4, 5],
               {
@@ -325,7 +324,7 @@ describe('boxplot', () => {
             borderWidth: 1,
             outlierRadius: 3,
             itemRadius: 3,
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
             data: [[], samples.numbers({ count: 100, min: 0, max: 10 })],
           },
         ],

diff --git a/src/controllers/ViolinController.spec.js b/src/controllers/ViolinController.spec.js
@@ -21,15 +21,15 @@ describe('violin', () => {
             backgroundColor: 'red',
             borderWidth: 1,
             data: samples.boxplotsArray({ count: 7 }),
-            outlierColor: '#999999',
+            outlierBackgroundColor: '#999999',
           },
           {
             label: 'Dataset 2',
             backgroundColor: 'blue',
             borderWidth: 1,
             data: samples.boxplotsArray({ count: 7 }),
-            outlierColor: '#999999',
-            lowerColor: '#461e7d',
+            outlierBackgroundColor: '#999999',
+            lowerBackgroundColor: '#461e7d',
           },
         ],
       },

diff --git a/...s/__image_snapshots__/box-plot-controller-spec-js-boxplot-datalimits-1-snap.png b/...s/__image_snapshots__/box-plot-controller-spec-js-boxplot-datalimits-1-snap.png
diff --git a/...image_snapshots__/box-plot-controller-spec-js-boxplot-datastructures-1-snap.png b/...image_snapshots__/box-plot-controller-spec-js-boxplot-datastructures-1-snap.png
diff --git a/...lers/__image_snapshots__/box-plot-controller-spec-js-boxplot-default-1-snap.png b/...lers/__image_snapshots__/box-plot-controller-spec-js-boxplot-default-1-snap.png
diff --git a/...ollers/__image_snapshots__/box-plot-controller-spec-js-boxplot-empty-1-snap.png b/...ollers/__image_snapshots__/box-plot-controller-spec-js-boxplot-empty-1-snap.png
diff --git a/...llers/__image_snapshots__/box-plot-controller-spec-js-boxplot-hybrid-1-snap.png b/...llers/__image_snapshots__/box-plot-controller-spec-js-boxplot-hybrid-1-snap.png
diff --git a/...ollers/__image_snapshots__/box-plot-controller-spec-js-boxplot-items-1-snap.png b/...ollers/__image_snapshots__/box-plot-controller-spec-js-boxplot-items-1-snap.png
diff --git a/.../__image_snapshots__/box-plot-controller-spec-js-boxplot-logarithmic-1-snap.png b/.../__image_snapshots__/box-plot-controller-spec-js-boxplot-logarithmic-1-snap.png
diff --git a/.../__image_snapshots__/box-plot-controller-spec-js-boxplot-mediancolor-1-snap.png b/.../__image_snapshots__/box-plot-controller-spec-js-boxplot-mediancolor-1-snap.png
diff --git a/...llers/__image_snapshots__/box-plot-controller-spec-js-boxplot-minmax-1-snap.png b/...llers/__image_snapshots__/box-plot-controller-spec-js-boxplot-minmax-1-snap.png
diff --git a/...ge_snapshots__/box-plot-controller-spec-js-boxplot-quantiles-fivenum-1-snap.png b/...ge_snapshots__/box-plot-controller-spec-js-boxplot-quantiles-fivenum-1-snap.png
diff --git a/...ge_snapshots__/box-plot-controller-spec-js-boxplot-quantiles-types-7-1-snap.png b/...ge_snapshots__/box-plot-controller-spec-js-boxplot-quantiles-types-7-1-snap.png
diff --git a/src/data.js b/src/data.js
@@ -91,10 +91,7 @@ function determineStatsOptions(options) {
 }
 
 export function boxplotStats(arr, options) {
-  const r = boxplots(arr, {
-    coef: options.coef,
-    quantiles: determineQuantiles(options.quantiles),
-  });
+  const r = boxplots(arr, determineStatsOptions(options));
   r.whiskerMax = r.whiskerHigh;
   r.whiskerMin = r.whiskerLow;
   r.outliers = r.outlier;

diff --git a/src/elements/BoxAndWiskers.js b/src/elements/BoxAndWiskers.js
@@ -43,7 +43,7 @@ export class BoxAndWiskers extends StatsBase {
 
     // Draw the median line
     ctx.save();
-    if (options.medianColor && options.medianColor !== 'none') {
+    if (options.medianColor && options.medianColor !== 'transparent') {
       ctx.strokeStyle = options.medianColor;
     }
     ctx.beginPath();
@@ -55,7 +55,7 @@ export class BoxAndWiskers extends StatsBase {
 
     ctx.save();
     // fill the part below the median with lowerColor
-    if (options.lowerBackgroundColor && options.lowerBackgroundColor !== 'none') {
+    if (options.lowerBackgroundColor && options.lowerBackgroundColor !== 'transparent') {
       ctx.fillStyle = options.lowerBackgroundColor;
       if (props.q3 > props.q1) {
         ctx.fillRect(x0, props.median, width, props.q3 - props.median);

diff --git a/src/elements/base.js b/src/elements/base.js
@@ -22,7 +22,7 @@ export const baseRoutes = {
   itemBorderColor: 'color',
 };
 
-export const baseOptionKeys = /*#__PURE__*/ Object.keys(baseDefaults);
+export const baseOptionKeys = /*#__PURE__*/ (() => Object.keys(baseDefaults).concat(Object.keys(baseRoutes)))();
 
 export class StatsBase extends Element {
   isVertical() {

diff --git a/yarn.lock b/yarn.lock
@@ -1915,10 +1915,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sgratzl/boxplots@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@sgratzl/boxplots@npm:1.2.0"
-  checksum: 643f1aae2befbff5d68ff1fb15da5eb0866a8133af10a4dec311efa0533c7d2e2afb243ec5958656ef31c6acec43027a62a2ba53b5eb04ba25d11d5695a7fb9b
+"@sgratzl/boxplots@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@sgratzl/boxplots@npm:1.2.1"
+  checksum: c01aa25f9b23c3f50ed24491d9c37690bd055a9688c3a9e600f310d2b73e27fc0b1d57c3128fe93bf79355e1a4eb2f7e520c1364edb22442b28c971720e4d412
   languageName: node
   linkType: hard
 
@@ -1934,7 +1934,7 @@ __metadata:
     "@rollup/plugin-babel": ^5.1.0
     "@rollup/plugin-commonjs": ^14.0.0
     "@rollup/plugin-node-resolve": ^8.4.0
-    "@sgratzl/boxplots": ^1.2.0
+    "@sgratzl/boxplots": ^1.2.1
     "@sgratzl/chartjs-esm-facade": ^3.0.0-alpha.2
     "@sgratzl/science": ^2.0.0
     "@yarnpkg/pnpify": ^2.1.0