svelteplot 0.7.1-pr-280.15 → 0.7.1-pr-280.16

package/dist/transforms/density.d.ts

@@ -17,10 +17,13 @@ type DensityOptions<T> = {
      */
     interval?: number | string;
     /**
-     *
+     * If true, the density values will be trimmed to the range of the data.
      */
     trim?: boolean;
-    weight?: (d: T) => number;
+    /**
+     * If true, the density values will be cumulative.
+     */
+    cumulative?: false | 1 | -1;
 };
 /**
  * One-dimensional kernel density estimation

package/dist/transforms/density.js

@@ -102,11 +102,12 @@ function roundToTerminating(x, sig = 2) {
 }
 function density1d(independent, { data, weight, ...channels }, options = {}) {
     const densityChannel = independent === 'x' ? 'y' : 'x';
-    const { kernel, bandwidth, interval, trim, channel } = {
+    const { kernel, bandwidth, interval, trim, channel, cumulative } = {
         kernel: 'epanechnikov',
         bandwidth: bandwidthSilverman,
         interval: undefined,
         trim: false,
+        cumulative: false,
         channel: densityChannel,
         ...options
     };
@@ -143,7 +144,7 @@ function density1d(independent, { data, weight, ...channels }, options = {}) {
     const res = groupFacetsAndZ(resolvedData, channels, (items, groupProps) => {
         const values = items.map((d) => d[VALUE]);
         const weights = items.map((d) => d[WEIGHT]);
-        let kdeValues = kde1d(values, weights, atValues, k, bw)
+        let kdeValues = kde1d(values, weights, atValues, k, bw, cumulative)
             .filter(([x, density]) => x != null && !isNaN(density))
             .sort((a, b) => a[0] - b[0]);
         if (!trim) {
@@ -165,16 +166,16 @@ function density1d(independent, { data, weight, ...channels }, options = {}) {
         [independent]: CHANNELS[independent],
         [channel]: CHANNELS[densityChannel],
         ...res,
-        [ORIGINAL_NAME_KEYS[densityChannel]]: 'Density',
+        [ORIGINAL_NAME_KEYS[densityChannel]]: cumulative === false ? 'Density' : 'CDF',
         [ORIGINAL_NAME_KEYS[independent]]: typeof channels[independent] === 'string' ? channels[independent] : undefined,
         sort: [{ channel: CHANNELS[independent], order: 'ascending' }],
         data: outData
     };
 }
-function kde1d(values, weights, atValues, kernel, bw) {
+function kde1d(values, weights, atValues, kernel, bw, cumulative) {
     const n = values.length;
     const weightSum = weights.reduce((a, b) => a + b, 0);
-    return atValues.map((x) => {
+    const densities = atValues.map((x) => {
         let sum = 0;
         for (let i = 0; i < n; i++) {
             const u = (x - values[i]) / bw;
@@ -182,6 +183,38 @@ function kde1d(values, weights, atValues, kernel, bw) {
         }
         return [x, sum / (weightSum * bw)];
     });
+    if (!cumulative)
+        return densities;
+    const totalArea = densities.reduce((acc, curr, i) => {
+        if (i === 0)
+            return acc;
+        const dx = densities[i][0] - densities[i - 1][0];
+        return acc + ((densities[i - 1][1] + curr[1]) / 2) * dx;
+    }, 0);
+    if (totalArea === 0)
+        return densities;
+    if (cumulative === -1) {
+        let area = 0;
+        const cdf = new Array(densities.length);
+        for (let i = densities.length - 1; i >= 0; i--) {
+            if (i < densities.length - 1) {
+                const dx = densities[i + 1][0] - densities[i][0];
+                area += ((densities[i + 1][1] + densities[i][1]) / 2) * dx;
+            }
+            cdf[i] = [densities[i][0], area / totalArea];
+        }
+        return cdf;
+    }
+    let area = 0;
+    const cdf = new Array(densities.length);
+    for (let i = 0; i < densities.length; i++) {
+        if (i > 0) {
+            const dx = densities[i][0] - densities[i - 1][0];
+            area += ((densities[i - 1][1] + densities[i][1]) / 2) * dx;
+        }
+        cdf[i] = [densities[i][0], area / totalArea];
+    }
+    return cdf;
 }
 function maybeKernel(kernel) {
     if (typeof kernel === 'function')

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.7.1-pr-280.15",
+    "version": "0.7.1-pr-280.16",
     "license": "ISC",
     "author": {
         "name": "Gregor Aisch",