Break on SURRENDER, fix some sim settings

belichenko · Dec 6, 2017 · 30750a8 · 30750a8
1 parent bc37e09
commit 30750a8
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/lib/blackjack.js b/lib/blackjack.js
@@ -468,6 +468,7 @@ class Blackjack {
             playerHand.splice(0, playerHand.length);
             bets[handIndex] = bet / 2;
             bankroll += bet / 2;
+            break;
           }
         }
         iterationCount++;
@@ -483,7 +484,7 @@ class Blackjack {
 
     // Reduction step over all player hands to see net outcome
     return playerHands.reduce((sum, playerHand, i) => {
-      return sum + this.handResult(playerHand, dealerHand, bets[i], i, debug);
+      return sum + this.handResult(playerHand, dealerHand, bets[i], i, true, debug);
     }, 0);
 
   }
@@ -710,7 +711,7 @@ Blackjack.Table = class Table {
     options.initialBankroll = options.initialBankroll || 100;
     options.targetBankroll = options.targetBankroll || 200;
     options.minimumBet = options.minimumBet || 5;
-    options.strategy = Blackjack.strategies[options.strategy] ?
+    options.strategy = this.constructor.strategies[options.strategy] ?
       options.strategy : this.constructor.defaultStrategy;
     options.maxHands = options.maxHands || null;
     options.playRequirement = this.constructor.playRequirements[options.playRequirement] ?
@@ -742,7 +743,7 @@ Blackjack.Table = class Table {
     let minimumBet = this.options.minimumBet;
     let bettingStrategy = this.options.strategy;
     let maxHands = this.options.maxHands;
-    let fnStrategy = Blackjack.strategies[this.options.strategy];
+    let fnStrategy = this.constructor.strategies[this.options.strategy];
     let fnPlayRequirement = this.constructor.playRequirements[this.options.playRequirement];
 
     let blackjackPayout = this.options.blackjackPayout;
@@ -773,7 +774,7 @@ Blackjack.Table = class Table {
       handCount++;
       bankroll += result;
       bet = Math.min(fnStrategy(result > 0, bet, minimumBet), bankroll);
-      if (deck.length < 13) {
+      if (deck.length < 26) {
         deck = Blackjack.shuffle(deckCount);
       }
     }
@@ -811,7 +812,7 @@ Blackjack.Table.strategies = {
 * Table simulation play requirements: under which circumstances do I continue
 *   to play hands? (Have not lost bankroll is a given)
 */
-Table.playRequirements = {
+Blackjack.Table.playRequirements = {
   underTarget: (handCount, maxHands, bankroll, initialBankroll, targetBankroll) => {
     return bankroll < targetBankroll;
   },