@yipe/dice 0.1.4 → 0.2.0

package/dist/index.d.cts

@@ -816,7 +816,7 @@ declare class PMF {
      * optionally guarantees at least `minBins` survivors by adding top-K.
      * Returns a new, non-normalized PMF.
      */
-    pruneRelative(epsRel: number, minBins?: number): PMF;
+    prune(epsRel: number, minBins?: number): PMF;
     /** NEW - REVIEW IF THESE ARE USEFUL OR DUPLCIATIVE?  */
     /** Probability mass at exactly x. */
     pAt(x: number): number;
@@ -881,6 +881,19 @@ declare class PMF {
     query(): DiceQuery;
 }
 
+/** Enable or disable the internal parse cache. */
+declare function setCachingEnabled(enabled: boolean): void;
+/** Returns whether the internal parse cache is currently enabled. */
+declare function getCachingEnabled(): boolean;
+/** Clears the internal parse cache. */
+declare function clearParserCache(): void;
+/**
+ * Parse a dice expression into a PMF.
+ *
+ * - Expression is case-insensitive and ignores spaces.
+ */
+declare function parse(expression: string, n?: number): PMF;
+
 /** A labeled mixture builder that preserves provenance in Bin.count. */
 declare class Mixture<L extends string = string> {
     private readonly totals;
@@ -917,17 +930,4 @@ declare class Mixture<L extends string = string> {
     static mix<L extends string = string>(items: Array<[label: L, pmf: PMF, weight: number]>, eps?: number): PMF;
 }
 
-/** Enable or disable the internal parse cache. */
-declare function setCachingEnabled(enabled: boolean): void;
-/** Returns whether the internal parse cache is currently enabled. */
-declare function getCachingEnabled(): boolean;
-/** Clears the internal parse cache. */
-declare function clearParserCache(): void;
-/**
- * Parse a dice expression into a PMF.
- *
- * - Expression is case-insensitive and ignores spaces.
- */
-declare function parse(expression: string, n?: number): PMF;
-
 export { type Bin, type DamageDistribution, DiceQuery, EPS, LRUCache, Mixture, type OutcomeLabelMap, type OutcomeSnapshot, type OutcomeType, PMF, type Rounding, type Snapshot, clearParserCache, getCachingEnabled, parse, pmfCache, setCachingEnabled };

package/dist/index.d.ts

@@ -816,7 +816,7 @@ declare class PMF {
      * optionally guarantees at least `minBins` survivors by adding top-K.
      * Returns a new, non-normalized PMF.
      */
-    pruneRelative(epsRel: number, minBins?: number): PMF;
+    prune(epsRel: number, minBins?: number): PMF;
     /** NEW - REVIEW IF THESE ARE USEFUL OR DUPLCIATIVE?  */
     /** Probability mass at exactly x. */
     pAt(x: number): number;
@@ -881,6 +881,19 @@ declare class PMF {
     query(): DiceQuery;
 }
 
+/** Enable or disable the internal parse cache. */
+declare function setCachingEnabled(enabled: boolean): void;
+/** Returns whether the internal parse cache is currently enabled. */
+declare function getCachingEnabled(): boolean;
+/** Clears the internal parse cache. */
+declare function clearParserCache(): void;
+/**
+ * Parse a dice expression into a PMF.
+ *
+ * - Expression is case-insensitive and ignores spaces.
+ */
+declare function parse(expression: string, n?: number): PMF;
+
 /** A labeled mixture builder that preserves provenance in Bin.count. */
 declare class Mixture<L extends string = string> {
     private readonly totals;
@@ -917,17 +930,4 @@ declare class Mixture<L extends string = string> {
     static mix<L extends string = string>(items: Array<[label: L, pmf: PMF, weight: number]>, eps?: number): PMF;
 }
 
-/** Enable or disable the internal parse cache. */
-declare function setCachingEnabled(enabled: boolean): void;
-/** Returns whether the internal parse cache is currently enabled. */
-declare function getCachingEnabled(): boolean;
-/** Clears the internal parse cache. */
-declare function clearParserCache(): void;
-/**
- * Parse a dice expression into a PMF.
- *
- * - Expression is case-insensitive and ignores spaces.
- */
-declare function parse(expression: string, n?: number): PMF;
-
 export { type Bin, type DamageDistribution, DiceQuery, EPS, LRUCache, Mixture, type OutcomeLabelMap, type OutcomeSnapshot, type OutcomeType, PMF, type Rounding, type Snapshot, clearParserCache, getCachingEnabled, parse, pmfCache, setCachingEnabled };

package/dist/index.js

@@ -2,7 +2,7 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
-// src/lru-cache.ts
+// src/common/lru-cache.ts
 var LRUCache = class {
   constructor(maxSize = 1e3) {
     this.maxSize = maxSize;
@@ -44,10 +44,10 @@ var LRUCache = class {
   }
 };
 
-// src/types.ts
+// src/common/types.ts
 var EPS = 1e-12;
 
-// src/query.ts
+// src/pmf/query.ts
 var _DiceQuery = class _DiceQuery {
   constructor(singles, combined, eps = EPS) {
     __publicField(this, "singles");
@@ -1909,7 +1909,7 @@ var _PMF = class _PMF {
    * optionally guarantees at least `minBins` survivors by adding top-K.
    * Returns a new, non-normalized PMF.
    */
-  pruneRelative(epsRel, minBins = 0) {
+  prune(epsRel, minBins = 0) {
     const size = this.map.size;
     if (size === 0) return this;
     let peak = 0;
@@ -1921,7 +1921,7 @@ var _PMF = class _PMF {
       if (dmg > maxDamage) maxDamage = dmg;
     }
     if (peak === 0)
-      return new _PMF(new Map(this.map), this.epsilon, false, this.identifier);
+      return new _PMF(new Map(this.map), epsRel, false, this.identifier);
     const thresh = epsRel * peak;
     const entries = [...this.map.entries()];
     const survivorsByDmg = /* @__PURE__ */ new Map();
@@ -1962,7 +1962,7 @@ var _PMF = class _PMF {
       }
       prunedMap.set(dmg, { p: bin.p, count: newCount, attr: newAttr });
     }
-    return new _PMF(prunedMap, this.epsilon, false, `prune(${this.identifier})`);
+    return new _PMF(prunedMap, epsRel, false, `prune(${this.identifier})`);
   }
   /** NEW - REVIEW IF THESE ARE USEFUL OR DUPLCIATIVE?  */
   /** Probability mass at exactly x. */
@@ -2186,128 +2186,7 @@ var _PMF = class _PMF {
 __publicField(_PMF, "__anonIdCounter", 1);
 var PMF = _PMF;
 
-// src/mixture.ts
-var Mixture = class _Mixture {
-  constructor(eps = EPS) {
-    __publicField(this, "totals", /* @__PURE__ */ new Map());
-    // raw mass per outcome (pre-normalization)
-    __publicField(this, "labelMass", /* @__PURE__ */ new Map());
-    // raw mass per outcome per label
-    __publicField(this, "eps");
-    this.eps = Number.isFinite(eps) ? eps : EPS;
-  }
-  /** Remove all accumulated state. */
-  clear() {
-    this.totals.clear();
-    this.labelMass.clear();
-    return this;
-  }
-  /** Number of distinct outcome values currently accumulated. */
-  size() {
-    return this.totals.size;
-  }
-  /** Whether a label was ever added. */
-  hasLabel(label) {
-    for (const bag of this.labelMass.values()) if (bag[label]) return true;
-    return false;
-  }
-  /**
-   * Add a labeled component with a mixture weight.
-   * Weight can be any positive finite number. Very small contributions are pruned by eps.
-   */
-  add(label, pmf, weight = 1) {
-    if (!Number.isFinite(weight) || weight <= 0) return this;
-    for (const [v, binOrNumber] of pmf) {
-      const isNumber = typeof binOrNumber === "number";
-      const p = isNumber ? binOrNumber : binOrNumber?.p ?? 0;
-      if (p <= 0) continue;
-      const add = weight * p;
-      if (!Number.isFinite(add) || Math.abs(add) < this.eps) continue;
-      this.totals.set(v, (this.totals.get(v) ?? 0) + add);
-      const bag = this.labelMass.get(v) ?? {};
-      bag[label] = (bag[label] ?? 0) + add;
-      this.labelMass.set(v, bag);
-    }
-    return this;
-  }
-  buildPMF(eps = EPS) {
-    let grand = 0;
-    let c = 0;
-    for (const m of this.totals.values()) {
-      const y = m - c;
-      const t = grand + y;
-      c = t - grand - y;
-      grand = t;
-    }
-    if (!(grand > 0)) throw new Error("Mixture: zero total mass");
-    const internal = /* @__PURE__ */ new Map();
-    for (const [v, m] of this.totals) {
-      if (m <= 0 || Math.abs(m) < this.eps) continue;
-      const count = this.labelMass.get(v) ?? {};
-      internal.set(v, { p: m / grand, count });
-    }
-    return new PMF(internal, eps);
-  }
-  /**
-   * Produce normalized *per-label* PMFs (labels independent).
-   * These are unlabeled PMFs built from the raw mass of that label alone.
-   */
-  byOutcome() {
-    const labels = /* @__PURE__ */ new Set();
-    for (const bag of this.labelMass.values()) {
-      for (const k of Object.keys(bag)) labels.add(k);
-    }
-    const out = {};
-    for (const label of labels) {
-      const m = /* @__PURE__ */ new Map();
-      for (const [v, bag] of this.labelMass) {
-        const w = bag[label];
-        if (w && Math.abs(w) >= this.eps) m.set(v, w);
-      }
-      if (m.size > 0) out[label] = PMF.fromMap(m, this.eps);
-    }
-    return out;
-  }
-  /**
-   * Mixture weights per label, normalized to sum to 1 over labels that appeared.
-   * Uses raw mass before per-outcome normalization.
-   */
-  weights() {
-    const res = {};
-    for (const [, bag] of this.labelMass) {
-      for (const [lab, w] of Object.entries(bag)) {
-        if (!Number.isFinite(w) || w <= 0) continue;
-        res[lab] = (res[lab] ?? 0) + w;
-      }
-    }
-    let total = 0;
-    let c = 0;
-    for (const v of Object.values(res)) {
-      const y = v - c;
-      const t = total + y;
-      c = t - total - y;
-      total = t;
-    }
-    if (total > 0) {
-      for (const k in res) res[k] = res[k] / total;
-    }
-    return res;
-  }
-  toJSON() {
-    return {
-      totals: Array.from(this.totals.entries()).sort((a, b) => a[0] - b[0]),
-      labels: Array.from(this.labelMass.entries()).sort((a, b) => a[0] - b[0]),
-      eps: this.eps
-    };
-  }
-  static mix(items, eps = EPS) {
-    const mix = new _Mixture(eps);
-    for (const [lab, pmf, w] of items) mix.add(lab, pmf, w);
-    return mix.buildPMF();
-  }
-};
-
-// src/dice.ts
+// src/parser/dice.ts
 var Dice = class _Dice {
   constructor(x = 0) {
     __publicField(this, "faces", {});
@@ -2722,7 +2601,7 @@ var Dice = class _Dice {
   }
 };
 
-// src/parser.ts
+// src/parser/parser.ts
 var parseCache = new LRUCache(1e3);
 var cachingEnabled = true;
 function setCachingEnabled(enabled) {
@@ -3134,6 +3013,127 @@ function parseOperation(s) {
   return;
 }
 
+// src/pmf/mixture.ts
+var Mixture = class _Mixture {
+  constructor(eps = EPS) {
+    __publicField(this, "totals", /* @__PURE__ */ new Map());
+    // raw mass per outcome (pre-normalization)
+    __publicField(this, "labelMass", /* @__PURE__ */ new Map());
+    // raw mass per outcome per label
+    __publicField(this, "eps");
+    this.eps = Number.isFinite(eps) ? eps : EPS;
+  }
+  /** Remove all accumulated state. */
+  clear() {
+    this.totals.clear();
+    this.labelMass.clear();
+    return this;
+  }
+  /** Number of distinct outcome values currently accumulated. */
+  size() {
+    return this.totals.size;
+  }
+  /** Whether a label was ever added. */
+  hasLabel(label) {
+    for (const bag of this.labelMass.values()) if (bag[label]) return true;
+    return false;
+  }
+  /**
+   * Add a labeled component with a mixture weight.
+   * Weight can be any positive finite number. Very small contributions are pruned by eps.
+   */
+  add(label, pmf, weight = 1) {
+    if (!Number.isFinite(weight) || weight <= 0) return this;
+    for (const [v, binOrNumber] of pmf) {
+      const isNumber = typeof binOrNumber === "number";
+      const p = isNumber ? binOrNumber : binOrNumber?.p ?? 0;
+      if (p <= 0) continue;
+      const add = weight * p;
+      if (!Number.isFinite(add) || Math.abs(add) < this.eps) continue;
+      this.totals.set(v, (this.totals.get(v) ?? 0) + add);
+      const bag = this.labelMass.get(v) ?? {};
+      bag[label] = (bag[label] ?? 0) + add;
+      this.labelMass.set(v, bag);
+    }
+    return this;
+  }
+  buildPMF(eps = EPS) {
+    let grand = 0;
+    let c = 0;
+    for (const m of this.totals.values()) {
+      const y = m - c;
+      const t = grand + y;
+      c = t - grand - y;
+      grand = t;
+    }
+    if (!(grand > 0)) throw new Error("Mixture: zero total mass");
+    const internal = /* @__PURE__ */ new Map();
+    for (const [v, m] of this.totals) {
+      if (m <= 0 || Math.abs(m) < this.eps) continue;
+      const count = this.labelMass.get(v) ?? {};
+      internal.set(v, { p: m / grand, count });
+    }
+    return new PMF(internal, eps);
+  }
+  /**
+   * Produce normalized *per-label* PMFs (labels independent).
+   * These are unlabeled PMFs built from the raw mass of that label alone.
+   */
+  byOutcome() {
+    const labels = /* @__PURE__ */ new Set();
+    for (const bag of this.labelMass.values()) {
+      for (const k of Object.keys(bag)) labels.add(k);
+    }
+    const out = {};
+    for (const label of labels) {
+      const m = /* @__PURE__ */ new Map();
+      for (const [v, bag] of this.labelMass) {
+        const w = bag[label];
+        if (w && Math.abs(w) >= this.eps) m.set(v, w);
+      }
+      if (m.size > 0) out[label] = PMF.fromMap(m, this.eps);
+    }
+    return out;
+  }
+  /**
+   * Mixture weights per label, normalized to sum to 1 over labels that appeared.
+   * Uses raw mass before per-outcome normalization.
+   */
+  weights() {
+    const res = {};
+    for (const [, bag] of this.labelMass) {
+      for (const [lab, w] of Object.entries(bag)) {
+        if (!Number.isFinite(w) || w <= 0) continue;
+        res[lab] = (res[lab] ?? 0) + w;
+      }
+    }
+    let total = 0;
+    let c = 0;
+    for (const v of Object.values(res)) {
+      const y = v - c;
+      const t = total + y;
+      c = t - total - y;
+      total = t;
+    }
+    if (total > 0) {
+      for (const k in res) res[k] = res[k] / total;
+    }
+    return res;
+  }
+  toJSON() {
+    return {
+      totals: Array.from(this.totals.entries()).sort((a, b) => a[0] - b[0]),
+      labels: Array.from(this.labelMass.entries()).sort((a, b) => a[0] - b[0]),
+      eps: this.eps
+    };
+  }
+  static mix(items, eps = EPS) {
+    const mix = new _Mixture(eps);
+    for (const [lab, pmf, w] of items) mix.add(lab, pmf, w);
+    return mix.buildPMF();
+  }
+};
+
 export { DiceQuery, EPS, LRUCache, Mixture, PMF, clearParserCache, getCachingEnabled, parse, pmfCache, setCachingEnabled };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map