@uwdata/mosaic-plot 0.8.0 → 0.9.0

package/src/marks/util/stats.js

@@ -163,3 +163,91 @@ export function qt(p, dof) {
   x = Math.sqrt((dof * (1 - x)) / x);
   return p > 0.5 ? x : -x;
 }
+
+/**
+ * Approximate inverse error function.
+ * @param {number} x
+ * @returns {number}
+ */
+export function erfinv(x) {
+  // Implementation from "Approximating the erfinv function" by Mike Giles,
+  // GPU Computing Gems, volume 2, 2010.
+  // Ported from Apache Commons Math, http://www.apache.org/licenses/LICENSE-2.0
+
+  // beware that the logarithm argument must be
+  // computed as (1.0 - x) * (1.0 + x),
+  // it must NOT be simplified as 1.0 - x * x as this
+  // would induce rounding errors near the boundaries +/-1
+  let w = - Math.log((1 - x) * (1 + x));
+  let p;
+
+  if (w < 6.25) {
+    w -= 3.125;
+    p =  -3.6444120640178196996e-21;
+    p =   -1.685059138182016589e-19 + p * w;
+    p =   1.2858480715256400167e-18 + p * w;
+    p =    1.115787767802518096e-17 + p * w;
+    p =   -1.333171662854620906e-16 + p * w;
+    p =   2.0972767875968561637e-17 + p * w;
+    p =   6.6376381343583238325e-15 + p * w;
+    p =  -4.0545662729752068639e-14 + p * w;
+    p =  -8.1519341976054721522e-14 + p * w;
+    p =   2.6335093153082322977e-12 + p * w;
+    p =  -1.2975133253453532498e-11 + p * w;
+    p =  -5.4154120542946279317e-11 + p * w;
+    p =    1.051212273321532285e-09 + p * w;
+    p =  -4.1126339803469836976e-09 + p * w;
+    p =  -2.9070369957882005086e-08 + p * w;
+    p =   4.2347877827932403518e-07 + p * w;
+    p =  -1.3654692000834678645e-06 + p * w;
+    p =  -1.3882523362786468719e-05 + p * w;
+    p =    0.0001867342080340571352 + p * w;
+    p =  -0.00074070253416626697512 + p * w;
+    p =   -0.0060336708714301490533 + p * w;
+    p =      0.24015818242558961693 + p * w;
+    p =       1.6536545626831027356 + p * w;
+  } else if (w < 16.0) {
+    w = Math.sqrt(w) - 3.25;
+    p =   2.2137376921775787049e-09;
+    p =   9.0756561938885390979e-08 + p * w;
+    p =  -2.7517406297064545428e-07 + p * w;
+    p =   1.8239629214389227755e-08 + p * w;
+    p =   1.5027403968909827627e-06 + p * w;
+    p =   -4.013867526981545969e-06 + p * w;
+    p =   2.9234449089955446044e-06 + p * w;
+    p =   1.2475304481671778723e-05 + p * w;
+    p =  -4.7318229009055733981e-05 + p * w;
+    p =   6.8284851459573175448e-05 + p * w;
+    p =   2.4031110387097893999e-05 + p * w;
+    p =   -0.0003550375203628474796 + p * w;
+    p =   0.00095328937973738049703 + p * w;
+    p =   -0.0016882755560235047313 + p * w;
+    p =    0.0024914420961078508066 + p * w;
+    p =   -0.0037512085075692412107 + p * w;
+    p =     0.005370914553590063617 + p * w;
+    p =       1.0052589676941592334 + p * w;
+    p =       3.0838856104922207635 + p * w;
+  } else if (Number.isFinite(w)) {
+    w = Math.sqrt(w) - 5.0;
+    p =  -2.7109920616438573243e-11;
+    p =  -2.5556418169965252055e-10 + p * w;
+    p =   1.5076572693500548083e-09 + p * w;
+    p =  -3.7894654401267369937e-09 + p * w;
+    p =   7.6157012080783393804e-09 + p * w;
+    p =  -1.4960026627149240478e-08 + p * w;
+    p =   2.9147953450901080826e-08 + p * w;
+    p =  -6.7711997758452339498e-08 + p * w;
+    p =   2.2900482228026654717e-07 + p * w;
+    p =  -9.9298272942317002539e-07 + p * w;
+    p =   4.5260625972231537039e-06 + p * w;
+    p =  -1.9681778105531670567e-05 + p * w;
+    p =   7.5995277030017761139e-05 + p * w;
+    p =  -0.00021503011930044477347 + p * w;
+    p =  -0.00013871931833623122026 + p * w;
+    p =       1.0103004648645343977 + p * w;
+    p =       4.8499064014085844221 + p * w;
+  } else {
+    p = Infinity;
+  }
+  return p * x;
+}

package/src/plot-renderer.js

@@ -1,7 +1,6 @@
 import * as Plot from '@observablehq/plot';
 import { setAttributes } from './plot-attributes.js';
 import { Fixed } from './symbols.js';
-import { isArrowTable } from '@uwdata/mosaic-core';
 
 const OPTIONS_ONLY_MARKS = new Set([
   'frame',
@@ -10,6 +9,19 @@ const OPTIONS_ONLY_MARKS = new Set([
   'graticule'
 ]);
 
+// @ts-ignore
+const SELECT_TRANSFORMS = new Map([
+  ['first', Plot.selectFirst],
+  ['last', Plot.selectLast],
+  ['maxX', Plot.selectMaxX],
+  ['maxY', Plot.selectMaxY],
+  ['minX', Plot.selectMinX],
+  ['minY', Plot.selectMinY],
+  ['nearest', Plot.pointer],
+  ['nearestX', Plot.pointerX],
+  ['nearestXY', Plot.pointerY]
+]);
+
 // construct Plot output
 // see https://github.com/observablehq/plot
 export async function plotRenderer(plot) {
@@ -24,27 +36,13 @@ export async function plotRenderer(plot) {
   const indices = [];
   for (const mark of marks) {
     for (const { type, data, options } of mark.plotSpecs()) {
-      if (OPTIONS_ONLY_MARKS.has(type)) {
-        spec.marks.push(Plot[type](options));
-      } else if (isArrowTable(data)) {
-        // optimized calls to Plot for Arrow:
-        // https://github.com/observablehq/plot/issues/191#issuecomment-2010986851
-        const opts = Object.fromEntries(
-          Object.entries(options).map(([k, v]) => {
-            let val = v;
-            if (typeof v === 'string') {
-              val = data.getChild(v) ?? v;
-            } else if (typeof v === 'object') {
-              const value = data.getChild(v.value);
-              val = value ? {value} : v;
-            }
-            return [k, val]
-          })
-        );
-        spec.marks.push(Plot[type]({length: data.numRows}, opts));
-      } else {
-        spec.marks.push(Plot[type](data, options));
-      }
+      // prepare mark options
+      const { select, ...rest } = options;
+      const opt = SELECT_TRANSFORMS.get(select)?.(rest) ?? rest;
+      const arg = OPTIONS_ONLY_MARKS.has(type) ? [opt] : [data, opt];
+
+      // instantiate Plot mark and add to spec
+      spec.marks.push(Plot[type](...arg));
       indices.push(mark.index);
     }
   }
@@ -165,6 +163,7 @@ function annotateMarks(svg, indices) {
 }
 
 function getType(data, channel) {
+  if (!data) return;
   const { columns } = data;
   const col = columns[channel] ?? columns[channel+'1'] ?? columns[channel+'2'];
   if (col) {

package/src/transforms/bin.js

@@ -1,7 +1,9 @@
 import { Transform } from '../symbols.js';
 import { channelScale } from '../marks/util/channel-scale.js';
 
-const EXTENT = new Set(['rectY-x', 'rectX-y', 'rect-x', 'rect-y']);
+const EXTENT = new Set([
+  'rectY-x', 'rectX-y', 'rect-x', 'rect-y', 'ruleY-x', 'ruleX-y'
+]);
 
 export function bin(field, options = { steps: 25 }) {
   const fn = (mark, channel) => {