allotaxonometer-ui 0.1.15 → 0.1.16

package/README.md

@@ -24,10 +24,20 @@ npm install allotaxonometer-ui
 - Explore systems and formulate research questions: we recommend starting with the web app...
 - Running multiple or larger scale analyses: we recommend using the py-allotax, which details its install instructions, details the required data format, and provides examples in its repo.
 
-## CSV input
+## Data Input
 
-The allotaxonometer expects 2 tables in the following form:
+The allotaxonometer expects 2 datasets with `types` and `counts`. The `totalunique` and `probs` fields are **optional** and will be calculated automatically if not provided.
 
+### Minimal Format (Recommended)
+```javascript
+const data = [{
+  types: ['John', 'William', 'James', 'George', 'Charles'],
+  counts: [8502, 7494, 5097, 4458, 4061]
+  // totalunique and probs calculated automatically!
+}];
+```
+
+### Full Format (All Fields)
 |    | types   |   counts |   totalunique |   probs |
 |----|---------|----------|---------------|---------|
 |  0 | John    |     8502 |          1161 |  0.0766 |

package/dist/index.js

@@ -1569,14 +1569,39 @@ function zeros(length){
   return Array.from(empty_mat, arr => arr.fill(0))
 }
 
+// Normalize a dataset: calculate totalunique and probs if missing
+function normalizeDataset(data) {
+    // If data already has all required fields, return as-is
+    if (data.every(item => item.probs !== undefined && item.totalunique !== undefined)) {
+        return data;
+    }
+
+    // Calculate total count for probability calculation
+    const totalCount = data.reduce((sum, item) => sum + item.counts, 0);
+    const totalunique = data.length;
+
+    // Return normalized data with calculated fields
+    return data.map(item => ({
+        types: item.types,
+        counts: item.counts,
+        totalunique: item.totalunique ?? totalunique,
+        probs: item.probs ?? (item.counts / totalCount)
+    }));
+}
+
 // Optimized combElems - Single-pass approach (Opt2)
 // This version shows 20-50% performance improvements in most scenarios
+// Now supports optional totalunique and probs fields
 function combElems(elem1, elem2) {
+    // Normalize datasets: calculate totalunique and probs if missing
+    const normalized1 = normalizeDataset(elem1);
+    const normalized2 = normalizeDataset(elem2);
+
     // Build union and collect data in single pass
     const typeMap = new Map();
-    
+
     // Process first dataset
-    for (const item of elem1) {
+    for (const item of normalized1) {
         typeMap.set(item.types, {
             counts1: item.counts,
             probs1: item.probs,
@@ -1584,9 +1609,9 @@ function combElems(elem1, elem2) {
             probs2: 0
         });
     }
-    
+
     // Process second dataset, updating existing or adding new
-    for (const item of elem2) {
+    for (const item of normalized2) {
         const existing = typeMap.get(item.types);
         if (existing) {
             existing.counts2 = item.counts;

package/dist/ssr/index.js

@@ -628,9 +628,24 @@ function zeros(length) {
   let empty_mat = createArray(length, length);
   return Array.from(empty_mat, (arr) => arr.fill(0));
 }
+function normalizeDataset(data) {
+  if (data.every((item) => item.probs !== void 0 && item.totalunique !== void 0)) {
+    return data;
+  }
+  const totalCount = data.reduce((sum2, item) => sum2 + item.counts, 0);
+  const totalunique = data.length;
+  return data.map((item) => ({
+    types: item.types,
+    counts: item.counts,
+    totalunique: item.totalunique ?? totalunique,
+    probs: item.probs ?? item.counts / totalCount
+  }));
+}
 function combElems(elem1, elem2) {
+  const normalized1 = normalizeDataset(elem1);
+  const normalized2 = normalizeDataset(elem2);
   const typeMap = /* @__PURE__ */ new Map();
-  for (const item of elem1) {
+  for (const item of normalized1) {
     typeMap.set(item.types, {
       counts1: item.counts,
       probs1: item.probs,
@@ -638,7 +653,7 @@ function combElems(elem1, elem2) {
       probs2: 0
     });
   }
-  for (const item of elem2) {
+  for (const item of normalized2) {
     const existing = typeMap.get(item.types);
     if (existing) {
       existing.counts2 = item.counts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "allotaxonometer-ui",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "Headless UI components for allotaxonometer visualizations built with Svelte 5",
   "type": "module",
   "main": "./dist/index.js",