[mk_rate] - Added a new option, --abnormal-threshold n:

[shogi-server/shogi-server.git] / utils / eval_graph.rb

diff --git a/utils/eval_graph.rb b/utils/eval_graph.rb
index 9f33181..64a5ea6 100755 (executable)
--- a/utils/eval_graph.rb
+++ b/utils/eval_graph.rb
@@ -8,7 +8,7 @@
 #   * On Debian, $ sudo apt-get install gnuplot
 #
 # Author::    Daigo Moriwaki <daigo at debian dot org>
-# Copyright:: Copyright (C) 2006-2008  Daigo Moriwaki <daigo at debian dot org>
+# Copyright:: Copyright (C) 2006-2012 Daigo Moriwaki <daigo at debian dot org>
 #
 # $Id$
 #
@@ -142,7 +142,7 @@ module EvalGraph
     def eval_values
       moves = []
       comments.each_with_index do |c, i|
-        moves << i*2 + 1 if c
+        moves << i*2 if c
       end
       moves.unshift 0
       [moves, comments.compact.unshift(0)]
@@ -171,7 +171,7 @@ module EvalGraph
     def eval_values
       moves = []
       comments.each_with_index do |c, i|
-        moves << i*2 if c
+        moves << i*2+1 if c
       end
       moves.unshift 0
       [moves, comments.compact.unshift(0)]
@@ -203,11 +203,11 @@ module EvalGraph
 end # module EvalGraph
 
 
-def plot(csa_file, title, black, white)
+def plot(csa_file, title, black, white, a_play_time)
   width = [black.comments.size, white.comments.size].max * 2 + 1
   Gnuplot.open do |gp|
     Gnuplot::Plot.new( gp ) do |plot|
-      plot.terminal "svg" # or png
+      plot.terminal "svg size 800 500 fixed" # or png
       plot.output   to_svg_file(csa_file)
       
       plot.title  title
@@ -225,7 +225,7 @@ def plot(csa_file, title, black, white)
       plot.key "left"
      
       plot.style "line 1 linewidth 5 linetype 0 linecolor rgbcolor \"red\"" 
-      plot.style "line 2 linewidth 4 linetype 0 linecolor rgbcolor \"blue\"" 
+      plot.style "line 2 linewidth 4 linetype 0 linecolor rgbcolor \"dark-green\"" 
 
       plot.data << Gnuplot::DataSet.new( black.eval_values ) do |ds|
         ds.with  = "lines ls 1"
@@ -237,17 +237,16 @@ def plot(csa_file, title, black, white)
         ds.title = white.name
       end
 
-      a_play_time = play_time(csa_file)
       if a_play_time > 0
         plot.style "line 5 linewidth 1 linetype 0 linecolor rgbcolor \"red\"" 
-        plot.style "line 6 linewidth 1 linetype 0 linecolor rgbcolor \"blue\"" 
+        plot.style "line 6 linewidth 1 linetype 0 linecolor rgbcolor \"green\"" 
         plot.style "fill solid 0.25 noborder"
 
-        plot.data << Gnuplot::DataSet.new( black.time_values(2000, a_play_time) ) do |ds|
+        plot.data << Gnuplot::DataSet.new( black.time_values(3000, a_play_time) ) do |ds|
           ds.with  = "boxes notitle ls 5"
         end
         
-        plot.data << Gnuplot::DataSet.new( white.time_values(-2000, a_play_time) ) do |ds|
+        plot.data << Gnuplot::DataSet.new( white.time_values(-3000, a_play_time) ) do |ds|
           ds.with  = "boxes notitle ls 6"
         end
       end # if
@@ -257,9 +256,14 @@ def plot(csa_file, title, black, white)
 end
 
 
-
-def read(lines, file_name)
+# Read kifu, a record of moves, to generate a graph file. 
+# lines are contents of the kifu.
+# file is a file name of a genrating image file.
+# original_file_name is a file name of the csa file.
+#
+def read(lines, file_name, original_file_name=nil)
   lines.map! {|l| l.strip}
+  original_file_name ||=  file_name 
   
   black,white = EvalGraph.create_players
   while l = lines.shift do
@@ -268,7 +272,8 @@ def read(lines, file_name)
   end
   
   title = "#{file_name}" 
-  plot(file_name, title, black, white)
+  a_play_time = play_time(original_file_name)
+  plot(file_name, title, black, white, a_play_time)
 end