X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=blobdiff_plain;f=mk_rate;h=1f9e54a013df157fbb637803b26fded4f868dada;hp=a035783869b84ecd6fd6e0e45e3fed2412703663;hb=76c6b6b0926fb56ad0865213d97d603f4b979668;hpb=3fd108d8134056c0342eadd249cb77e314d76e17 diff --git a/mk_rate b/mk_rate index a035783..1f9e54a 100755 --- a/mk_rate +++ b/mk_rate @@ -1,11 +1,11 @@ -#!/usr/bin/ruby +#!/usr/bin/ruby1.9.1 # $Id$ # # Author:: Daigo Moriwaki # Homepage:: http://sourceforge.jp/projects/shogi-server/ # #-- -# Copyright (C) 2006-2008 Daigo Moriwaki +# Copyright (C) 2006-2012 Daigo Moriwaki # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,15 +24,23 @@ # # == Synopsis # -# mk_rate reads CSA files, calculates rating scores of each player, and then -# outputs a yaml file (players.yaml) that Shogi-server can recognize. +# mk_rate reads game results files generated by the mk_game_results command, +# calculates rating scores of each player, and then outputs a yaml file +# (players.yaml) that Shogi-server can recognize. # # == Usage # -# ./mk_rate [options] DIR.. +# ./mk_rate [options] GAME_RESULTS_FILE [...] +# +# ./mk_rate [options] # -# DIR:: -# CSA files are recursively looked up the directories. +# GAME_RESULTS_FILE:: +# a path to a file listing results of games, which is genrated by the +# mk_game_results command. +# In the second style above, the file content can be read from the stdin. +# +# --base-date:: +# a base time point for this calicuration (default now). Ex. '2009-10-31' # # --half-life:: # n [days] (default 60) @@ -41,12 +49,20 @@ # m [days] (default 7) # after m days, the half-life effect works # +# --ignore:: +# m [days] (default 365*2) +# old results will be ignored +# # --fixed-rate-player:: # player whose rate is fixed at the rate # # --fixed-rate:: # rate # +# --skip-draw-games:: +# skip draw games. [default: draw games are counted in as 0.5 win and 0.5 +# lost.] +# # --help:: # show this message # @@ -54,29 +70,27 @@ # # Sample Command lines that isntall prerequires will work on Debian. # -# * Ruby 1.8.7 -# -# $ sudo aptitude install ruby1.8 -# -# * Rubygems +# * Ruby 1.9.3 or 1.8.7 (including Rubygems) # -# $ sudo aptitude install rubygems +# $ sudo aptitude install ruby1.9.1 # # * Ruby bindings for the GNU Scientific Library (GSL[http://rb-gsl.rubyforge.org/]) # -# $ sudo aptitude install libgsl-ruby1.8 +# $ sudo aptitude install ruby-gsl # # * RGL: {Ruby Graph Library}[http://rubyforge.org/projects/rgl/] # -# $ sudo gem install rgl +# $ sudo gem1.9.1 install rgl # -# == Run +# == Examples # -# $ ./mk_rate . > players.yaml +# $ ./mk_rate game_results.txt > players.yaml # -# or, if you do not want the file to be update in case of errors, +# $ ./mk_game_results . | ./mk_rate > players.yaml # -# $ ./mk_rate . && ./mk_rate . > players.yaml +# If you do not want the file to be update in case of errors, +# +# $ ./mk_rate game_results.txt && ./mk_rate game_results.txt > players.yaml # # == How players are rated # @@ -90,8 +104,9 @@ require 'yaml' require 'time' require 'getoptlong' -require 'gsl' +require 'set' require 'rubygems' +require 'gsl' require 'rgl/adjacency' require 'rgl/connected_components' @@ -109,6 +124,8 @@ DRAW_MARK = "draw" $players = Hash.new # Holds the last time when a player gamed $players_time = Hash.new { Time.at(0) } +# Holds history of input lines to check duplicated inputs +$history = Set.new ################################################# @@ -332,6 +349,7 @@ class Rating old_f = f old_f_nrm2 = old_f.nrm2 deaccelrate(1.0, old_rate, a, old_f_nrm2) + #@rate -= a # Instead, do not deaccelerate @record.set(func_vector.nrm2, @rate) $stderr.printf "|error| : %5.2e\n", a.nrm2 if $DEBUG @@ -348,6 +366,7 @@ class Rating @rate = @record.get $stderr.puts "resolved f: %s -> %f" % [func_vector.to_a.inspect, func_vector.nrm2] if $DEBUG + $stderr.puts "Count: %d" % [@count] if $DEBUG @rate *= 1.0/K finite! @@ -425,7 +444,7 @@ class WinLossMatrix 0 else p2 = keys[j] - v = p1_hash[p2] || Vector[0,0] + v = p1_hash[p2] || GSL::Vector[0,0] v[0] end end) @@ -466,14 +485,19 @@ class WinLossMatrix end ## - # Removes a delete_index'th player and returns a new object. + # Removes players in a rows such as [1,3,5], and then returns a new + # object. # - def delete_row(delete_index) + def delete_rows(rows) + rows = rows.sort.reverse + copied_cols = [] (0...size).each do |i| - next if i == delete_index + next if rows.include?(i) row = @matrix.row(i).clone - row.delete_at(delete_index) + rows.each do |j| + row.delete_at(j) + end copied_cols << row end if copied_cols.size == 0 @@ -481,20 +505,13 @@ class WinLossMatrix else new_matrix = GSL::Matrix[*copied_cols] end - new_keys = @keys.clone - new_keys.delete_at(delete_index) - return WinLossMatrix.new(new_keys, new_matrix) - end - ## - # Removes players in a rows; [1,3,5] - # - def delete_rows(rows) - obj = self - rows.sort.reverse.each do |index| - obj = obj.delete_row(index) + new_keys = @keys.clone + rows.each do |j| + new_keys.delete_at(j) end - obj + + return WinLossMatrix.new(new_keys, new_matrix) end ## @@ -593,13 +610,21 @@ def half_life(days) end def _add_win_loss(winner, loser, time) - how_long_days = (Time.now - time)/(3600*24) + how_long_days = ($options["base-date"] - time)/(3600*24) $players[winner] ||= Hash.new { GSL::Vector[0,0] } $players[loser] ||= Hash.new { GSL::Vector[0,0] } $players[winner][loser] += GSL::Vector[1.0*half_life(how_long_days),0] $players[loser][winner] += GSL::Vector[0,1.0*half_life(how_long_days)] end +def _add_draw(player1, player2, time) + how_long_days = ($options["base-date"] - time)/(3600*24) + $players[player1] ||= Hash.new { GSL::Vector[0,0] } + $players[player2] ||= Hash.new { GSL::Vector[0,0] } + $players[player1][player2] += GSL::Vector[0.5*half_life(how_long_days),0.5*half_life(how_long_days)] + $players[player2][player1] += GSL::Vector[0.5*half_life(how_long_days),0.5*half_life(how_long_days)] +end + def _add_time(player, time) $players_time[player] = time if $players_time[player] < time end @@ -610,7 +635,11 @@ def add(black_mark, black_name, white_name, white_mark, time) elsif black_mark == LOSS_MARK && white_mark == WIN_MARK _add_win_loss(white_name, black_name, time) elsif black_mark == DRAW_MARK && white_mark == DRAW_MARK - return + if $options["skip-draw-games"] + return + else + _add_draw(black_name, white_name, time) + end else raise "Never reached!" end @@ -625,46 +654,37 @@ def identify_id(id) id.gsub(/@.*?\+/,"+") end -def grep(file) - str = File.open(file).read - - if /^N\+(.*)$/ =~ str then black_name = $1.strip end - if /^N\-(.*)$/ =~ str then white_name = $1.strip end - - if /^'summary:(.*)$/ =~ str - state, p1, p2 = $1.split(":").map {|a| a.strip} - return if state == "abnormal" - p1_name, p1_mark = p1.split(" ") - p2_name, p2_mark = p2.split(" ") - if p1_name == black_name - black_name, black_mark = p1_name, p1_mark - white_name, white_mark = p2_name, p2_mark - elsif p2_name == black_name - black_name, black_mark = p2_name, p2_mark - white_name, white_mark = p1_name, p1_mark - else - raise "Never reach!: #{black} #{white} #{p3} #{p2}" - end +# Parse a game result line +# +def parse(line) + if $history.include? line + $stderr.puts "[WARNING] Duplicated: #{line}" + return end - if /^'\$END_TIME:(.*)$/ =~ str - time = Time.parse($1.strip) + $history.add line + + time, state, black_mark, black_id, white_id, white_mark, file = line.split("\t") + unless time && state && black_mark && black_id && + white_id && white_mark && file + $stderr.puts "Failed to parse the line : #{line}" + return end - if /^'rating:(.*)$/ =~ str - black_id, white_id = $1.split(":").map {|a| a.strip} - black_id = identify_id(black_id) - white_id = identify_id(white_id) - if black_id && white_id && (black_id != white_id) && - black_mark && white_mark - add(black_mark, black_id, white_id, white_mark, time) - end + + return if state == "abnormal" + time = Time.parse(time) + return if $options["base-date"] < time + how_long_days = ($options["base-date"] - time)/(3600*24) + if (how_long_days > $options["ignore"]) + return end -end -def usage - $stderr.puts <<-EOF -USAGE: #{$0} dir [...] - EOF - exit 1 + black_id = identify_id(black_id) + white_id = identify_id(white_id) + + if black_id && white_id && (black_id != white_id) && + black_mark && white_mark + add(black_mark, black_id, white_id, white_mark, time) + end end def validate(yaml) @@ -682,14 +702,25 @@ end def usage(io) io.puts <