bridge 0.0.22 → 0.0.23

data/README.rdoc

@@ -27,7 +27,7 @@ Methods:
 
 You can also ask for all possible contracts finished with given points:
   Bridge::Score.with_points(980)
-  #=> ["1NTX-11-vulnerable", "2C/DX-12-vulnerable", "6H/S-12"]
+  #=> ["1NTX+4v", "2C/DX+4v", "6H/S="]
 
 You can use regexp to check if contract with result is valid:
   Bridge::Score::REGEXP

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/bridge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bridge}
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   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-27}
+  s.date = %q{2010-03-28}
   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/deal.rb

@@ -133,6 +133,22 @@ module Bridge
     end
     alias :hcp :honour_card_points
 
+    def sort_by_color!(trump = nil)
+      sort_by_color(trump).each do |direction, hand|
+        self[direction] = hand
+      end
+      self
+    end
+
+    def sort_by_color(trump = nil)
+      DIRECTIONS.inject({}) do |sorted, direction|
+        splitted_colors = split_colors(direction)
+        sorted_colors = sort_colors(splitted_colors.keys, trump)
+        sorted[direction] = sorted_colors.inject([]) { |cards, color| cards << splitted_colors.delete(color) }.flatten
+        sorted
+      end
+    end
+
     private
 
     def must_be_direction!(string)
@@ -143,5 +159,28 @@ module Bridge
       must_be_direction!(direction)
       instance_variable_set("@#{direction.to_s.downcase}", cards)
     end
+
+    def split_colors(direction)
+      TRUMPS.inject({}) do |colors, trump|
+        cards = self[direction].select { |card| card.suit == trump }
+        colors[trump] = cards unless cards.empty?
+        colors
+      end
+    end
+
+    def sort_colors(colors, trump = nil)
+      black = ["S", "C"] & colors
+      red = ["H", "D"] & colors
+      sorted = if black.delete(trump)
+        [trump] << red.shift << black.shift << red.shift
+      elsif red.delete(trump)
+        [trump] << black.shift << red.shift << black.shift
+      elsif black.size >= red.size
+        [black.shift] << red.shift << black.shift << red.shift
+      else
+        [red.shift] << black.shift << red.shift << black.shift
+      end
+      sorted.compact
+    end
   end
 end

data/test/test_deal.rb

@@ -131,3 +131,94 @@ class TestDeal < Test::Unit::TestCase
     assert_equal String, deal.to_hash["N"].first.class
   end
 end
+
+class TestDealSort < Test::Unit::TestCase
+  def setup
+    @deal = Bridge::Deal.new({ "N" => ["SK", "S9", "S7", "S6", "S4", "HA", "HJ", "H3", "H2", "D7", "D2", "C6", "C3"],
+                              "E" => ["SA", "SQ", "SJ", "ST", "S2", "DA", "DK", "DT", "D9", "D8", "D5", "CK", "CJ"],
+                              "S" => ["S8", "S5", "S3", "HK", "HQ", "HT", "H8", "H4", "DQ", "D3", "CQ", "C4", "C2"],
+                              "W" => ["H9", "H7", "H6", "H5", "DJ", "D6", "D4", "CA", "CT", "C9", "C8", "C7", "C5"] })
+  end
+
+  test "split cards by color for given direction" do
+    expected = { "S" => @deal.n.select { |c| c.suit == "S" },
+                 "H" => @deal.n.select { |c| c.suit == "H" },
+                 "D" => @deal.n.select { |c| c.suit == "D" },
+                 "C" => @deal.n.select { |c| c.suit == "C" } }
+    assert_equal expected, @deal.send(:split_colors, "N")
+  end
+
+  test "return colors as key only if cards are present on hand" do
+    expected = { "S" => @deal.e.select { |c| c.suit == "S" },
+                 "D" => @deal.e.select { |c| c.suit == "D" },
+                 "C" => @deal.e.select { |c| c.suit == "C" } }
+    assert_equal expected, @deal.send(:split_colors, "E")
+  end
+
+  test "return sorted 4 colors" do
+    assert_equal ["S", "H", "C", "D"], @deal.send(:sort_colors, ["S", "H", "D", "C"])
+    assert_equal ["S", "H", "C", "D"], @deal.send(:sort_colors, ["H", "D", "S", "C"])
+    assert_equal ["S", "H", "C", "D"], @deal.send(:sort_colors, ["D", "S", "C", "H"])
+  end
+
+  test "return sorted 3 colors" do
+    assert_equal ["S", "H", "C"], @deal.send(:sort_colors, ["S", "H", "C"])
+    assert_equal ["H", "C", "D"], @deal.send(:sort_colors, ["H", "D", "C"])
+    assert_equal ["H", "S", "D"], @deal.send(:sort_colors, ["S", "H", "D"])
+    assert_equal ["S", "D", "C"], @deal.send(:sort_colors, ["S", "D", "C"])
+  end
+
+  test "return sorted 2 colors" do
+    assert_equal ["S", "H"], @deal.send(:sort_colors, ["S", "H"])
+    assert_equal ["S", "D"], @deal.send(:sort_colors, ["S", "D"])
+    assert_equal ["C", "D"], @deal.send(:sort_colors, ["D", "C"])
+    # assert_equal ["H", "C"], @deal.sort_colors(["H", "C"])
+  end
+
+  test "return sorted 4 colors with trump" do
+    assert_equal ["S", "H", "C", "D"], @deal.send(:sort_colors, ["S", "H", "D", "C"], "S")
+    assert_equal ["H", "S", "D", "C"], @deal.send(:sort_colors, ["H", "D", "S", "C"], "H")
+    assert_equal ["D", "S", "H", "C"], @deal.send(:sort_colors, ["D", "S", "C", "H"], "D")
+    assert_equal ["C", "H", "S", "D"], @deal.send(:sort_colors, ["D", "S", "C", "H"], "C")
+  end
+
+  test "return sorted 3 colors with trump" do
+    assert_equal ["S", "H", "C"], @deal.send(:sort_colors, ["S", "H", "C"], "S")
+    assert_equal ["H", "S", "C"], @deal.send(:sort_colors, ["S", "H", "C"], "H")
+    assert_equal ["S", "H", "D"], @deal.send(:sort_colors, ["S", "H", "D"], "S")
+    assert_equal ["D", "S", "H"], @deal.send(:sort_colors, ["S", "H", "D"], "D")
+  end
+
+  test "return sorted 2 colors with trump" do
+    assert_equal ["S", "H"], @deal.send(:sort_colors, ["S", "H"], "S")
+    assert_equal ["H", "S"], @deal.send(:sort_colors, ["S", "H"], "H")
+    assert_equal ["C", "S"], @deal.send(:sort_colors, ["S", "C"], "C")
+    assert_equal ["D", "H"], @deal.send(:sort_colors, ["H", "D"], "D")
+  end
+
+  test "sort hands by colors" do
+    expected =  {
+      "N" => ["SK", "S9", "S7", "S6", "S4", "HA", "HJ", "H3", "H2", "C6", "C3", "D7", "D2"],
+      "E" => ["SA", "SQ", "SJ", "ST", "S2", "DA", "DK", "DT", "D9", "D8", "D5", "CK", "CJ"],
+      "S" => ["S8", "S5", "S3", "HK", "HQ", "HT", "H8", "H4", "CQ", "C4", "C2", "DQ", "D3"],
+      "W" => ["H9", "H7", "H6", "H5", "CA", "CT", "C9", "C8", "C7", "C5", "DJ", "D6", "D4"]
+    }
+    assert_equal expected, @deal.sort_by_color!.to_hash
+  end
+
+  test "sort hands by colors with trump" do
+    expected = {
+      "N" => ["C6", "C3", "HA", "HJ", "H3", "H2", "SK", "S9", "S7", "S6", "S4", "D7", "D2"],
+      "E" => ["CK", "CJ", "DA", "DK", "DT", "D9", "D8", "D5", "SA", "SQ", "SJ", "ST", "S2"],
+      "S" => ["CQ", "C4", "C2", "HK", "HQ", "HT", "H8", "H4", "S8", "S5", "S3", "DQ", "D3"],
+      "W" => ["CA", "CT", "C9", "C8", "C7", "C5", "H9", "H7", "H6", "H5", "DJ", "D6", "D4"]
+    }
+    assert_equal expected, @deal.sort_by_color!("C").to_hash
+  end
+
+  test "not modify hands if sorted by color without !" do
+    old_deal = @deal.to_hash
+    @deal.sort_by_color
+    assert_equal old_deal, @deal.to_hash
+  end
+end

metadata

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