X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=blobdiff_plain;f=shogi_server%2Fgame.rb;h=cd7c41a649c27a90d6b1897bc740b9284edf0a77;hp=4aeaf3a7e6105a87a6429103ff8ee9802b0cbf08;hb=73ae3557f07139fd776880101630ff12bb666259;hpb=88ef00115c9ce6580567431f38d454b6a70a46ee diff --git a/shogi_server/game.rb b/shogi_server/game.rb index 4aeaf3a..cd7c41a 100644 --- a/shogi_server/game.rb +++ b/shogi_server/game.rb @@ -1,7 +1,7 @@ ## $Id$ ## Copyright (C) 2004 NABEYA Kenichi (aka nanami@2ch) -## Copyright (C) 2007-2008 Daigo Moriwaki (daigo at debian dot org) +## Copyright (C) 2007-2012 Daigo Moriwaki (daigo at debian dot org) ## ## 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 @@ -19,6 +19,8 @@ require 'shogi_server/league/floodgate' require 'shogi_server/game_result' +require 'shogi_server/time_clock' +require 'shogi_server/util' module ShogiServer # for a namespace @@ -30,13 +32,73 @@ class Game @@mutex = Mutex.new @@time = 0 + + # Decide an actual turn of each player according to their turn preferences. + # p2 is a rival player of the p1 player. + # p1_sente_string must be "*", "+" or "-". + # After this call, the sente value of each player is always true or false, not + # nil. + # + def Game.decide_turns(p1, p1_sente_string, p2) + if ((p1_sente_string == "*") && (p2.sente == nil)) + if (rand(2) == 0) + p1.sente = true + p2.sente = false + else + p1.sente = false + p2.sente = true + end + elsif (p2.sente == true) # rival has higher priority + p1.sente = false + elsif (p2.sente == false) + p1.sente = true + elsif (p1_sente_string == "+") + p1.sente = true + p2.sente = false + elsif (p1_sente_string == "-") + p1.sente = false + p2.sente = true + else + ## never reached + end + end + + TimeControlParams = Struct.new(:total_time, :byoyomi, :fischer, :stop_watch, :error) + + # Parse time related parts of a game name. + # + # Return an array of a total allotted time, byoyomi seconds and fischer + # seconds; if it fails to parse, return nil. + def Game.parse_time(game_name) + ret = TimeControlParams.new(0, 0, 0, false, false) + + if (game_name =~ /-(\d+)-(\d+F?)$/) + ret[:total_time] = $1.to_i + tmp = $2 + if tmp =~ /^0\d/ + ret[:stop_watch] = true + end + if tmp[-1] == "F" + ret[:fischer] = tmp.chop.to_i + else + ret[:byoyomi] = tmp.to_i + end + return ret + end + + ret[:error] = true + return ret + end + + def initialize(game_name, player0, player1, board) - @monitors = Array::new + @monitors = Array::new # array of MonitorHandler* @game_name = game_name - if (@game_name =~ /-(\d+)-(\d+)$/) - @total_time = $1.to_i - @byoyomi = $2.to_i - end + time_map = Game.parse_time @game_name + @total_time = time_map[:total_time] + @byoyomi = time_map[:byoyomi] + @fischer = time_map[:fischer] + @time_clock = TimeClock::factory(board.least_time_per_move, @game_name) if (player0.sente) @sente, @gote = player0, player1 @@ -54,7 +116,16 @@ class Game @sente.game = self @gote.game = self - @last_move = @board.initial_moves.empty? ? "" : "%s,T1" % [@board.initial_moves.last] + @last_move = "" + unless @board.initial_moves.empty? + last_move = @board.initial_moves.last + case last_move + when Array + @last_move = last_move.join(",") + when String + @last_move = "%s,T1" % [last_move] + end + end @current_turn = @board.initial_moves.size @sente.status = "agree_waiting" @@ -71,12 +142,13 @@ class Game @prepared_time.strftime("%Y"), @prepared_time.strftime("%m"), @prepared_time.strftime("%d")) - FileUtils.mkdir_p(log_dir_name) unless File.exist?(log_dir_name) @logfile = File.join(log_dir_name, @game_id + ".csa") + Mkdir.mkdir_for(@logfile) $league.games[@game_id] = self log_message(sprintf("game created %s", @game_id)) + log_message(" " + @time_clock.to_s) @start_time = nil @fh = open(@logfile, "w") @@ -85,7 +157,7 @@ class Game propose end - attr_accessor :game_name, :total_time, :byoyomi, :sente, :gote, :game_id, :board, :current_player, :next_player, :fh, :monitors + attr_accessor :game_name, :total_time, :byoyomi, :fischer, :sente, :gote, :game_id, :board, :current_player, :next_player, :fh, :monitors, :time_clock attr_accessor :last_move, :current_turn attr_reader :result, :prepared_time @@ -100,18 +172,18 @@ class Game return player.status == "game" && @current_player == player end - def monitoron(monitor) - @monitors.delete(monitor) - @monitors.push(monitor) + def monitoron(monitor_handler) + monitoroff(monitor_handler) + @monitors.push(monitor_handler) end - def monitoroff(monitor) - @monitors.delete(monitor) + def monitoroff(monitor_handler) + @monitors.delete_if {|mon| mon == monitor_handler} end def each_monitor - @monitors.each do |monitor| - yield monitor + @monitors.each do |monitor_handler| + yield monitor_handler end end @@ -138,15 +210,20 @@ class Game end if (@current_player == killer) - result = GameResultAbnormalWin.new(self, @next_player, @current_player) - result.process + @result = GameResultAbnormalWin.new(self, @next_player, @current_player) + @result.process finish end end def finish log_message(sprintf("game finished %s", @game_id)) - @fh.printf("'$END_TIME:%s\n", Time::new.strftime("%Y/%m/%d %H:%M:%S")) + + # In a case where a player in agree_waiting or start_waiting status is + # rejected, a GameResult object is not yet instanciated. + # See test/TC_before_agree.rb. + end_time = @result ? @result.end_time : Time.now + @fh.printf("'$END_TIME:%s\n", end_time.strftime("%Y/%m/%d %H:%M:%S")) @fh.close @sente.game = nil @@ -169,7 +246,7 @@ class Game end # class Game - def handle_one_move(str, player) + def handle_one_move(str, player, end_time) unless turn?(player) return false if str == :timeout @@ -180,80 +257,78 @@ class Game return nil end + @end_time = end_time finish_flag = true - @end_time = Time::new - t = [(@end_time - @start_time).floor, Least_Time_Per_Move].max - move_status = nil - if ((@current_player.mytime - t <= -@byoyomi) && - ((@total_time > 0) || (@byoyomi > 0))) + + if (@time_clock.timeout?(@current_player, @start_time, @end_time)) status = :timeout elsif (str == :timeout) return false # time isn't expired. players aren't swapped. continue game else - @current_player.mytime -= t - if (@current_player.mytime < 0) - @current_player.mytime = 0 - end - + t = @time_clock.process_time(@current_player, @start_time, @end_time) + log_info(sprintf("+++ DEBUG %s consumed %d sec. remain %d sec", + @current_player.name, t, @current_player.mytime)) move_status = @board.handle_one_move(str, @sente == @current_player) # log_debug("move_status: %s for %s's %s" % [move_status, @sente == @current_player ? "BLACK" : "WHITE", str]) if [:illegal, :uchifuzume, :oute_kaihimore].include?(move_status) @fh.printf("'ILLEGAL_MOVE(%s)\n", str) else - if [:normal, :outori, :sennichite, :oute_sennichite_sente_lose, :oute_sennichite_gote_lose].include?(move_status) + if :toryo != move_status # Thinking time includes network traffic @sente.write_safe(sprintf("%s,T%d\n", str, t)) @gote.write_safe(sprintf("%s,T%d\n", str, t)) @fh.printf("%s\nT%d\n", str, t) @last_move = sprintf("%s,T%d", str, t) @current_turn += 1 - end - @monitors.each do |monitor| - monitor.write_safe(show.gsub(/^/, "##[MONITOR][#{@game_id}] ")) - monitor.write_safe(sprintf("##[MONITOR][%s] +OK\n", @game_id)) - end - end + @monitors.each do |monitor_handler| + monitor_handler.write_one_move(@game_id, self) + end + end # if + # if move_status is :toryo then a GameResult message will be sent to monitors + end # if end - result = nil + @result = nil if (@next_player.status != "game") # rival is logout or disconnected - result = GameResultAbnormalWin.new(self, @current_player, @next_player) + @result = GameResultAbnormalWin.new(self, @current_player, @next_player) elsif (status == :timeout) # current_player losed - result = GameResultTimeoutWin.new(self, @next_player, @current_player) + @result = GameResultTimeoutWin.new(self, @next_player, @current_player) elsif (move_status == :illegal) - result = GameResultIllegalMoveWin.new(self, @next_player, @current_player) + @result = GameResultIllegalMoveWin.new(self, @next_player, @current_player) elsif (move_status == :kachi_win) - result = GameResultKachiWin.new(self, @current_player, @next_player) + @result = GameResultKachiWin.new(self, @current_player, @next_player) elsif (move_status == :kachi_lose) - result = GameResultIllegalKachiWin.new(self, @next_player, @current_player) + @result = GameResultIllegalKachiWin.new(self, @next_player, @current_player) elsif (move_status == :toryo) - result = GameResultToryoWin.new(self, @next_player, @current_player) + @result = GameResultToryoWin.new(self, @next_player, @current_player) elsif (move_status == :outori) # The current player captures the next player's king - result = GameResultOutoriWin.new(self, @current_player, @next_player) + @result = GameResultOutoriWin.new(self, @current_player, @next_player) elsif (move_status == :oute_sennichite_sente_lose) - result = GameResultOuteSennichiteWin.new(self, @gote, @sente) # Sente is checking + @result = GameResultOuteSennichiteWin.new(self, @gote, @sente) # Sente is checking elsif (move_status == :oute_sennichite_gote_lose) - result = GameResultOuteSennichiteWin.new(self, @sente, @gote) # Gote is checking + @result = GameResultOuteSennichiteWin.new(self, @sente, @gote) # Gote is checking elsif (move_status == :sennichite) - result = GameResultSennichiteDraw.new(self, @current_player, @next_player) + @result = GameResultSennichiteDraw.new(self, @current_player, @next_player) elsif (move_status == :uchifuzume) # the current player losed - result = GameResultUchifuzumeWin.new(self, @next_player, @current_player) + @result = GameResultUchifuzumeWin.new(self, @next_player, @current_player) elsif (move_status == :oute_kaihimore) # the current player losed - result = GameResultOuteKaihiMoreWin.new(self, @next_player, @current_player) + @result = GameResultOuteKaihiMoreWin.new(self, @next_player, @current_player) + elsif (move_status == :max_moves) + @result = GameResultMaxMovesDraw.new(self, @current_player, @next_player) else finish_flag = false end - result.process if result + @result.process if @result finish() if finish_flag @current_player, @next_player = @next_player, @current_player - @start_time = Time::new + @start_time = Time.now return finish_flag end @@ -271,42 +346,48 @@ class Game @gote.write_safe(sprintf("START:%s\n", @game_id)) @sente.mytime = @total_time @gote.mytime = @total_time - @start_time = Time::new + @start_time = Time.now end def propose @fh.puts("V2") @fh.puts("N+#{@sente.name}") @fh.puts("N-#{@gote.name}") + @fh.puts("'Max_Moves:#{@board.max_moves}") + @fh.puts("'Least_Time_Per_Move:#{@board.least_time_per_move}") + if @fischer > 0 + @fh.puts("'Increment:#{@fischer}") + end @fh.puts("$EVENT:#{@game_id}") @sente.write_safe(propose_message("+")) @gote.write_safe(propose_message("-")) - now = Time::new.strftime("%Y/%m/%d %H:%M:%S") + now = Time.now.strftime("%Y/%m/%d %H:%M:%S") @fh.puts("$START_TIME:#{now}") - @fh.print <