bridge 0.1.1 → 0.1.2

data/lib/bridge/constants.rb

@@ -53,31 +53,31 @@ module Bridge
   module Points
     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
+        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
       }
     class Chicago
       # values in array: [not-vulnerable, vulnerable]

data/lib/bridge/points/chicago.rb

@@ -6,7 +6,7 @@ module Bridge::Points
     # Creates new Imp object
     #
     # ==== Example
-    #   Bridge::Imp.new(:hcp => 25, :points => 420, :vulnerable => true)
+    #   Bridge::Points::Chicago.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)
@@ -29,6 +29,7 @@ module Bridge::Points
       IMPS.each do |range, imps|
         return (imps * sign) if range.include?(points_difference.abs)
       end
+      nil
     end
 
     private

data/lib/bridge/points/duplicate.rb

@@ -0,0 +1,29 @@
+module Bridge::Points
+  class Duplicate
+    def initialize(*scores)
+      @scores = Array(scores).flatten
+    end
+
+    def max
+      @scores.inject({}) do |result, score|
+        result.tap do |r|
+          r[score] ||= @scores.inject(-1) { |points, s| points += (score <=> s) + 1 }
+        end
+      end
+    end
+
+    # def max_percents
+    #   max.tap do |result|
+    #     result.each do |score, points|
+    #       result[score] = points * 100.0 / theoretical_max
+    #     end
+    #   end
+    # end
+
+    # protected
+
+    # def theoretical_max
+    #   (@scores.size - 1) * 2
+    # end
+  end
+end

data/lib/bridge/version.rb

@@ -1,3 +1,3 @@
 module Bridge
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/bridge.rb

@@ -3,6 +3,7 @@ require "bridge/card"
 require "bridge/constants"
 require "bridge/deal"
 require "bridge/points/chicago"
+require "bridge/points/duplicate"
 require "bridge/score"
 require "bridge/trick"
 require "bridge/version"

data/test/test_chicago.rb

@@ -22,6 +22,16 @@ class TestChicago < Test::Unit::TestCase
     assert_equal 110, imp.points_to_make
   end
 
+  test "return nil when points are not in range" do
+    imp = Bridge::Points::Chicago.new(:hcp => 20, :points => 45)
+    assert_equal nil, imp.imps
+  end
+
+  test "return high value of imp range" do
+    imp = Bridge::Points::Chicago.new(:hcp => 22, :points => 110)
+    assert_equal 1, imp.imps
+  end
+
   test "return points to make when not vulnerable" do
     imp = Bridge::Points::Chicago.new(:hcp => 23, :points => 100, :vulnerable => false)
     assert_equal 110, imp.points_to_make

data/test/test_duplicate.rb

@@ -0,0 +1,38 @@
+require "helper"
+
+class TestDuplicate < Test::Unit::TestCase
+  test "maximum points with unique values" do
+    max = Bridge::Points::Duplicate.new(-200, -100, 620, 630, 660, 690).max
+    assert_equal 10, max[690]
+    assert_equal  8, max[660]
+    assert_equal  6, max[630]
+    assert_equal  4, max[620]
+    assert_equal  2, max[-100]
+    assert_equal  0, max[-200]
+  end
+
+  test "maximum points with non-unique values" do
+    max = Bridge::Points::Duplicate.new(420, 420, 400, 400, -50, -100).max
+    assert_equal 9, max[420]
+    assert_equal 5, max[400]
+    assert_equal 2, max[-50]
+    assert_equal 0, max[-100]
+  end
+
+  test "maximum points with non-unique values, without zero value" do
+    max = Bridge::Points::Duplicate.new(430, 420, 420, 420, 300, 300).max
+    assert_equal 10, max[430]
+    assert_equal  6, max[420]
+    assert_equal  1, max[300]
+  end
+
+  # test "maximum percents" do
+  #   max_percents = Bridge::Points::Duplicate.new(50, 400, 110, 100, 110, 120, 50, 120, 140, 420, 110, 110, 110, 110, 50, 110, 140, 110).max_percents
+  #   notify max_percents.inspect
+  # end
+
+  # test "maximum percents 2" do
+  #   max_percents = Bridge::Points::Duplicate.new(-500, -650, -170, -170, -620, -620, -620).max_percents
+  #   notify max_percents.inspect
+  # end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 +02:00
+date: 2010-09-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - lib/bridge/constants.rb
 - lib/bridge/deal.rb
 - lib/bridge/points/chicago.rb
+- lib/bridge/points/duplicate.rb
 - lib/bridge/score.rb
 - lib/bridge/trick.rb
 - lib/bridge/version.rb
@@ -64,6 +65,7 @@ files:
 - test/test_card.rb
 - test/test_chicago.rb
 - test/test_deal.rb
+- test/test_duplicate.rb
 - test/test_score.rb
 - test/test_trick.rb
 has_rdoc: true
@@ -80,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1502047250263406809
+      hash: -4128306614799067572
       segments: 
       - 0
       version: "0"