[shogi-server] shogi_server/pairing.rb: Attempt more trials

[shogi-server/shogi-server.git] / shogi_server / pairing.rb

diff --git a/shogi_server/pairing.rb b/shogi_server/pairing.rb
index fec47af..cc2ea62 100644 (file)
--- a/shogi_server/pairing.rb
+++ b/shogi_server/pairing.rb
@@ -69,14 +69,22 @@ module ShogiServer
                 StartGameWithoutHumans.new]
       end
 
                 StartGameWithoutHumans.new]
       end
 

-      def match(players, logics)
+      def match(players, logics, options)

         logics.inject(players) do |result, item|
         logics.inject(players) do |result, item|

+          item.set_options(options)

           item.match(result)
           result
         end
       end
     end # class << self
 
           item.match(result)
           result
         end
       end
     end # class << self
 

+    def initialize
+      @options = {}
+    end
+
+    def set_options(options)
+      @options.merge!(options)
+    end

 
     # Make matches among players.
     # @param players an array of players, which should be updated destructively
 
     # Make matches among players.
     # @param players an array of players, which should be updated destructively


@@ -129,7 +137,7 @@ module ShogiServer
       log_message("Floodgate: Starting a game: BLACK %s vs WHITE %s" % [p1.name, p2.name])
       p1.sente = true
       p2.sente = false
       log_message("Floodgate: Starting a game: BLACK %s vs WHITE %s" % [p1.name, p2.name])
       p1.sente = true
       p2.sente = false

-      board = Board.new
+      board = Board.new(@options)

       board.initial
       Game.new(p1.game_name, p1, p2, board)
     end
       board.initial
       Game.new(p1.game_name, p1, p2, board)
     end


@@ -506,6 +514,22 @@ module ShogiServer
       ret
     end
 
       ret
     end
 

+    # Total combinations of possible games among n players
+    #   nC2 * (n-2)C2 * ... * 2C2 / (n/2)!
+    def total_posibilities(n)
+      n -= 1 if n.odd?
+      return 1 if n <= 2
+
+      ret = 1
+      i = n
+      while i >= 2 do
+        ret *= ::ShogiServer::nCk(i,2)
+        i -= 2
+      end
+      ret /= ::ShogiServer::factorial(n/2)
+      return ret
+    end
+

     def match(players)
       super
       if players.size < 3
     def match(players)
       super
       if players.size < 3


@@ -516,12 +540,16 @@ module ShogiServer
       # Reset estimated rate
       players.each {|p| p.estimated_rate = 0}
 
       # Reset estimated rate
       players.each {|p| p.estimated_rate = 0}
 

-      # 10 trials

       matches = []
       scores  = []
       path = ShogiServer::League::Floodgate.history_file_path(players.first.game_name)
       history = ShogiServer::League::Floodgate::History.factory(path)
       matches = []
       scores  = []
       path = ShogiServer::League::Floodgate.history_file_path(players.first.game_name)
       history = ShogiServer::League::Floodgate::History.factory(path)

-      10.times do 
+
+      # Increase trials, depending on a number of players
+      trials = [300, total_posibilities(players.size)/3].min
+      trials = [10, trials].max
+      log_message("Floodgate: %d trials" % [trials])
+      trials.times do

         m = random_match(players)
         matches << m
         scores << calculate_diff_with_penalty(m, history)
         m = random_match(players)
         matches << m
         scores << calculate_diff_with_penalty(m, history)