pick-me-too 1.1.1 → 1.2.0

package/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
+## v1.2.0 *2022-4-17*
+- some efficiency improvements in edge cases
 ## v1.1.1 *2022-4-16*
 - fixed some project configuration
-- ## v1.1.0 *2022-4-16*
+## v1.1.0 *2022-4-16*
 - factored `pickMeToo` out of `pickMe`

package/lib/index.js

@@ -74,7 +74,10 @@ exports.pickMe = pickMe;
  * @returns {(rng: Rng) => () => T} - a function from random number generators to pickers of things in the frequency list
  */
 function pickMeToo(frequencies) {
-    frequencies = sanitize(normalize(frequencies));
+    const simpleton = simplePicker(frequencies);
+    if (simpleton)
+        return simpleton;
+    frequencies = sanitize(frequencies);
     // short-circuit edge cases
     if (frequencies.length === 0)
         throw new Error(`nothing to select in ${frequencies}`);
@@ -82,15 +85,7 @@ function pickMeToo(frequencies) {
         const [t] = frequencies[0];
         return (_rng) => () => t;
     }
-    // throw an error in case of duplicates
-    // it is difficult to do this efficiently because we allow T to be anything
-    for (let i = 0, lim = frequencies.length - 1; i < lim; i++) {
-        const t = frequencies[i][0];
-        for (let j = i + 1; j < frequencies.length; j++) {
-            if (t === frequencies[j][0])
-                throw new Error(`${t} appears more than once among frequencies`);
-        }
-    }
+    dupChecker(frequencies, (item) => item[0]);
     let total = 0, acc = 0;
     for (const [, n] of frequencies)
         total += n;
@@ -108,14 +103,39 @@ function pickMeToo(frequencies) {
     return (rng) => () => items[f(rng())];
 }
 exports.pickMeToo = pickMeToo;
-// take in an array of ambiguous type and return a list of pairs, T and frequency
-function normalize(frequencies) {
+// throw an error in case of duplicates
+// it is difficult to do this efficiently because we allow T to be anything, so we can't for instance use a Set
+function dupChecker(frequencies, toT) {
+    for (let i = 0, lim = frequencies.length - 1; i < lim; i++) {
+        const t = toT(frequencies[i]);
+        for (let j = i + 1; j < frequencies.length; j++) {
+            if (t === toT(frequencies[j]))
+                throw new Error(`${t} appears more than once among frequencies`);
+        }
+    }
+}
+// if all frequencies are the same, we can make a simpler picker
+function simplePicker(frequencies) {
     if (frequencies.length === 0)
-        return frequencies;
-    if (frequencies.every((s) => Array.isArray(s) && s.length === 2 && typeof s[1] === 'number'))
-        return frequencies;
-    const ar = frequencies.map((t) => [t, 1]);
-    return ar;
+        return;
+    if (frequencies.every((s) => Array.isArray(s) && s.length === 2 && typeof s[1] === 'number')) {
+        const castFrequencies = frequencies;
+        const [, n1] = castFrequencies[0];
+        if (n1 > 0 && castFrequencies.every(([, n2]) => n2 === n1)) {
+            const items = castFrequencies.map(([t]) => t);
+            dupChecker(items, (item) => item);
+            return (rng) => () => items[Math.floor(items.length * rng())];
+        }
+    }
+    else {
+        const items = [...frequencies];
+        if (items.length === 1) {
+            const t = items[0];
+            return (_rng) => () => t;
+        }
+        dupChecker(items, (item) => item);
+        return (rng) => () => items[Math.floor(items.length * rng())];
+    }
 }
 // remove impossible frequencies
 function sanitize(frequencies) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pick-me-too",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Generate a function that returns random items from a list with specified frequencies.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/__tests__/documentation.test.ts

@@ -92,7 +92,6 @@ describe('README', () => {
       return s.join(' ')
     }
     const saying = clause()
-    console.log(saying)
     test('polynesianish', () => expect(saying).toEqual("rekātū pe'ide kēpe 'ātēdapidapi kaha"))
   })
 })

package/src/index.ts

@@ -71,21 +71,18 @@ export function pickMe<T>(frequencies: [T, number][] | T[], rando?: Rng): () =>
  * @returns {(rng: Rng) => () => T} - a function from random number generators to pickers of things in the frequency list
  */
 export function pickMeToo<T>(frequencies: [T, number][] | T[]): (rng: Rng) => () => T {
-  frequencies = sanitize(normalize(frequencies))
+  const simpleton = simplePicker(frequencies)
+  if (simpleton) return simpleton
+
+  frequencies = sanitize(frequencies as any as [T, number][])
+
   // short-circuit edge cases
   if (frequencies.length === 0) throw new Error(`nothing to select in ${frequencies}`)
   if (frequencies.length === 1) {
     const [t] = frequencies[0]
     return (_rng: Rng) => () => t
   }
-  // throw an error in case of duplicates
-  // it is difficult to do this efficiently because we allow T to be anything
-  for (let i = 0, lim = frequencies.length - 1; i < lim; i++) {
-    const t = frequencies[i][0]
-    for (let j = i + 1; j < frequencies.length; j++) {
-      if (t === frequencies[j][0]) throw new Error(`${t} appears more than once among frequencies`)
-    }
-  }
+  dupChecker(frequencies, (item: [T, number] | T) => (item as [T, number])[0])
   let total = 0,
     acc = 0
   for (const [, n] of frequencies) total += n
@@ -111,13 +108,37 @@ export function pickMeToo<T>(frequencies: [T, number][] | T[]): (rng: Rng) => ()
  */
 export type Rng = () => number
 
-// take in an array of ambiguous type and return a list of pairs, T and frequency
-function normalize<T>(frequencies: [T, number][] | T[]): [T, number][] {
-  if (frequencies.length === 0) return frequencies as any as [T, number][]
-  if ((frequencies as any).every((s: any) => Array.isArray(s) && s.length === 2 && typeof s[1] === 'number'))
-    return frequencies as any as [T, number][]
-  const ar = frequencies.map((t) => [t, 1])
-  return ar as any as [T, number][]
+// throw an error in case of duplicates
+// it is difficult to do this efficiently because we allow T to be anything, so we can't for instance use a Set
+function dupChecker<T>(frequencies: [T, number][] | T[], toT: (item: [T, number] | T) => T) {
+  for (let i = 0, lim = frequencies.length - 1; i < lim; i++) {
+    const t = toT(frequencies[i])
+    for (let j = i + 1; j < frequencies.length; j++) {
+      if (t === toT(frequencies[j])) throw new Error(`${t} appears more than once among frequencies`)
+    }
+  }
+}
+
+// if all frequencies are the same, we can make a simpler picker
+function simplePicker<T>(frequencies: [T, number][] | T[]): undefined | ((rng: Rng) => () => T) {
+  if (frequencies.length === 0) return
+  if ((frequencies as any).every((s: any) => Array.isArray(s) && s.length === 2 && typeof s[1] === 'number')) {
+    const castFrequencies: [T, number][] = frequencies as any as [T, number][]
+    const [, n1] = castFrequencies[0]
+    if (n1 > 0 && castFrequencies.every(([, n2]) => n2 === n1)) {
+      const items = castFrequencies.map(([t]) => t)
+      dupChecker(items, (item: [T, number] | T) => item as T)
+      return (rng: Rng) => () => items[Math.floor(items.length * rng())]
+    }
+  } else {
+    const items: T[] = [...frequencies] as any as T[]
+    if (items.length === 1) {
+      const t = items[0]
+      return (_rng: Rng) => () => t
+    }
+    dupChecker(items, (item: [T, number] | T) => item as T)
+    return (rng: Rng) => () => items[Math.floor(items.length * rng())]
+  }
 }
 
 // remove impossible frequencies