bridge 0.0.26 → 0.1.0

data/Gemfile

@@ -1,4 +1,4 @@
 source :rubygems
 
-gem "test-unit", ">=2", :require => "test/unit"
 gem "rake"
+gem "test-unit", ">=2", :require => "test/unit"

data/README.rdoc

@@ -35,6 +35,16 @@ You can use regexp to check if contract with result is valid:
 will match i.e.
   "1NT=", "2SX+1", "6NTXX-2"
 
+== Imp
+
+You can calculate how many IMP points you won by:
+  Bridge::Imp.new(:hcp => 25, :points => 420, :vulnerable => false).imps
+
+Arguments:
+* :hcp -- Integer (range between 20 and 40), which means how many honour card points has side
+* :vulnerable -- Boolean, side with given hcp is vulnerable?
+* :points -- Integer, the result at the end of board (can be calculated by Bridge::Score)
+
 == Note on Patches/Pull Requests
 
 * Fork the project.

data/bridge.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "bridge"
 
-  s.add_development_dependency "bundler", ">= 1.0.0.rc.5"
+  s.add_development_dependency "bundler", ">= 1.0.0"
 
   s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").select{|f| f =~ /^bin/}
-  s.require_path = "lib"
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
 end

data/lib/bridge.rb

@@ -1,68 +1,19 @@
 require "bridge/bid"
 require "bridge/card"
+require "bridge/constants"
 require "bridge/deal"
+require "bridge/imp"
 require "bridge/score"
 require "bridge/trick"
 require "bridge/version"
 
 module Bridge
-  # Number of possible deals in bridge
-  DEALS = 53_644_737_765_488_792_839_237_440_000
-
-  # Card values - from A to 2
-  CARD_VALUES = %w(A K Q J T 9 8 7 6 5 4 3 2)
-
-  MAJORS = %w(S H)
-
-  MINORS = %w(D C)
-
-  # Trumps
-  TRUMPS = MAJORS + MINORS
-
-  # No trump string
-  NO_TRUMP = "NT"
-
-  # Array with card strings in the bridge deck (AKQJT98765432, four
-  # suits). Contains "SA", "HT", etc.
-  DECK = TRUMPS.inject([]) do |d, s|
-    d += CARD_VALUES.map { |c| s + c }
-  end
-
-  # Direction strings "N", "E", "S" and "W"
-  DIRECTIONS = %w(N E S W)
-
-  # Possible contracts in ascending order. Contains "1C", "6NT", etc.
-  CONTRACTS = %w(1 2 3 4 5 6 7).inject([]) do |b, l|
-    b += (TRUMPS.reverse + [NO_TRUMP]).map { |s| l + s }
-  end
-
-  # Pass string
-  PASS = "PASS"
-
-  # Double string
-  DOUBLE = "X"
-
-  # Redouble string
-  REDOUBLE = "XX"
-
-  # Modifier bids (double and redouble)
-  MODIFIERS = [DOUBLE, REDOUBLE]
-
-  # All possible bids (including contracts, modifiers and pass)
-  BIDS = CONTRACTS + MODIFIERS + [PASS]
-
-  # 2 sides
-  SIDES = %w{NS EW}
-
-  # All possible vullnerabilites
-  VULNERABILITIES = ["NONE", SIDES, "BOTH"].flatten
-
   def self.direction?(string)
     DIRECTIONS.include?(string)
   end
 
   def self.deal_id?(integer)
-    (0..DEALS - 1).include?(integer)
+    (0...DEALS).include?(integer)
   end
 
   def self.card?(string)

data/lib/bridge/constants.rb

@@ -0,0 +1,109 @@
+module Bridge
+  # Number of possible deals in bridge
+  DEALS = 53_644_737_765_488_792_839_237_440_000
+
+  # Card values - from A to 2
+  CARD_VALUES = %w(A K Q J T 9 8 7 6 5 4 3 2)
+
+  MAJORS = %w(S H)
+
+  MINORS = %w(D C)
+
+  # Trumps
+  TRUMPS = MAJORS + MINORS
+
+  # No trump string
+  NO_TRUMP = "NT"
+
+  # Array with card strings in the bridge deck (AKQJT98765432, four
+  # suits). Contains "SA", "HT", etc.
+  DECK = TRUMPS.map do |suit|
+    CARD_VALUES.map { |card| suit + card }
+  end.flatten
+
+  # Direction strings "N", "E", "S" and "W"
+  DIRECTIONS = %w(N E S W)
+
+  # Possible contracts in ascending order. Contains "1C", "6NT", etc.
+  CONTRACTS = %w(1 2 3 4 5 6 7).map do |level|
+    (TRUMPS.reverse + [NO_TRUMP]).map { |suit| level + suit }
+  end.flatten
+
+  # Pass string
+  PASS = "PASS"
+
+  # Double string
+  DOUBLE = "X"
+
+  # Redouble string
+  REDOUBLE = "XX"
+
+  # Modifier bids (double and redouble)
+  MODIFIERS = [DOUBLE, REDOUBLE]
+
+  # All possible bids (including contracts, modifiers and pass)
+  BIDS = CONTRACTS + MODIFIERS + [PASS]
+
+  # 2 sides
+  SIDES = %w{NS EW}
+
+  # All possible vullnerabilites
+  VULNERABILITIES = ["NONE", SIDES, "BOTH"].flatten
+
+  class Imp
+    # values in array: [not-vulnerable, vulnerable]
+    POINTS =
+      {
+        "20" => [0,    0],
+        "21" => [50,   50],
+        "22" => [70,   70],
+        "23" => [110,  110],
+        "24" => [200,  290],
+        "25" => [300,  440],
+        "26" => [350,  520],
+        "27" => [400,  600],
+        "28" => [430,  630],
+        "29" => [460,  660],
+        "30" => [490,  690],
+        "31" => [600,  900],
+        "32" => [700,  1050],
+        "33" => [900,  1350],
+        "34" => [1000, 1500],
+        "35" => [1100, 1650],
+        "36" => [1200, 1800],
+        "37" => [1300, 1950],
+        "38" => [1300, 1950],
+        "39" => [1300, 1950],
+        "40" => [1300, 1950]
+      }
+
+      IMPS =
+        {
+          "0...10"      => 0,
+          "20...40"     => 1,
+          "50...80"     => 2,
+          "90...120"    => 3,
+          "130...160"   => 4,
+          "170...210"   => 5,
+          "220...260"   => 6,
+          "270...310"   => 7,
+          "320...360"   => 8,
+          "370...420"   => 9,
+          "430...490"   => 10,
+          "500...590"   => 11,
+          "600...740"   => 12,
+          "750...890"   => 13,
+          "900...1090"  => 14,
+          "1100...1290" => 15,
+          "1300...1490" => 16,
+          "1500...1740" => 17,
+          "1750...1990" => 18,
+          "2000...2240" => 19,
+          "2250...2490" => 20,
+          "2500...2990" => 21,
+          "3000...3490" => 22,
+          "3500...3990" => 23,
+          "4000...7600" => 24
+        }
+  end
+end

data/lib/bridge/imp.rb

@@ -0,0 +1,40 @@
+module Bridge
+  class Imp
+    attr_reader :hcp, :points, :vulnerable
+    alias :vulnerable? :vulnerable
+
+    # Creates new Imp object
+    #
+    # ==== Example
+    #   Bridge::Imp.new(:hcp => 25, :points => 420, :vulnerable => true)
+    def initialize(options = {})
+      @hcp = options[:hcp]
+      raise ArgumentError, "Invalid hcp: #{hcp} - value should be between 20 and 40" unless (20..40).include?(hcp)
+      @points = options[:points]
+      @vulnerable = options[:vulnerable] || false
+    end
+
+    # Returns points that side should make with given hcp
+    def points_to_make
+      POINTS[hcp.to_s][vulnerable? ? 1 : 0]
+    end
+
+    # Returns points score relative to hcp
+    def points_difference
+      points - points_to_make
+    end
+
+    # Returns imps (negative or positive) based on given points
+    def imps
+      IMPS.each do |range, imps|
+        return (imps * sign) if eval(range).include?(points_difference.abs)
+      end
+    end
+
+    private
+
+    def sign
+      points >= 0 ? 1 : -1
+    end
+  end
+end

data/lib/bridge/score.rb

@@ -1,6 +1,7 @@
 module Bridge
   class Score
     attr_reader :tricks, :contract, :vulnerable
+    alias :vulnerable? :vulnerable
 
     # Checks contract with result, i.e. "1NTX-1", "2S=", "6SXX+1"
     # on Ruby >= 1.9 there are named groups :contract and :result
@@ -56,10 +57,6 @@ module Bridge
 
     # private
 
-    def vulnerable?
-      @vulnerable == true
-    end
-
     def tricks_to_make_contract
       contract.level.to_i + 6
     end

data/lib/bridge/version.rb

@@ -1,3 +1,3 @@
 module Bridge
-  VERSION = "0.0.26"
+  VERSION = "0.1.0"
 end

data/test/test_imp.rb

@@ -0,0 +1,39 @@
+require "helper"
+
+class TestImp < Test::Unit::TestCase
+  test "raises ArgumentError when invalid honour card points provided" do
+    assert_raises(ArgumentError) do
+      Bridge::Imp.new(:hcp => 15, :points => 100)
+    end
+  end
+
+  test "set default vulnerable to false" do
+    imp = Bridge::Imp.new(:hcp => 40, :points => -100)
+    assert_false imp.vulnerable
+  end
+
+  test "return vulnerable boolean" do
+    imp = Bridge::Imp.new(:hcp => 20, :points => 100, :vulnerable => true)
+    assert imp.vulnerable?
+  end
+
+  test "return points to make when vulnerable" do
+    imp = Bridge::Imp.new(:hcp => 23, :points => 100, :vulnerable => true)
+    assert_equal 110, imp.points_to_make
+  end
+
+  test "return points to make when not vulnerable" do
+    imp = Bridge::Imp.new(:hcp => 23, :points => 100, :vulnerable => false)
+    assert_equal 110, imp.points_to_make
+  end
+
+  test "return positive imps" do
+    imp = Bridge::Imp.new(:hcp => 21, :points => 100)
+    assert_equal 2, imp.imps
+  end
+
+  test "return negative imps" do
+    imp = Bridge::Imp.new(:hcp => 21, :points => -100)
+    assert_equal -4, imp.imps
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 26
-  version: 0.0.26
+  version: 0.1.0
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 +02:00
+date: 2010-09-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,9 +29,7 @@ dependencies:
         - 1
         - 0
         - 0
-        - rc
-        - 5
-        version: 1.0.0.rc.5
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: *id001
@@ -54,7 +52,9 @@ files:
 - lib/bridge.rb
 - lib/bridge/bid.rb
 - lib/bridge/card.rb
+- lib/bridge/constants.rb
 - lib/bridge/deal.rb
+- lib/bridge/imp.rb
 - lib/bridge/score.rb
 - lib/bridge/trick.rb
 - lib/bridge/version.rb
@@ -63,6 +63,7 @@ files:
 - test/test_bridge.rb
 - test/test_card.rb
 - test/test_deal.rb
+- test/test_imp.rb
 - test/test_score.rb
 - test/test_trick.rb
 has_rdoc: true
@@ -79,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1652863702179833470
+      hash: 2761440476130499620
       segments: 
       - 0
       version: "0"