bridge 0.0.21 → 0.0.22

data/VERSION

@@ -1 +1 @@
-0.0.21
+0.0.22

data/bridge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bridge}
-  s.version = "0.0.21"
+  s.version = "0.0.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Kuźma"]
-  s.date = %q{2010-03-22}
+  s.date = %q{2010-03-27}
   s.description = %q{Useful contract bridge utilities - deal generator, id to deal and deal to id conversion}
   s.email = %q{qoobaa+github@gmail.com}
   s.extra_rdoc_files = [

data/lib/bridge/score.rb

@@ -183,10 +183,18 @@ module Bridge
       contracts = %w(1 2 3 4 5 6 7).inject([]) do |bids, level|
         bids += ["H/S", "C/D", "NT"].map { |suit| level + suit }
       end
-      (contracts + contracts.map { |c| c + "X" } + contracts.map { |c| c + "XX" }).each do |contract|
+      (contracts + contracts.map { |c| c + "X" } + contracts.map { |c| c + "XX" } ).each do |contract|
         [true, false].each do |vulnerable|
           (0..13).each do |tricks|
-            result["#{contract}-#{tricks}#{vulnerable == true ? "-vulnerable" : ""}"] = new(:contract => contract.sub("H/S", "S").sub("C/D", "C"), :tricks => tricks, :vulnerable => vulnerable).points
+            score = new(:contract => contract.sub("H/S", "S").sub("C/D", "C"), :tricks => tricks, :vulnerable => vulnerable)
+            if score.result > 0
+              taken = "+" << score.result.to_s
+            elsif score.result == 0
+              taken = "="
+            else
+              taken = score.result.to_s
+            end
+            result[contract + taken + (score.vulnerable? ? "v" : "")] = score.points
           end
         end
       end

data/lib/bridge.rb

@@ -54,7 +54,7 @@ module Bridge
   SIDES = %w{NS EW}
 
   # All possible vullnerabilites
-  VULNERABILITIES = %w{BOTH NONE} + SIDES
+  VULNERABILITIES = ["NONE", SIDES, "BOTH"].flatten
 
   def self.direction?(string)
     DIRECTIONS.include?(string)
@@ -128,19 +128,22 @@ module Bridge
     [direction, partner_of(direction)].sort.join
   end
 
-  def self.next_direction(direction)
+  def self.next_direction(direction = nil)
     return DIRECTIONS.first if direction.nil?
     return unless direction?(direction)
-    next_for_collection(DIRECTIONS, direction)
+    next_in_collection(DIRECTIONS, direction)
   end
 
-  def self.next_vulnerable(vulnerable)
-    return VULNERABILITIES.first if vulnerable.nil?
-    return unless VULNERABILITIES.include?(vulnerable)
-    next_for_collection(VULNERABILITIES, vulnerable)
+  def self.vulnerable_in_deal(deal = nil)
+    return VULNERABILITIES.first if deal.nil?
+    round = (deal - 1).div(4) % 4
+    index = (deal - 1) % 4
+    vulnerabilities = VULNERABILITIES.dup
+    shift = vulnerabilities.shift(round)
+    vulnerabilities.push(shift).flatten[index]
   end
 
-  def self.next_for_collection(collection, current)
+  def self.next_in_collection(collection, current)
     i = (collection.index(current) + 1) % collection.size
     collection[i]
   end

data/test/test_bridge.rb

@@ -31,11 +31,32 @@ class TestBridge < Test::Unit::TestCase
     assert_equal "N", Bridge.next_direction(nil)
   end
 
-  test "return next vulnerable" do
-    assert_equal "NONE", Bridge.next_vulnerable("BOTH")
-    assert_equal "NS", Bridge.next_vulnerable("NONE")
-    assert_equal "EW", Bridge.next_vulnerable("NS")
-    assert_equal "BOTH", Bridge.next_vulnerable("EW")
-    assert_equal "BOTH", Bridge.next_vulnerable(nil)
+  test "return vulnerable for given deal nr" do
+    assert_equal "NONE", Bridge.vulnerable_in_deal(nil)
+
+    assert_equal "NONE", Bridge.vulnerable_in_deal(1)
+    assert_equal "NS", Bridge.vulnerable_in_deal(2)
+    assert_equal "EW", Bridge.vulnerable_in_deal(3)
+    assert_equal "BOTH", Bridge.vulnerable_in_deal(4)
+
+    assert_equal "NS", Bridge.vulnerable_in_deal(5)
+    assert_equal "EW", Bridge.vulnerable_in_deal(6)
+    assert_equal "BOTH", Bridge.vulnerable_in_deal(7)
+    assert_equal "NONE", Bridge.vulnerable_in_deal(8)
+
+    assert_equal "EW", Bridge.vulnerable_in_deal(9)
+    assert_equal "BOTH", Bridge.vulnerable_in_deal(10)
+    assert_equal "NONE", Bridge.vulnerable_in_deal(11)
+    assert_equal "NS", Bridge.vulnerable_in_deal(12)
+
+    assert_equal "BOTH", Bridge.vulnerable_in_deal(13)
+    assert_equal "NONE", Bridge.vulnerable_in_deal(14)
+    assert_equal "NS", Bridge.vulnerable_in_deal(15)
+    assert_equal "EW", Bridge.vulnerable_in_deal(16)
+
+    assert_equal "NONE", Bridge.vulnerable_in_deal(17)
+    assert_equal "NS", Bridge.vulnerable_in_deal(18)
+    assert_equal "EW", Bridge.vulnerable_in_deal(19)
+    assert_equal "BOTH", Bridge.vulnerable_in_deal(20)
   end
 end

data/test/test_score.rb

@@ -254,11 +254,11 @@ class TestScoreContracts < Test::Unit::TestCase
   end
 
   test "return contracts for 1430 points" do
-    expected = ["1C/DXX-10-vulnerable", "1C/DXX-13", "6H/S-12-vulnerable"]
+    expected = ["1C/DXX+3v", "1C/DXX+6", "6H/S=v"]
     assert_equal expected, Bridge::Score.with_points(1430)
   end
 
-  test "return [] if not found" do
+  test "return no contracts if not found score with given points" do
     assert_equal [], Bridge::Score.with_points(100)
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +01:00
+date: 2010-03-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency