Commit: 051a0e7af2694d0dd143541db454b763c1f17482 - shogi-server (git)

shogi-server source

Commit MetaInfo

• Revision: 051a0e7af2694d0dd143541db454b763c1f17482 (tree)
• Time: 2013-12-21 17:52:52
• Author: Daigo Moriwaki <daigo@debi...>
• Commiter: Daigo Moriwaki

Log Message

Merge branch '201312-KinPenalty' into wdoor-stable

Change Summary

• modified: changelog
• modified: shogi_server/pairing.rb
• modified: test/TC_pairing.rb

Incremental Difference

--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
[phone]  Daigo Moriwaki <daigo at debian dot org>
+
+	* [shogi-server]
+	  - shogi_server/pairing.rb: Impose penalty on matches between
+	    likely kin players.
+
 2013-12-15  Daigo Moriwaki <daigo at debian dot org>
 
 	* [webserver]

--- a/shogi_server/pairing.rb
+++ b/shogi_server/pairing.rb
@@ -494,6 +494,13 @@ module ShogiServer
         if p1.is_human? && p2.is_human?
           ret += 800
         end
+
+        # 2.3 a match with likely kin players
+        if (p1.player_id[0..6] == p2.player_id[0..6])
+          ret += 800
+        elsif (p1.player_id[0..3] == p2.player_id[0..3])
+          ret += 400
+        end
       end
 
       ret

--- a/test/TC_pairing.rb
+++ b/test/TC_pairing.rb
@@ -411,6 +411,19 @@ class TestLeastDiff < Test::Unit::TestCase
     @x.player_id = "x"
     @x.name = "x"
 
+    @abcdefg1 = ShogiServer::BasicPlayer.new
+    @abcdefg1.player_id = "abcdefg1"
+    @abcdefg1.name = "abcdefg1"
+    @abcdefg1.rate = 2100
+    @abcdefg2 = ShogiServer::BasicPlayer.new
+    @abcdefg2.player_id = "abcdefg2"
+    @abcdefg2.name = "abcdefg2"
+    @abcdefg2.rate = 2200
+    @abcdxyz = ShogiServer::BasicPlayer.new
+    @abcdxyz.player_id = "abcdxyz"
+    @abcdxyz.name = "abcdxyz"
+    @abcdxyz.rate = 2300
+
     $league.add(@a)
     $league.add(@b)
     $league.add(@c)
@@ -420,6 +433,9 @@ class TestLeastDiff < Test::Unit::TestCase
     $league.add(@g)
     $league.add(@h)
     $league.add(@x)
+    $league.add(@abcdefg1)
+    $league.add(@abcdefg2)
+    $league.add(@abcdxyz)
   end
 
   def teardown
@@ -548,6 +564,16 @@ class TestLeastDiff < Test::Unit::TestCase
     assert_equal(@[e-mail][e-mail][e-mail]+400, @pairing.calculate_diff_with_penalty(players, @history))
   end
 
+  def test_calculate_diff_with_kin_4_players
+    players = [@abcdefg1, @abcdxyz]
+    assert_equal(@abcdxyz.rate - @abcdefg1.rate + 400, @pairing.calculate_diff_with_penalty(players,nil))
+  end
+
+  def test_calculate_diff_with_kin_7_players
+    players = [@abcdefg1, @abcdefg2]
+    assert_equal(@abcdefg2.rate - @abcdefg1.rate + 800, @pairing.calculate_diff_with_penalty(players,nil))
+  end
+
   def test_get_player_rate_0
     assert_equal(2150, @pairing.get_player_rate(@x, @history))