rholdem 0.0.1 → 0.1.0

data/History.txt

@@ -1,3 +1,10 @@
+== 0.1.0 / 2007-10-07
+
+* Changed definition of == in Card class to include rank and suit comparison
+* Removed definition of === in Card class
+* Changed the way that cards are compared for Hand class per changes above, ignores suit
+* Added helper methods Hand#outs and Hand#odds for future pot odds calculations
+
 == 0.0.1 / 2007-09-30
 
 * First release of library

data/lib/card.rb

@@ -47,20 +47,15 @@ module Holdem
   
     def ==(compare_to)
       if(compare_to.is_a?(Card))
-        return self.rank == compare_to.rank
+        return self.rank == compare_to.rank && self.suit == compare_to.suit
       end
     end
   
-    def ===(compare_to)
-      return false unless self == compare_to
-      return true if self.suit == compare_to.suit
-      false
-    end
-  
     def <=>(compare_to)
       if(compare_to.is_a?(Card))
         return 0 if self == compare_to
         return -1 if self.rank < compare_to.rank
+        return -1 if self.rank == compare_to.rank && self.suit < compare_to.suit
         return 1
       end
     end
@@ -73,5 +68,19 @@ module Holdem
     def <(compare_to)
       return compare_to > self
     end
+    
+    def equiv?(compare_to)
+      return true if self.rank == compare_to.rank
+      return false
+    end
+    
+    def higher?(compare_to)
+      return true if self.rank > compare_to.rank
+      false
+    end
+    
+    def lower?(compare_to)
+      return compare_to.higher?(self)
+    end
   end
 end

data/lib/deck.rb

@@ -8,7 +8,7 @@ module Holdem
       @cards = @cards.sort_by { rand }
     end
 
-    def initialize
+    def initialize(shuffle_cards=true)
       @cards = []
       Card::SUITS.each_byte do |suit|
         Card::RANKS.each_byte do |rank|
@@ -16,11 +16,15 @@ module Holdem
         end
       end
     
-      shuffle
+      shuffle if shuffle_cards
     end
 
     def deal
       @cards.pop
     end
+    
+    def remove(card)
+      @cards.delete_at(@cards.index(card))      
+    end
   end
 end

data/lib/hand.rb

@@ -70,13 +70,61 @@ module Holdem
       # otherwise must compare by cards.
       i = @sorted_cards.length-1
       while(i >= 0)
-        return  1 if @sorted_cards[i] > compare_to.sorted_cards[i]
-        return -1 if @sorted_cards[i] < compare_to.sorted_cards[i]
+        return  1 if @sorted_cards[i].higher?(compare_to.sorted_cards[i])
+        return -1 if @sorted_cards[i].lower?(compare_to.sorted_cards[i])
         i -= 1
       end
     
       return 0
     end
+    
+    ##
+    # Information Calculators
+    #
+    
+    def outs
+      return nil if @cards.length >= 7
+      
+      deck = Deck.new(false)
+      @cards.each { |c| deck.remove(c) }
+      unknown_cards = deck.cards.length
+      results = Hash.new
+      
+      deck.cards.length.times do
+        card = deck.deal
+        new_hand = Hand.new(@cards + [card])
+        if(RANKINGS.index(new_hand.ranking) < RANKINGS.index(self.ranking))
+          # an improved hand...  find ranking difference
+          results[new_hand.ranking] ||= 0
+          results[new_hand.ranking] += 1
+        end
+      end
+      
+      results
+    end
+    
+    def odds
+      odds = outs
+      return nil if odds.nil?
+      
+      unknown_cards = 52 - @cards.length
+      odds.each_key do |key|
+        odds[key] = (odds[key].to_f / unknown_cards.to_f)
+      end
+      
+      odds
+    end
+    
+    def on_board?(*hole_cards)
+      hole_cards.flatten!
+      raise "Need to receive 2 hole cards, got #{hole_cards.lenth}" if hole_cards.length != 2
+      unless hole_cards[0].is_a?(Card) && hole_cards[0].is_a?(Card)
+        raise "Need to receive Card objects, got #{hole_cards[0].class} and #{hole_cards[0].class}"
+      end
+      
+      return false if @sorted_cards.include?(hole_cards[0]) || @sorted_cards.include?(hole_cards[1])
+      true
+    end
   
   private
   
@@ -106,7 +154,7 @@ module Holdem
           update_ranking(new_rank, cards)
         elsif(RANKINGS.index(new_rank) == RANKINGS.index(@ranking))
           (0...cards.length).each do |i|
-            if(cards[i].rank > @sorted_cards[i].rank)
+            if(cards[i].higher?(@sorted_cards[i]))
               update_ranking(new_rank, cards)
               break
             end

data/lib/player.rb

@@ -34,7 +34,7 @@ module Holdem
     def award(amount)
       @delta += amount
     end
-  
+    
     # override this for subclass Players
     def act(game)
       return :neutral

data/lib/rholdem.rb

@@ -5,5 +5,5 @@ require File.dirname(__FILE__) + "/player"
 require File.dirname(__FILE__) + "/game"
 
 module Holdem
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/spec/card_spec.rb

@@ -34,15 +34,13 @@ describe Card do
     c2 = Card.new('3c')
     
     c1.should == c2
-    c1.should eql?(c2)
   end
   
-  it "should evaluate two cards as equal if their ranks match" do
+  it "should not evaluate two cards as equal if their ranks match" do
     c1 = Card.new('3d')
     c2 = Card.new('3c')
     
-    c1.should == c2
-    c1.should eql?(c2)
+    c1.should_not == c2
   end
   
   it "should evaluate two cards as not equal if their ranks don't match" do
@@ -51,45 +49,91 @@ describe Card do
     c1.should_not == c2
   end
   
-  it "should evaluate two cards as === if their suits and ranks match" do
-    c1 = Card.new('3d')
-    c2 = Card.new('3d')
-    c1.should === c2
-  end
-  
-  it "should evaluate two cards as not === if their suits don't match" do
-    c1 = Card.new('3d')
-    c2 = Card.new('3h')
-    c1.should_not === c2
-  end
-  
-  it "should evaluate two cards as not === if their ranks don't match" do
-    c1 = Card.new('5d')
-    c2 = Card.new('3d')
-    c1.should_not === c2
-  end
-  
-  it "should return -1 when comparing lower to higher card" do
+  it "should return < when comparing lower to higher card" do
     c1 = Card.new('3c')
     c2 = Card.new('4d')
-    (c1 <=> c2).should == -1
     (c1 > c2).should == false
     (c1 < c2).should == true
   end
   
-  it "should return 1 when comparing higher to lower card" do
+  it "should return > when comparing higher to lower card" do
     c1 = Card.new('8c')
     c2 = Card.new('4d')
-    (c1 <=> c2).should == 1
     (c1 > c2).should == true
     (c1 < c2).should == false
   end
   
-  it "should return 0 when cards are equal" do
-    c1 = Card.new('8c')
-    c2 = Card.new('8d')
+  it "should evaluate <=> as 1 if card 1 is greater than card 2 by rank" do
+    c1 = Card.new('4s')
+    c2 = Card.new('3c')
+    (c1 <=> c2).should == 1
+    (c2 <=> c1).should == -1
+  end
+
+  it "should evaluate <=> as 1 if card 1 is greater than card 2 by suit with equal ranks" do
+    c1 = Card.new('3s')
+    c2 = Card.new('3c')
+    (c1 <=> c2).should == 1
+    (c2 <=> c1).should == -1
+  end
+
+  it "should evaluate <=> as 0 if card 1 has the same rank and suit as card 2" do
+    c1 = Card.new('3c')
+    c2 = Card.new('3c')
     (c1 <=> c2).should == 0
-    (c1 > c2).should == false
-    (c1 < c2).should == false
+  end
+  
+  it "should return evaluate equiv as true if two cards have the same rank and suit" do
+    c1 = Card.new('Ac')
+    c2 = Card.new('Ac')
+    c1.should be_equiv(c2)
+  end
+
+  it "should return evaluate equiv as true if two cards have the same rank and different suits" do
+    c1 = Card.new('Ac')
+    c2 = Card.new('As')
+    c1.should be_equiv(c2)
+  end
+
+  it "should return evaluate equiv as false if two cards do not have the same rank and suit" do
+    c1 = Card.new('Ac')
+    c2 = Card.new('Kc')
+    c1.should_not be_equiv(c2)
+  end
+  
+  it "should return higher when rank is higher" do
+    c1 = Card.new('Kc')
+    c2 = Card.new('Qs')
+    c1.should be_higher(c2)
+  end
+  
+  it "should not return higher when rank is same" do
+    c1 = Card.new('Tc')
+    c2 = Card.new('Ts')
+    c1.should_not be_higher(c2)
+  end
+  
+  it "should not return higher when rank is lower" do
+    c1 = Card.new('Tc')
+    c2 = Card.new('2s')
+    c2.should_not be_higher(c1)
+  end
+  
+  it "should return lower when rank is lower" do
+    c1 = Card.new('Kc')
+    c2 = Card.new('Qs')
+    c2.should be_lower(c1)
+  end
+  
+  it "should not return lower when rank is same" do
+    c1 = Card.new('Tc')
+    c2 = Card.new('Ts')
+    c1.should_not be_lower(c2)
+  end
+  
+  it "should not return lower when rank is higher" do
+    c1 = Card.new('Tc')
+    c2 = Card.new('2s')
+    c1.should_not be_lower(c2)
   end
 end

data/spec/deck_spec.rb

@@ -50,4 +50,22 @@ describe Deck do
     @d.deal
     @d.cards.length.should == 51
   end
+  
+  it "should remove a card from the deck" do
+    card = Card.new('As')
+    @d.remove(card)
+    @d.cards.each { |c| c.should_not === card }
+  end
+  
+  it "should return an unshuffled deck if desired" do
+    ordered_cards = []
+    Card::SUITS.each_byte do |suit|
+      Card::RANKS.each_byte do |rank|
+        ordered_cards << Card.new(rank.chr + suit.chr)
+      end
+    end
+    
+    deck = Deck.new(false)
+    deck.cards.should == ordered_cards
+  end
 end

data/spec/hand_spec.rb

@@ -347,4 +347,77 @@ describe Hand, "comparing to other hands" do
     (h1 < h2).should be_false
     (h2 < h1).should be_true
   end
+  
+  it "should not compare by suit" do
+    h1 = Hand.new('Ac Kc Qc Jc Tc')
+    h2 = Hand.new('As Ks Qs Js Ts')
+    h1.should == h2
+  end
+end
+
+describe Hand, "odds calculations" do
+  it "should compute numer of improving cards as a ranking => num 'outs' hash" do
+    # flush: any available club gives a flush, 9 cards
+    # straight: any 6 (not 6c) gives a straight, 3 cards
+    # pair: any 3, 4, 5, 7 (not 7c), 8 gives a pair, 14 cards
+    # 5 known cards, 47 unknown cards
+    h = Hand.new('3c 4c 5c 7s 8c')
+    
+    outs = h.outs
+    outs[:pair].should == 14
+    outs[:straight].should == 3
+    outs[:flush].should == 9
+  end
+  
+  it "should be able to give outs for hands under 5 cards" do
+    h = Hand.new('Ac As')
+    lambda { h.outs }.should_not raise_error
+  end
+  
+  it "should have nil outs if a hand is not possible" do
+    h = Hand.new('3h 4d 6c Ts Kh')
+    h.outs[:flush].should be_nil
+  end
+  
+  it "should return nil 'outs' if there are no cards to come" do
+    h = Hand.new('3c 4c 5s 6s 7s 8h 9h')
+    h.outs.should be_nil
+  end
+  
+  it "should figure out the odds of hands to come" do
+    h = Hand.new('Kc Jd Qs Qh Ks Tc')
+    
+    odds = h.odds
+    odds[:full_house].should == 4.0/46
+    odds[:straight].should == 8.0/46
+  end
+  
+  it "should have nil odds if there are no outs for hand" do
+    h = Hand.new('3c 4s')
+    h.odds[:flush].should be_nil
+  end
+  
+  it "should return nil for pot odds if there are no cards to come" do
+    h = Hand.new('3c 4c 5s 6s 7s 8h 9h')
+    h.odds.should be_nil
+  end
+end
+
+describe Hand, "knowledge about hand" do  
+  it "should know if best hand is made of at least one hole card" do
+    h = Hand.new('6c 7c 8c 9c Tc Jh Ks')
+    h.on_board?(Card.new('9c'), Card.new('Ks')).should be_false
+  end
+  
+  it "should know when a hand is on the board and requires no hole cards" do
+    h = Hand.new('6c 7c 8c 9c Tc Jc Ks')
+    h.on_board?(Card.new('6c'), Card.new('Ks')).should be_true
+  end
+  
+  it "should raise an error unless receiving two hole cards" do
+    h = Hand.new('6c 7c 8c 9c Tc Jh Ks')
+    lambda { h.on_board?(Card.new('9c')) }.should raise_error
+    lambda { h.on_board?([Card.new('9c')]) }.should raise_error
+    lambda { h.on_board?(Object.new, Object.new) }.should raise_error
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rholdem
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-09-30 00:00:00 -07:00
+  version: 0.1.0
+date: 2007-10-07 00:00:00 -07:00
 summary: Ruby Texas Hold'em Simulations Library
 require_paths: 
 - lib