X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=blobdiff_plain;f=mk_rate;h=103988d13702561fe6e8c8001c1ae8a5a5650a3c;hp=fcfe3e7318723400c25adaaaca5d3ae09b8c37a2;hb=a6cb7fddeb7af543c81366849090dbf7ceca4e73;hpb=09bf2bfc8b6a996083cb3283259caf364a71a356

diff --git a/mk_rate b/mk_rate
index fcfe3e7..103988d 100755
--- a/mk_rate
+++ b/mk_rate
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.9.1
+#!/usr/bin/ruby
 # $Id$
 #
 # Author:: Daigo Moriwaki
@@ -35,12 +35,18 @@
 # ./mk_rate [options]
 # 
 # GAME_RESULTS_FILE::
-#   a path to a file listing results of games, which is genrated by the
+#   a path to a file listing results of games, which is generated by the
 #   mk_game_results command.
 #   In the second style above, the file content can be read from the stdin.
 #
+# --abnormal-threshold::
+#   n [plies] (default 30)
+#   Games that end with the 'abnormal' status are counted in win/lost games
+#   for the rating calculation if a game plays more than n plies. Otherwise
+#   (or if n is zero), abnormal games are counted out of rating games.
+#
 # --base-date::
-#   a base time point for this calicuration (default now). Ex. '2009-10-31'
+#   a base time point for this calculation (default now). Ex. '2009-10-31'
 #
 # --half-life::
 #   n [days] (default 60)
@@ -68,11 +74,11 @@
 #
 # == PREREQUIRE
 #
-# Sample Command lines that isntall prerequires will work on Debian.
+# Sample Command lines that install prerequires will work on Debian.
 #
-# * Ruby 1.9.3 or 1.8.7 (including Rubygems)
+# * Ruby 2.0.0 or later (including Rubygems)
 #
-#   $ sudo aptitude install ruby1.9.1
+#   $ sudo aptitude install ruby
 #
 # * Ruby bindings for the GNU Scientific Library (GSL[http://rb-gsl.rubyforge.org/])
 #
@@ -80,7 +86,7 @@
 #
 # * RGL: {Ruby Graph Library}[http://rubyforge.org/projects/rgl/]
 #
-#   $ sudo gem1.9.1 install rgl
+#   $ sudo gem install rgl
 #
 # == Examples
 #
@@ -101,11 +107,15 @@
 # * (Rated) players, who played more than $GAMES_LIMIT [15] (rated) games. 
 #
 
+require 'pathname'
+$:.unshift(File.dirname(Pathname.new(__FILE__).realpath))
+require 'utils/csa-filter'
 require 'yaml'
 require 'time'
 require 'getoptlong'
-require 'gsl'
+require 'set'
 require 'rubygems'
+require 'gsl'
 require 'rgl/adjacency'
 require 'rgl/connected_components'
 
@@ -123,6 +133,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
 
 
 #################################################
@@ -654,6 +666,12 @@ end
 # Parse a game result line
 #
 def parse(line)
+  if $history.include? line
+    $stderr.puts "[WARNING] Duplicated: #{line}"
+    return
+  end
+  $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
@@ -661,7 +679,12 @@ def parse(line)
     return
   end
 
-  return if state == "abnormal"
+  if state == "abnormal"
+    csa = CsaFileReader.new(file, "EUC-JP")
+    if $options["abnormal-threshold"] == 0 || csa.ply <= $options["abnormal-threshold"]
+      return
+    end
+  end
   time = Time.parse(time)
   return if $options["base-date"] < time
   how_long_days = ($options["base-date"] - time)/(3600*24)
@@ -719,14 +742,15 @@ end
 def main
   $options = Hash::new
   parser = GetoptLong.new(
-    ["--base-date",         GetoptLong::REQUIRED_ARGUMENT],
-    ["--half-life",         GetoptLong::REQUIRED_ARGUMENT],
-    ["--half-life-ignore",  GetoptLong::REQUIRED_ARGUMENT],
-    ["--help", "-h",        GetoptLong::NO_ARGUMENT],
-    ["--ignore",            GetoptLong::REQUIRED_ARGUMENT],
-    ["--fixed-rate-player", GetoptLong::REQUIRED_ARGUMENT],
-    ["--fixed-rate",        GetoptLong::REQUIRED_ARGUMENT],
-    ["--skip-draw-games",   GetoptLong::NO_ARGUMENT])
+    ["--abnormal-threshold", GetoptLong::REQUIRED_ARGUMENT],
+    ["--base-date",          GetoptLong::REQUIRED_ARGUMENT],
+    ["--half-life",          GetoptLong::REQUIRED_ARGUMENT],
+    ["--half-life-ignore",   GetoptLong::REQUIRED_ARGUMENT],
+    ["--help", "-h",         GetoptLong::NO_ARGUMENT],
+    ["--ignore",             GetoptLong::REQUIRED_ARGUMENT],
+    ["--fixed-rate-player",  GetoptLong::REQUIRED_ARGUMENT],
+    ["--fixed-rate",         GetoptLong::REQUIRED_ARGUMENT],
+    ["--skip-draw-games",    GetoptLong::NO_ARGUMENT])
   parser.quiet = true
   begin
     parser.each_option do |name, arg|
@@ -752,6 +776,8 @@ def main
   else
     $options["base-date"] = Time.now
   end
+  $options["abnormal-threshold"] ||= 30
+  $options["abnormal-threshold"] = $options["abnormal-threshold"].to_i
   $options["half-life"] ||= 60
   $options["half-life"] = $options["half-life"].to_i
   $options["half-life-ignore"] ||= 7