poker-bitvaljs 1.1.1 → 1.2.0

package/bitval-worker.js

@@ -1,6 +1,6 @@
 // Web Worker for parallel matchup evaluation
 // Loads bitval.js to access BitVal class and dependencies
-importScripts('bitval.js');
+importScripts('./bitval.js');
 
 /**
  * Deserializes setup data from main thread (converts string BigInts back to BigInt)
@@ -39,6 +39,7 @@ function deserializeMatchup(matchupData) {
 async function evaluateMatchupInWorker(heroMask, villainMask, setup, evalCache, cacheInfo, bitval) {
   let win = 0, tie = 0, lose = 0;
   const deadMask = heroMask | villainMask | setup.deadCardsMask;
+  const matchupDeadMask = heroMask | villainMask; // Only matchup-level dead cards (excludes setup.deadCardsMask)
   
   // Initialize random number generator for Monte Carlo (not needed for exhaustive)
   if (!setup.isExhaustive) {
@@ -71,8 +72,8 @@ async function evaluateMatchupInWorker(heroMask, villainMask, setup, evalCache,
     // Evaluate both hands
     let hEval, hKick, vEval, vKick;
     if (cacheInfo && evalCache) {
-      [hEval, hKick] = bitval._getCachedEvaluation(cacheInfo.heroKey, cacheInfo.heroHand, board, evalCache);
-      [vEval, vKick] = bitval._getCachedEvaluation(cacheInfo.villainKey, cacheInfo.villainHand, board, evalCache);
+      [hEval, hKick] = bitval._getCachedEvaluation(cacheInfo.heroKey, cacheInfo.heroHand, board, evalCache, matchupDeadMask);
+      [vEval, vKick] = bitval._getCachedEvaluation(cacheInfo.villainKey, cacheInfo.villainHand, board, evalCache, matchupDeadMask);
     } else {
       [hEval, hKick] = bitval.evaluate(heroMask | board);
       [vEval, vKick] = bitval.evaluate(villainMask | board);

package/bitval.js

@@ -786,6 +786,7 @@ class BitVal {
   async _evaluateMatchup(heroMask, villainMask, setup, evalCache = null, progressCallback = null, matchupIndex = 0, totalMatchups = 1) {
     let win = 0, tie = 0, lose = 0;
     const deadMask = heroMask | villainMask | setup.deadCardsMask;
+    const matchupDeadMask = heroMask | villainMask; // Only matchup-level dead cards (excludes setup.deadCardsMask)
     
     // Initialize random number generator for Monte Carlo (not needed for exhaustive)
     if (!setup.isExhaustive) {
@@ -796,8 +797,8 @@ class BitVal {
     let comboArray = null;
     let iterations = setup.iterations;
     if (setup.isExhaustive) {
-      const availableMasks = this._getAvailableCardMasksByLookUp(deadMask);
-      comboArray = this._getCombinations(availableMasks, setup.numberOfCardsToDeal);
+      // Reuse pre-computed comboArray from setup (already computed in _compareRangeSetup)
+      comboArray = setup.comboArray;
       iterations = comboArray.length;
     }
     
@@ -815,8 +816,8 @@ class BitVal {
       // Evaluate both hands - inlined for performance (no function call overhead)
       let hEval, hKick, vEval, vKick;
       if (evalCache) {
-        [hEval, hKick] = this._getCachedEvaluation(evalCache.heroKey, evalCache.heroHand, board, evalCache.cache);
-        [vEval, vKick] = this._getCachedEvaluation(evalCache.villainKey, evalCache.villainHand, board, evalCache.cache);
+        [hEval, hKick] = this._getCachedEvaluation(evalCache.heroKey, evalCache.heroHand, board, evalCache.cache, matchupDeadMask);
+        [vEval, vKick] = this._getCachedEvaluation(evalCache.villainKey, evalCache.villainHand, board, evalCache.cache, matchupDeadMask);
       } else {
         [hEval, hKick] = this.evaluate(heroMask | board);
         [vEval, vKick] = this.evaluate(villainMask | board);
@@ -940,10 +941,9 @@ class BitVal {
       ? this._getBoardSuitCounts(setup.boardCards) 
       : null;
     
-    // Pre-build lookup map: canonical key pair -> valid matchup
-    // This eliminates the O(n) find() call inside nested loops, reducing complexity
-    // from O(heroCanon × villainCanon × validMatchups) to O(validMatchups + heroCanon × villainCanon)
-    const canonicalToMatchup = new Map();
+    // Group validMatchups by canonical key pair
+    // This ensures we only process matchups that actually exist, avoiding Cartesian product issues
+    const matchupGroups = new Map();
     for (const matchup of setup.validMatchups) {
       const mHKey = this._getCanonicalKey(
         matchup.heroHand, 
@@ -958,89 +958,78 @@ class BitVal {
         boardSuitCounts
       );
       const key = `${mHKey}:${mVKey}`;
-      if (!canonicalToMatchup.has(key)) {
-        canonicalToMatchup.set(key, matchup);
+      
+      if (!matchupGroups.has(key)) {
+        matchupGroups.set(key, {
+          heroKey: mHKey,
+          villainKey: mVKey,
+          representative: matchup,
+          count: 0
+        });
       }
+      matchupGroups.get(key).count++;
     }
     
-    // Calculate accurate total matchups (excluding invalid pairs with validCount=0)
-    let totalMatchups = 0;
-    for (const [hKey] of setup.hCanon.canonicalMap) {
-      for (const [vKey] of setup.vCanon.canonicalMap) {
-        const key = `${hKey}:${vKey}`;
-        if ((setup.validCounts.get(key) || 0) > 0) {
-          totalMatchups++;
-        }
-      }
-    }
+    // Calculate accurate total matchups (number of unique canonical key pairs)
+    const totalMatchups = matchupGroups.size;
     
     let matchupIndex = 0;
-    for (const [hKey] of setup.hCanon.canonicalMap) {
-      for (const [vKey] of setup.vCanon.canonicalMap) {
-        const key = `${hKey}:${vKey}`;
-        const validCount = setup.validCounts.get(key) || 0;
-        
-        if (validCount === 0) continue;
-        
-        // O(1) lookup instead of O(n) find() - major performance improvement
-        const validPair = canonicalToMatchup.get(key);
-        if (!validPair) {
-          console.error(`[DIAG] ERROR: No valid pair found for ${hKey}:${vKey} despite validCount=${validCount}`);
-          continue;
-        }
-        
-        const cache = { 
-          heroKey: hKey, 
-          heroHand: validPair.heroHand, 
-          villainKey: vKey, 
-          villainHand: validPair.villainHand, 
-          cache: evalCache 
-        };
-        
-        const { matchupWin, matchupTie, matchupLose } = await this._evaluateMatchup(
-          validPair.heroMask, 
-          validPair.villainMask, 
-          setup, 
-          cache, 
-          progressCallback, 
-          matchupIndex, 
-          totalMatchups
-        );
-        
-        win += matchupWin * validCount;
-        tie += matchupTie * validCount;
-        lose += matchupLose * validCount;
+    // Iterate over actual matchup groups (not Cartesian product)
+    for (const [key, group] of matchupGroups) {
+      const validCount = group.count;
+      const validPair = group.representative;
+      
+      const cache = { 
+        heroKey: group.heroKey, 
+        heroHand: validPair.heroHand, 
+        villainKey: group.villainKey, 
+        villainHand: validPair.villainHand, 
+        cache: evalCache 
+      };
+      
+      const { matchupWin, matchupTie, matchupLose } = await this._evaluateMatchup(
+        validPair.heroMask, 
+        validPair.villainMask, 
+        setup, 
+        cache, 
+        progressCallback, 
+        matchupIndex, 
+        totalMatchups
+      );
+      
+      win += matchupWin * validCount;
+      tie += matchupTie * validCount;
+      lose += matchupLose * validCount;
+      
+      matchupIndex++;
+      if (progressCallback && matchupIndex % progressInterval === 0) {
+        const now = Date.now();
+        const shouldUpdateProgress = now - lastProgressTime >= progressUpdateInterval;
         
-        matchupIndex++;
-        if (progressCallback && matchupIndex % progressInterval === 0) {
-          const now = Date.now();
-          const shouldUpdateProgress = now - lastProgressTime >= progressUpdateInterval;
-          
-          // Use modern browser APIs for better scheduling when available
-          if (typeof scheduler !== 'undefined' && scheduler.postTask) {
-            await scheduler.postTask(() => {
-              if (shouldUpdateProgress) {
-                progressCallback(matchupIndex, totalMatchups, `Evaluating ${matchupIndex}`);
-                lastProgressTime = now;
-              }
-            }, { priority: 'user-blocking' });
-          } else if (typeof requestIdleCallback !== 'undefined') {
-            await new Promise(resolve => {
-              requestIdleCallback(() => {
-                if (shouldUpdateProgress) {
-                  progressCallback(matchupIndex, totalMatchups, `Evaluating ${matchupIndex}`);
-                  lastProgressTime = now;
-                }
-                resolve();
-              }, { timeout: 1 });
-            });
-          } else {
-            // Fallback to setTimeout
-            await new Promise(resolve => setTimeout(resolve, 0));
+        // Use modern browser APIs for better scheduling when available
+        if (typeof scheduler !== 'undefined' && scheduler.postTask) {
+          await scheduler.postTask(() => {
             if (shouldUpdateProgress) {
               progressCallback(matchupIndex, totalMatchups, `Evaluating ${matchupIndex}`);
               lastProgressTime = now;
             }
+          }, { priority: 'user-blocking' });
+        } else if (typeof requestIdleCallback !== 'undefined') {
+          await new Promise(resolve => {
+            requestIdleCallback(() => {
+              if (shouldUpdateProgress) {
+                progressCallback(matchupIndex, totalMatchups, `Evaluating ${matchupIndex}`);
+                lastProgressTime = now;
+              }
+              resolve();
+            }, { timeout: 1 });
+          });
+        } else {
+          // Fallback to setTimeout
+          await new Promise(resolve => setTimeout(resolve, 0));
+          if (shouldUpdateProgress) {
+            progressCallback(matchupIndex, totalMatchups, `Evaluating ${matchupIndex}`);
+            lastProgressTime = now;
           }
         }
       }
@@ -1061,8 +1050,9 @@ class BitVal {
       ? this._getBoardSuitCounts(setup.boardCards) 
       : null;
     
-    // Pre-build lookup map: canonical key pair -> valid matchup
-    const canonicalToMatchup = new Map();
+    // Group validMatchups by canonical key pair
+    // This ensures we only process matchups that actually exist, avoiding Cartesian product issues
+    const matchupGroups = new Map();
     for (const matchup of setup.validMatchups) {
       const mHKey = this._getCanonicalKey(
         matchup.heroHand, 
@@ -1077,50 +1067,37 @@ class BitVal {
         boardSuitCounts
       );
       const key = `${mHKey}:${mVKey}`;
-      if (!canonicalToMatchup.has(key)) {
-        canonicalToMatchup.set(key, matchup);
-      }
-    }
-    
-    // Calculate accurate total matchups (excluding invalid pairs with validCount=0)
-    let totalMatchups = 0;
-    for (const [hKey] of setup.hCanon.canonicalMap) {
-      for (const [vKey] of setup.vCanon.canonicalMap) {
-        const key = `${hKey}:${vKey}`;
-        if ((setup.validCounts.get(key) || 0) > 0) {
-          totalMatchups++;
-        }
+      
+      if (!matchupGroups.has(key)) {
+        matchupGroups.set(key, {
+          heroKey: mHKey,
+          villainKey: mVKey,
+          representative: matchup,
+          count: 0
+        });
       }
+      matchupGroups.get(key).count++;
     }
     
-    // Collect all matchups to evaluate
+    // Collect all matchups to evaluate (only those that actually exist)
     const matchupsToEvaluate = [];
-    for (const [hKey] of setup.hCanon.canonicalMap) {
-      for (const [vKey] of setup.vCanon.canonicalMap) {
-        const key = `${hKey}:${vKey}`;
-        const validCount = setup.validCounts.get(key) || 0;
-        
-        if (validCount === 0) continue;
-        
-        const validPair = canonicalToMatchup.get(key);
-        if (!validPair) {
-          console.error(`[DIAG] ERROR: No valid pair found for ${hKey}:${vKey} despite validCount=${validCount}`);
-          continue;
-        }
-        
-        matchupsToEvaluate.push({
-          key,
-          validCount,
-          heroKey: hKey,
-          heroHand: validPair.heroHand,
-          heroMask: validPair.heroMask,
-          villainKey: vKey,
-          villainHand: validPair.villainHand,
-          villainMask: validPair.villainMask
-        });
-      }
+    for (const [key, group] of matchupGroups) {
+      const validPair = group.representative;
+      matchupsToEvaluate.push({
+        key,
+        validCount: group.count,
+        heroKey: group.heroKey,
+        heroHand: validPair.heroHand,
+        heroMask: validPair.heroMask,
+        villainKey: group.villainKey,
+        villainHand: validPair.villainHand,
+        villainMask: validPair.villainMask
+      });
     }
     
+    // Calculate total matchups (number of unique canonical key pairs)
+    const totalMatchups = matchupsToEvaluate.length;
+    
     // Check if workers should be used
     const shouldUseWorkers = useWorkers && 
                              typeof Worker !== 'undefined' && 
@@ -1159,7 +1136,7 @@ class BitVal {
     }, progressUpdateInterval) : null;
     
     for (let i = 0; i < batches.length; i++) {
-      const worker = new Worker('bitval-worker.js');
+      const worker = new Worker('./bitval-worker.js');
       workers.push(worker);
       
       const promise = new Promise((resolve, reject) => {
@@ -1226,12 +1203,34 @@ class BitVal {
     return { win, tie, lose };
   }
 
+  /**
+   * Generates a numeric hash key from canonical key and board for faster cache lookups.
+   * @private
+   */
+  _getCacheKeyHash(canonicalKey, board, matchupDeadMask = 0n) {
+    // Hash the canonical key string
+    let hash = 0;
+    for (let i = 0; i < canonicalKey.length; i++) {
+      hash = ((hash << 5) - hash) + canonicalKey.charCodeAt(i);
+      hash = hash & hash; // Convert to 32-bit integer
+    }
+    // Combine with board bits (use lower 32 bits of BigInt for fast XOR)
+    const boardBits = Number(board & 0xFFFFFFFFn);
+    hash = hash ^ boardBits;
+    
+    // Include matchup dead mask to prevent cross-matchup cache collisions
+    // This ensures different matchups (with different dead cards) don't share cache entries
+    const deadBits = Number(matchupDeadMask & 0xFFFFFFFFn);
+    return hash ^ deadBits;
+  }
+
   /**
    * Gets cached evaluation or evaluates and caches the result.
+   * Uses numeric hash keys for faster cache lookups.
    * @private
    */
-  _getCachedEvaluation(canonicalKey, originalHand, completeBoard, evalCache) {
-    const cacheKey = canonicalKey + completeBoard.toString();
+  _getCachedEvaluation(canonicalKey, originalHand, completeBoard, evalCache, matchupDeadMask = 0n) {
+    const cacheKey = this._getCacheKeyHash(canonicalKey, completeBoard, matchupDeadMask);
     if (evalCache.has(cacheKey)) return evalCache.get(cacheKey);
     const handMask = this.getBitMasked(this._handStringToCards(originalHand));
     const evaluation = this.evaluate(handMask | completeBoard);
@@ -1311,6 +1310,7 @@ class BitVal {
     const canonicalMap = new Map();
     const canonicalToHand = new Map();
     const boardSuitCounts = boardCards.length > 0 ? this._getBoardSuitCounts(boardCards) : null;
+    
     for (const hand of hands) {
       const key = this._getCanonicalKey(hand, boardCards, numberOfBoardCards, boardSuitCounts);
       canonicalMap.set(key, (canonicalMap.get(key) || 0) + 1);
@@ -1318,6 +1318,7 @@ class BitVal {
         canonicalToHand.set(key, hand);
       }
     }
+    
     return { canonicalMap, canonicalToHand };
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poker-bitvaljs",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "High-performance poker hand evaluator optimized for browser environments, using bitwise operations for rapid poker hand analysis and equity calculations.",
   "main": "bitval.js",
   "scripts": {