mjai 0.0.1 → 0.0.2

data/lib/mjai/action.rb

@@ -18,6 +18,7 @@ module Mjai
           [:bakaze, :pai],
           [:kyoku, :number],
           [:honba, :number],
+          [:kyotaku, :number],
           [:oya, :player],
           [:dora_marker, :pai],
           [:uradora_markers, :pais],

data/lib/mjai/active_game.rb

@@ -28,10 +28,11 @@ module Mjai
             @ag_oya = @ag_chicha = @players[0]
             @ag_bakaze = Pai.new("E")
             @ag_honba = 0
+            @ag_kyotaku = 0
             while !self.game_finished?
               play_kyoku()
             end
-            do_action({:type => :end_game})
+            do_action({:type => :end_game, :scores => get_final_scores()})
             return true
           rescue ValidationError => ex
             do_action({:type => :error, :message => ex.message})
@@ -51,6 +52,7 @@ module Mjai
                 :bakaze => @ag_bakaze,
                 :kyoku => (4 + @ag_oya.id - @ag_chicha.id) % 4 + 1,
                 :honba => @ag_honba,
+                :kyotaku => @ag_kyotaku,
                 :oya => @ag_oya,
                 :dora_marker => dora_marker,
                 :tehais => tehais,
@@ -67,7 +69,8 @@ module Mjai
         
         # 摸打
         def mota()
-          reach = false
+          reach_pending = false
+          kandora_pending = false
           tsumo_actor = @actor
           actions = [Action.new({:type => :tsumo, :actor => @actor, :pai => @pipais.pop()})]
           while !actions.empty?
@@ -79,27 +82,43 @@ module Mjai
               raise("should not happen") if actions.size != 1
               action = actions[0]
               responses = do_action(action)
+              next_actions = nil
               case action.type
                 when :daiminkan, :kakan, :ankan
+                  if action.type == :ankan
+                    add_dora()
+                  end
                   # Actually takes one from wanpai and moves one pai from pipai to wanpai,
                   # but it's equivalent to taking from pipai.
-                  actions =
+                  next_actions =
                     [Action.new({:type => :tsumo, :actor => action.actor, :pai => @pipais.pop()})]
-                  # TODO Add dora.
-                  next
+                  # TODO Handle 4 kans.
                 when :reach
-                  reach = true
+                  reach_pending = true
               end
-              actions = choose_actions(responses)
-              if reach && (actions.empty? || ![:dahai, :hora].include?(actions[0].type))
+              next_actions ||= choose_actions(responses)
+              if reach_pending &&
+                  (next_actions.empty? || ![:dahai, :hora].include?(next_actions[0].type))
+                @ag_kyotaku += 1
                 deltas = [0, 0, 0, 0]
                 deltas[tsumo_actor.id] = -1000
                 do_action({
-                    :type => :reach_accepted,:actor => tsumo_actor,
+                    :type => :reach_accepted,
+                    :actor => tsumo_actor,
                     :deltas => deltas,
                     :scores => get_scores(deltas),
                 })
+                reach_pending = false
               end
+              if kandora_pending &&
+                  !next_actions.empty? && [:dahai, :tsumo].include?(next_actions[0].type)
+                add_dora()
+                kandora_pending = false
+              end
+              if [:daiminkan, :kakan].include?(action.type)
+                kandora_pending = true
+              end
+              actions = next_actions
             end
           end
         end
@@ -119,22 +138,24 @@ module Mjai
         end
         
         def process_hora(actions)
-          # TODO ダブロンの上家取り
-          for action in actions
-            hora = get_hora(action)
+          tsumibo = self.honba
+          for action in actions.sort_by(){ |a| distance(a.actor, a.target) }
+            uradora_markers = action.actor.reach? ? @wanpais.pop(self.dora_markers.size) : []
+            hora = get_hora(action, {
+                :uradora_markers => uradora_markers,
+                :previous_action => self.previous_action,
+            })
             raise("no yaku") if !hora.valid?
             deltas = [0, 0, 0, 0]
-            # TODO 積み棒
-            deltas[action.actor.id] += hora.points + self.honba * 300
-            deltas[action.actor.id] += self.players.select(){ |pl| pl.reach? }.size * 1000
+            deltas[action.actor.id] += hora.points + tsumibo * 300 + @ag_kyotaku * 1000
             if hora.hora_type == :tsumo
               for player in self.players
                 next if player == action.actor
                 deltas[player.id] -=
-                    ((player == self.oya ? hora.oya_payment : hora.ko_payment) + self.honba * 100)
+                    ((player == self.oya ? hora.oya_payment : hora.ko_payment) + tsumibo * 100)
               end
             else
-              deltas[action.target.id] -= (hora.points + self.honba * 300)
+              deltas[action.target.id] -= (hora.points + tsumibo * 300)
             end
             do_action({
               :type => action.type,
@@ -142,6 +163,7 @@ module Mjai
               :target => action.target,
               :pai => action.pai,
               :hora_tehais => action.actor.tehais,
+              :uradora_markers => uradora_markers,
               :yakus => hora.yakus,
               :fu => hora.fu,
               :fan => hora.fan,
@@ -149,6 +171,9 @@ module Mjai
               :deltas => deltas,
               :scores => get_scores(deltas),
             })
+            # Only kamicha takes them in case of daburon.
+            tsumibo = 0
+            @ag_kyotaku = 0
           end
           update_oya(actions.any?(){ |a| a.actor == self.oya }, false)
         end
@@ -208,6 +233,11 @@ module Mjai
           end
         end
         
+        def add_dora()
+          dora_marker = @wanpais.pop()
+          do_action({:type => :dora, :dora_marker => dora_marker})
+        end
+        
         def game_finished?
           if @last
             return true
@@ -217,6 +247,13 @@ module Mjai
           end
         end
         
+        def get_final_scores()
+          # The winner takes remaining kyotaku.
+          deltas = [0, 0, 0, 0]
+          deltas[self.ranked_players[0].id] = @ag_kyotaku * 1000
+          return get_scores(deltas)
+        end
+        
         def expect_response_from?(player)
           return true
         end

data/lib/mjai/archive.rb

@@ -41,6 +41,10 @@ module Mjai
           return false
         end
         
+        def inspect
+          return '#<%p:path=%p>' % [self.class, self.path]
+        end
+        
     end
     
 end

data/lib/mjai/confidence_interval.rb

@@ -0,0 +1,37 @@
+module Mjai
+    
+    module ConfidenceInterval
+        
+      module_function
+
+        # Uses bootstrap resampling.
+        def calculate(samples, params = {})
+          params = {:min => 0.0, :max => 1.0, :conf_level => 0.95}.merge(params)
+          num_tries = 1000
+          averages = []
+          num_tries.times() do
+            sum = 0.0
+            (samples.size + 2).times() do
+              idx = rand(samples.size + 2)
+              case idx
+                when samples.size
+                  sum += params[:min]
+                when samples.size + 1
+                  sum += params[:max]
+                else
+                  sum += samples[idx]
+              end
+            end
+            averages.push(sum / (samples.size + 2))
+          end
+          averages.sort!()
+          margin = (1.0 - params[:conf_level]) / 2
+          return [
+            averages[(num_tries * margin).to_i()],
+            averages[(num_tries * (1.0 - margin)).to_i()],
+          ]
+        end
+        
+    end
+    
+end

data/lib/mjai/game.rb

@@ -20,6 +20,8 @@ module Mjai
           @current_action = nil
           @previous_action = nil
           @num_pipais = nil
+          @num_initial_pipais = nil
+          @first_turn = false
         end
         
         attr_reader(:players)
@@ -96,9 +98,15 @@ module Mjai
               @oya = action.oya
               @chicha ||= @oya
               @dora_markers = [action.dora_marker]
-              @num_pipais = @all_pais.size - 13 * 4 - 14
+              @num_pipais = @num_initial_pipais = @all_pais.size - 13 * 4 - 14
+              @first_turn = true
             when :tsumo
               @num_pipais -= 1
+              if @num_initial_pipais - @num_pipais > 4
+                @first_turn = false
+              end
+            when :chi, :pon, :daiminkan, :kakan, :ankan
+              @first_turn = false
             when :dora
               @dora_markers.push(action.dora_marker)
           end
@@ -183,6 +191,7 @@ module Mjai
                   # Actor should wait for tsumo.
                   valid = !response
                 else
+                  # hora is for chankan.
                   valid = !response || response.type == :hora
                 end
               when :log
@@ -204,10 +213,18 @@ module Mjai
           case response.type
             
             when :dahai
+              
               validate_fields_exist(response, [:pai, :tsumogiri])
+              if action.actor.reach?
+                # possible_dahais check doesn't subsume this check. Consider karagiri
+                # (with tsumogiri=false) after reach.
+                validate(response.tsumogiri, "tsumogiri must be true after reach.")
+              end
               validate(
                   response.actor.possible_dahais.include?(response.pai),
-                  "Cannot dahai this pai.")
+                  "Cannot dahai this pai. The pai is not in the tehais, or it's kuikae.")
+              
+              # Validates that pai and tsumogiri fields are consistent.
               if [:tsumo, :reach].include?(action.type)
                 if response.tsumogiri
                   tsumo_pai = response.actor.tehais[-1]
@@ -284,7 +301,7 @@ module Mjai
           return @dora_markers ? @dora_markers.map(){ |pai| pai.succ } : nil
         end
         
-        def get_hora(action)
+        def get_hora(action, params = {})
           raise("should not happen") if action.type != :hora
           hora_type = action.actor == action.target ? :tsumo : :ron
           if hora_type == :tsumo
@@ -292,6 +309,7 @@ module Mjai
           else
             tehais = action.actor.tehais
           end
+          uradoras = (params[:uradora_markers] || []).map(){ |pai| pai.succ }
           return Hora.new({
             :tehais => tehais,
             :furos => action.actor.furos,
@@ -301,19 +319,27 @@ module Mjai
             :bakaze => self.bakaze,
             :jikaze => action.actor.jikaze,
             :doras => self.doras,
-            :uradoras => [],  # TODO
+            :uradoras => uradoras,
             :reach => action.actor.reach?,
-            :double_reach => false,  # TODO
-            :ippatsu => false,  # TODO
-            :rinshan => false,  # TODO
+            :double_reach => action.actor.double_reach?,
+            :ippatsu => action.actor.ippatsu_chance?,
+            :rinshan => action.actor.rinshan?,
             :haitei => self.num_pipais == 0,
-            :first_turn => false,  # TODO
-            :chankan => false,  # TODO
+            :first_turn => @first_turn,
+            :chankan => params[:previous_action].type == :kakan,
           })
         end
         
+        def first_turn?
+          return @first_turn
+        end
+        
         def ranked_players
-          return @players.sort_by(){ |pl| [-pl.score, (4 + pl.id - @chicha.id) % 4] }
+          return @players.sort_by(){ |pl| [-pl.score, distance(pl, @chicha)] }
+        end
+        
+        def distance(player1, player2)
+          return (4 + player1.id - player2.id) % 4
         end
         
         def dump_action(action, io = $stdout)

data/lib/mjai/mjai_command.rb

@@ -1,6 +1,6 @@
 require "optparse"
 
-require "mjai/tcp_game_server"
+require "mjai/tcp_active_game_server"
 require "mjai/tcp_client_game"
 require "mjai/tsumogiri_player"
 require "mjai/shanten_player"
@@ -30,7 +30,7 @@ module Mjai
                   else
                     num_games = opts["games"].to_i()
                   end
-                  server = TCPGameServer.new({
+                  server = TCPActiveGameServer.new({
                       :host => opts["host"],
                       :port => opts["port"].to_i(),
                       :room => opts["room"],

data/lib/mjai/pai.rb

@@ -57,6 +57,17 @@ module Mjai
             else
               raise(ArgumentError, "Wrong number of args.")
           end
+          if @type != nil || @number != nil
+            if !["m", "p", "s", "t"].include?(@type)
+              raise("Bad type: %p" % @type)
+            end
+            if !@number.is_a?(Integer)
+              raise("number must be Integer: %p" % @number)
+            end
+            if @red != true && @red != false
+              raise("red must be boolean: %p" % @red)
+            end
+          end
         end
         
         def to_s()
@@ -75,6 +86,16 @@ module Mjai
         
         attr_reader(:type, :number)
         
+        def valid?
+          if @type == nil && @number == nil
+            return true
+          elsif @type == "t"
+            return (1..7).include?(@number)
+          else
+            return (1..9).include?(@number)
+          end
+        end
+        
         def red?
           return @red
         end
@@ -91,6 +112,10 @@ module Mjai
           return @type == "t" && (5..7).include?(@number)
         end
         
+        def next(n)
+          return Pai.new(@type, @number + n)
+        end
+        
         def data
           return [@type || "", @number || -1, @red ? 1 : 0]
         end
@@ -123,8 +148,10 @@ module Mjai
         
         # Next pai in terms of dora derivation.
         def succ
-          if (@type == "t" && @number == 7) || (@type != "t" && @number == 9)
+          if (@type == "t" && @number == 4) || (@type != "t" && @number == 9)
             number = 1
+          elsif @type == "t" && @number == 7
+            number = 5
           else
             number = @number + 1
           end

data/lib/mjai/player.rb

@@ -34,6 +34,18 @@ module Mjai
           return @reach_state == :accepted
         end
         
+        def double_reach?
+          return @double_reach
+        end
+        
+        def ippatsu_chance?
+          return @ippatsu_chance
+        end
+        
+        def rinshan?
+          return @rinshan
+        end
+        
         def update_state(action)
           
           if @game.previous_action &&
@@ -56,6 +68,9 @@ module Mjai
               @extra_anpais = nil
               @reach_state = nil
               @reach_ho_index = nil
+              @double_reach = false
+              @ippatsu_chance = false
+              @rinshan = false
             when :start_kyoku
               @tehais = action.tehais[self.id]
               @furos = []
@@ -64,6 +79,11 @@ module Mjai
               @extra_anpais = []
               @reach_state = :none
               @reach_ho_index = nil
+              @double_reach = false
+              @ippatsu_chance = false
+              @rinshan = false
+            when :chi, :pon, :daiminkan, :kakan, :ankan
+              @ippatsu_chance = false
           end
           
           if action.actor == self
@@ -75,6 +95,8 @@ module Mjai
                 @tehais.sort!()
                 @ho.push(action.pai)
                 @sutehais.push(action.pai)
+                @ippatsu_chance = false
+                @rinshan = false
                 @extra_anpais.clear() if !self.reach?
               when :chi, :pon, :daiminkan, :ankan
                 for pai in action.consumed
@@ -86,6 +108,9 @@ module Mjai
                   :consumed => action.consumed,
                   :target => action.target,
                 }))
+                if [:daiminkan, :ankan].include?(action.type)
+                  @rinshan = true
+                end
               when :kakan
                 delete_tehai(action.pai)
                 pon_index =
@@ -97,17 +122,20 @@ module Mjai
                   :consumed => @furos[pon_index].consumed + [action.pai],
                   :target => @furos[pon_index].target,
                 })
+                @rinshan = true
               when :reach
                 @reach_state = :declared
+                @double_reach = true if @game.first_turn?
               when :reach_accepted
                 @reach_state = :accepted
                 @reach_ho_index = @ho.size - 1
+                @ippatsu_chance = true
             end
           end
           
           if action.target == self
             case action.type
-              when :chi, :pon, :daiminkan, :ankan
+              when :chi, :pon, :daiminkan
                 pai = @ho.pop()
                 raise("should not happen") if pai != action.pai
             end
@@ -156,7 +184,7 @@ module Mjai
           if action.type == :tsumo && action.actor == self
             hora_type = :tsumo
             pais = @tehais
-          elsif action.type == :dahai && action.actor != self
+          elsif [:dahai, :kakan].include?(action.type) && action.actor != self
             hora_type = :ron
             pais = @tehais + [action.pai]
           else
@@ -166,7 +194,7 @@ module Mjai
           hora_action =
               create_action({:type => :hora, :target => action.actor, :pai => pais[-1]})
           return shanten_analysis.shanten == -1 &&
-              @game.get_hora(hora_action).valid? &&
+              @game.get_hora(hora_action, {:previous_action => action}).valid? &&
               (hora_type == :tsumo || !self.furiten?)
         end
         
@@ -259,9 +287,13 @@ module Mjai
         end
         
         def possible_dahais(action = @game.current_action, tehais = @tehais)
+          if self.reach? && action.type == :tsumo && action.actor == self
+            return [action.pai]
+          end
           # Excludes kuikae.
+          consumed = action.consumed ? action.consumed.sort() : nil
           if action.type == :chi && action.actor == self
-            if action.consumed[1].number == action.consumed[0].number + 1
+            if consumed[1].number == consumed[0].number + 1
               forbidden_rnums = [-1, 2]
             else
               forbidden_rnums = [1]
@@ -273,7 +305,7 @@ module Mjai
           end
           cands = tehais.uniq()
           if !forbidden_rnums.empty?
-            key_pai = action.consumed[0]
+            key_pai = consumed[0]
             return cands.select() do |pai|
               !(pai.type == key_pai.type &&
                   forbidden_rnums.any?(){ |rn| key_pai.number + rn == pai.number })

data/lib/mjai/shanten_player.rb

@@ -38,17 +38,10 @@ module Mjai
                   return create_action({:type => :dahai, :pai => action.pai, :tsumogiri => true})
                 end
                 
-                if action.type == :tsumo && self.game.num_pipais > 0
-                  for pai in self.tehais
-                    if self.tehais.select(){ |tp| tp == pai }.size >= 4
-                      return create_action({:type => :ankan, :consumed => [pai] * 4})
-                    end
-                  end
-                  pon = self.furos.find(){ |f| f.type == :pon && f.taken == action.pai }
-                  if pon
-                    return create_action(
-                        {:type => :kakan, :pai => action.pai, :consumed => [action.pai] * 3})
-                  end
+                # Ankan, kakan
+                furo_actions = self.possible_furo_actions
+                if !furo_actions.empty?
+                  return furo_actions[0]
                 end
                 
                 sutehai_cands = []

data/lib/mjai/tcp_active_game_server.rb

@@ -0,0 +1,91 @@
+require "mjai/active_game"
+require "mjai/tcp_game_server"
+require "mjai/confidence_interval"
+
+
+module Mjai
+    
+    class TCPActiveGameServer < TCPGameServer
+        
+        Statistics = Struct.new(:num_games, :total_rank, :total_score, :ranks)
+        
+        def initialize(params)
+          super
+          @name_to_stat = {}
+        end
+        
+        def num_tcp_players
+          return 4
+        end
+        
+        def play_game(players)
+          
+          if self.params[:log_dir]
+            mjson_path = "%s/%s.mjson" % [self.params[:log_dir], Time.now.strftime("%Y-%m-%d-%H%M%S")]
+          else
+            mjson_path = nil
+          end
+          
+          maybe_open(mjson_path, "w") do |mjson_out|
+            mjson_out.sync = true if mjson_out
+            game = ActiveGame.new(players)
+            game.game_type = self.params[:game_type]
+            game.on_action() do |action|
+              mjson_out.puts(action.to_json()) if mjson_out
+              game.dump_action(action)
+            end
+            success = game.play()
+            return [game, success]
+          end
+          
+        end
+        
+        def on_game_succeed(game)
+          puts("game %d: %s" % [
+              self.num_finished_games,
+              game.ranked_players.map(){ |pl| "%s:%d" % [pl.name, pl.score] }.join(" "),
+          ])
+          for player in self.players
+            @name_to_stat[player.name] ||= Statistics.new(0, 0, 0, [])
+            @name_to_stat[player.name].num_games += 1
+            @name_to_stat[player.name].total_score += player.score
+            @name_to_stat[player.name].total_rank += player.rank
+            @name_to_stat[player.name].ranks.push(player.rank)
+          end
+          names = self.players.map(){ |pl| pl.name }.sort().uniq()
+          print("Average rank:")
+          for name in names
+            stat = @name_to_stat[name]
+            rank_conf_interval = ConfidenceInterval.calculate(stat.ranks, :min => 1.0, :max => 4.0)
+            print(" %s:%.3f [%.3f, %.3f]" % [
+                name,
+                stat.total_rank.to_f() / stat.num_games,
+                rank_conf_interval[0],
+                rank_conf_interval[1],
+            ])
+          end
+          puts()
+          print("Average score:")
+          for name in names
+            print(" %s:%d" % [
+                name,
+                @name_to_stat[name].total_score.to_f() / @name_to_stat[name].num_games,
+            ])
+          end
+        end
+        
+        def on_game_fail(game)
+          puts("game %d: Ended with error" % self.num_finished_games)
+        end
+        
+        def maybe_open(path, mode, &block)
+          if path
+            open(path, mode, &block)
+          else
+            yield(nil)
+          end
+        end
+        
+    end
+    
+end

data/lib/mjai/tcp_game_server.rb

@@ -4,7 +4,6 @@ require "thread"
 require "rubygems"
 require "json"
 
-require "mjai/active_game"
 require "mjai/tcp_player"
 
 
@@ -12,21 +11,20 @@ module Mjai
     
     class TCPGameServer
         
-        Statistics = Struct.new(:num_games, :total_rank, :total_score)
-        
         def initialize(params)
           @params = params
           @server = TCPServer.open(params[:host], params[:port])
           @players = []
           @mutex = Mutex.new()
           @num_finished_games = 0
-          @name_to_stat = {}
         end
         
+        attr_reader(:params, :players, :num_finished_games)
+        
         def run()
-          puts("Listening on host %s, port %d" % [@params[:host], @params[:port]])
+          puts("Listening on host %s, port %d" % [@params[:host], self.port])
           puts("URL: %s" % self.server_url)
-          puts("Waiting for 4 players...")
+          puts("Waiting for %d players..." % self.num_tcp_players)
           @pids = []
           begin
             start_default_players()
@@ -46,11 +44,11 @@ module Mjai
                   if message["type"] == "join" && message["name"] && message["room"]
                     if message["room"] == @params[:room]
                       @mutex.synchronize() do
-                        if @players.size < 4
+                        if @players.size < self.num_tcp_players
                           @players.push(TCPPlayer.new(socket, message["name"]))
-                          puts("Waiting for %s more players..." % (4 - @players.size))
-                          if @players.size == 4
-                            Thread.new(){ play_game() }
+                          puts("Waiting for %s more players..." % (self.num_tcp_players - @players.size))
+                          if @players.size == self.num_tcp_players
+                            Thread.new(){ process_one_game() }
                           end
                         else
                           error = "The room is busy. Retry after a while."
@@ -84,26 +82,12 @@ module Mjai
           end
         end
         
-        def play_game()
-          
-          if @params[:log_dir]
-            mjson_path = "%s/%s.mjson" % [@params[:log_dir], Time.now.strftime("%Y-%m-%d-%H%M%S")]
-          else
-            mjson_path = nil
-          end
+        def process_one_game()
           
+          game = nil
           success = false
           begin
-            maybe_open(mjson_path, "w") do |mjson_out|
-              mjson_out.sync = true if mjson_out
-              @game = ActiveGame.new(@players)
-              @game.game_type = @params[:game_type]
-              @game.on_action() do |action|
-                mjson_out.puts(action.to_json()) if mjson_out
-                @game.dump_action(action)
-              end
-              success = @game.play()
-            end
+            (game, success) = play_game(@players)
           rescue => ex
             print_backtrace(ex)
           end
@@ -127,34 +111,9 @@ module Mjai
           @num_finished_games += 1
           
           if success
-            puts("game %d: %s" % [
-                @num_finished_games,
-                @game.ranked_players.map(){ |pl| "%s:%d" % [pl.name, pl.score] }.join(" "),
-            ])
-            for player in @players
-              @name_to_stat[player.name] ||= Statistics.new(0, 0, 0)
-              @name_to_stat[player.name].num_games += 1
-              @name_to_stat[player.name].total_score += player.score
-              @name_to_stat[player.name].total_rank += player.rank
-            end
-            names = @players.map(){ |pl| pl.name }.sort().uniq()
-            print("Average rank:")
-            for name in names
-              print(" %s:%.3f" % [
-                  name,
-                  @name_to_stat[name].total_rank.to_f() / @name_to_stat[name].num_games,
-              ])
-            end
-            puts()
-            print("Average score:")
-            for name in names
-              print(" %s:%d" % [
-                  name,
-                  @name_to_stat[name].total_score.to_f() / @name_to_stat[name].num_games,
-              ])
-            end
+            on_game_succeed(game)
           else
-            puts("game %d: Ended with error" % @num_finished_games)
+            on_game_fail(game)
           end
           puts()
           
@@ -165,10 +124,15 @@ module Mjai
           else
             start_default_players()
           end
+          
         end
         
         def server_url
-          return "mjsonp://localhost:%d/%s" % [@params[:port], @params[:room]]
+          return "mjsonp://localhost:%d/%s" % [self.port, @params[:room]]
+        end
+        
+        def port
+          return @server.addr[1]
         end
         
         def start_default_players()
@@ -185,14 +149,6 @@ module Mjai
           socket.puts(line)
         end
         
-        def maybe_open(path, mode, &block)
-          if path
-            open(path, mode, &block)
-          else
-            yield(nil)
-          end
-        end
-        
         def print_backtrace(ex, io = $stderr)
           io.printf("%s: %s (%p)\n", ex.backtrace[0], ex.message, ex.class)
           for s in ex.backtrace[1..-1]

data/lib/mjai/tenhou_archive.rb

@@ -1,3 +1,5 @@
+# Reference: http://tenhou.net/1/script/tenhou.js
+
 require "zlib"
 require "uri"
 require "nokogiri"
@@ -14,6 +16,23 @@ module Mjai
         
         module Util
             
+            YAKU_ID_TO_NAME = [
+              :menzenchin_tsumoho, :reach, :ippatsu, :chankan, :rinshankaiho,
+              :haiteiraoyue, :hoteiraoyui, :pinfu, :tanyaochu, :ipeko,
+              :jikaze, :jikaze, :jikaze, :jikaze,
+              :bakaze, :bakaze, :bakaze, :bakaze,
+              :sangenpai, :sangenpai, :sangenpai,
+              :double_reach, :chitoitsu, :honchantaiyao, :ikkitsukan, :sanshokudojun,
+              :sanshokudoko, :sankantsu, :toitoiho, :sananko, :shosangen, :honroto,
+              :ryanpeko, :junchantaiyao, :honiso,
+              :chiniso,
+              :renho,
+              :tenho, :chiho, :daisangen, :suanko, :suanko, :tsuiso,
+              :ryuiso, :chinroto, :churenpoton, :churenpoton, :kokushimuso,
+              :kokushimuso, :daisushi, :shosushi, :sukantsu,
+              :dora, :uradora, :akadora,
+            ]
+
             def on_tenhou_event(elem, next_elem = nil)
               verify_tenhou_tehais() if @first_kyoku_started
               case elem.name
@@ -98,7 +117,10 @@ module Mjai
                     when "2"
                       deltas = [0, 0, 0, 0]
                       deltas[actor.id] = -1000
-                      scores = elem["ten"].split(/,/).map(){ |s| s.to_i() * 100 }
+                      # Old Tenhou archive doesn't have "ten" attribute. Calculates it manually.
+                      scores = (0...4).map() do |i|
+                        self.players[i].score + deltas[i]
+                      end
                       return do_action({
                           :type => :reach_accepted,
                           :actor => actor,
@@ -112,10 +134,18 @@ module Mjai
                   tehais = (elem["hai"].split(/,/) - [elem["machi"]]).map(){ |pid| pid_to_pai(pid) }
                   points_params = get_points_params(elem["sc"])
                   (fu, hora_points, _) = elem["ten"].split(/,/).map(&:to_i)
-                  fan = elem["yaku"].split(/,/).each_slice(2).map(){ |y, f| f.to_i() }.inject(0, :+)
+                  if elem["yakuman"]
+                    fan = Hora::YAKUMAN_FAN
+                  else
+                    fan = elem["yaku"].split(/,/).each_slice(2).map(){ |y, f| f.to_i() }.inject(0, :+)
+                  end
                   uradora_markers = (elem["doraHaiUra"] || "").
                       split(/,/).map(){ |pid| pid_to_pai(pid) }
-                  # TODO Fill yaku field.
+                  yakus = elem["yaku"].
+                      split(/,/).
+                      enum_for(:each_slice, 2).
+                      map(){ |y, f| [YAKU_ID_TO_NAME[y.to_i()], f.to_i()] }.
+                      select(){ |y, f| f != 0 }
                   do_action({
                     :type => :hora,
                     :actor => self.players[elem["who"].to_i()],
@@ -125,6 +155,7 @@ module Mjai
                     :uradora_markers => uradora_markers,
                     :fu => fu,
                     :fan => fan,
+                    :yakus => yakus,
                     :hora_points => hora_points,
                     :deltas => points_params[:deltas],
                     :scores => points_params[:scores],
@@ -401,8 +432,13 @@ module Mjai
           @doc = Nokogiri.XML(@xml)
           elems = @doc.root.children
           elems.each_with_index() do |elem, j|
-            if on_tenhou_event(elem, elems[j + 1]) == :broken
-              break  # Something is wrong.
+            begin
+              if on_tenhou_event(elem, elems[j + 1]) == :broken
+                break  # Something is wrong.
+              end
+            rescue
+              $stderr.puts("While interpreting element: %s" % elem)
+              raise
             end
           end
         end

data/share/html/css/style.css

@@ -75,3 +75,7 @@
   left: 400px;
   top: 0px;
   padding: 8px; }
+
+.log-label {
+  font-family: monospace;
+  white-space: pre; }

data/share/html/css/style.scss

@@ -43,24 +43,28 @@ $player-height: $pai-height * 4 + $ho-tehai-margin;
   left: 0px;
   top: $board-width - $player-height;
   -webkit-transform: rotate(0deg);
+  transform: rotate(0deg);
 }
 
 .player-1 {
   left: ($board-width - $player-height / 2) - $board-width / 2;
   top: $board-width / 2 - $player-height / 2;
   -webkit-transform: rotate(270deg);
+  transform: rotate(270deg);
 }
 
 .player-2 {
   left: 0px;
   top: 0px;
   -webkit-transform: rotate(180deg);
+  transform: rotate(180deg);
 }
 
 .player-3 {
   left: $player-height / 2 - $board-width / 2;
   top: $board-width / 2 - $player-height / 2;
   -webkit-transform: rotate(90deg);
+  transform: rotate(90deg);
 }
 
 .wanpais-container {
@@ -104,3 +108,8 @@ $player-height: $pai-height * 4 + $ho-tehai-margin;
   top: 0px;
   padding: 8px;
 }
+
+.log-label {
+  font-family: monospace;
+  white-space: pre;
+}

data/share/html/js/archive_player.coffee

@@ -22,6 +22,7 @@ BAKAZE_TO_STR =
 kyokus = []
 currentKyokuId = 0
 currentActionId = 0
+currentViewpoint = 0
 playerInfos = [{}, {}, {}, {}]
 
 parsePai = (pai) ->
@@ -128,7 +129,6 @@ loadAction = (action) ->
     when "start_kyoku"
       kyoku =
         actions: []
-        doraMarkers: [action.dora_marker]
         bakaze: action.bakaze
         kyokuNum: action.kyoku
         honba: action.honba
@@ -136,6 +136,7 @@ loadAction = (action) ->
       prevBoard = board
       board =
         players: [{}, {}, {}, {}]
+        doraMarkers: [action.dora_marker]
       initPlayers(board)
       for i in [0...4]
         board.players[i].tehais = action.tehais[i]
@@ -198,7 +199,7 @@ loadAction = (action) ->
   
   if kyoku
     for i in [0...4]
-      if i != action.actor
+      if action.actor != undefined && i != action.actor
         ripai(board.players[i])
     if action.type != "log"
       action.board = board
@@ -265,16 +266,19 @@ renderAction = (action) ->
   #console.log(action.type, action)
   displayAction = {}
   for k, v of action
-    if k != "board"
+    if k != "board" && k != "log"
       displayAction[k] = v
   $("#action-label").text(JSON.stringify(displayAction))
+  $("#log-label").text(action.log || "")
   #dumpBoard(action.board)
   kyoku = getCurrentKyoku()
   for i in [0...4]
     player = action.board.players[i]
-    view = Dytem.players.at(i)
+    view = Dytem.players.at((i - currentViewpoint + 4) % 4)
     infoView = Dytem.playerInfos.at(i)
     infoView.score.text(player.score)
+    infoView.viewpoint.text(if i == currentViewpoint then "+" else "")
+
     if !player.tehais
       renderPais([], view.tehais)
       view.tsumoPai.hide()
@@ -311,8 +315,8 @@ renderAction = (action) ->
         renderPais(pais, furoView.pais, poses)
         --j
   wanpais = ["?", "?", "?", "?", "?", "?"]
-  for i in [0...kyoku.doraMarkers.length]
-    wanpais[i + 2] = kyoku.doraMarkers[i]
+  for i in [0...action.board.doraMarkers.length]
+    wanpais[i + 2] = action.board.doraMarkers[i]
   renderPais(wanpais, Dytem.wanpais)
 
 getCurrentKyoku = ->
@@ -353,7 +357,11 @@ $ ->
     currentKyokuId = parseInt($("#kyokuSelector").val())
     currentActionId = 0
     renderCurrentAction()
-  
+
+  $("#viewpoint-button").click ->
+    currentViewpoint = (currentViewpoint + 1) % 4
+    renderCurrentAction()
+
   for action in allActions
     loadAction(action)
 

data/share/html/js/archive_player.js

@@ -1,4 +1,4 @@
-var BAKAZE_TO_STR, TSUPAIS, TSUPAI_TO_IMAGE_NAME, cloneBoard, comparePais, currentActionId, currentKyokuId, deleteTehai, dumpBoard, getCurrentKyoku, goBack, goNext, initPlayers, kyokus, loadAction, paiToImageUrl, parsePai, playerInfos, removeRed, renderAction, renderCurrentAction, renderHo, renderPai, renderPais, ripai, sortPais, _base, _base2;
+var BAKAZE_TO_STR, TSUPAIS, TSUPAI_TO_IMAGE_NAME, cloneBoard, comparePais, currentActionId, currentKyokuId, currentViewpoint, deleteTehai, dumpBoard, getCurrentKyoku, goBack, goNext, initPlayers, kyokus, loadAction, paiToImageUrl, parsePai, playerInfos, removeRed, renderAction, renderCurrentAction, renderHo, renderPai, renderPais, ripai, sortPais, _base, _base2;
 
 window.console || (window.console = {});
 
@@ -31,6 +31,8 @@ currentKyokuId = 0;
 
 currentActionId = 0;
 
+currentViewpoint = 0;
+
 playerInfos = [{}, {}, {}, {}];
 
 parsePai = function(pai) {
@@ -169,7 +171,6 @@ loadAction = function(action) {
     case "start_kyoku":
       kyoku = {
         actions: [],
-        doraMarkers: [action.dora_marker],
         bakaze: action.bakaze,
         kyokuNum: action.kyoku,
         honba: action.honba
@@ -177,7 +178,8 @@ loadAction = function(action) {
       kyokus.push(kyoku);
       prevBoard = board;
       board = {
-        players: [{}, {}, {}, {}]
+        players: [{}, {}, {}, {}],
+        doraMarkers: [action.dora_marker]
       };
       initPlayers(board);
       for (i = 0; i < 4; i++) {
@@ -271,7 +273,7 @@ loadAction = function(action) {
   }
   if (kyoku) {
     for (i = 0; i < 4; i++) {
-      if (i !== action.actor) ripai(board.players[i]);
+      if (action.actor !== void 0 && i !== action.actor) ripai(board.players[i]);
     }
     if (action.type !== "log") {
       action.board = board;
@@ -378,15 +380,17 @@ renderAction = function(action) {
   displayAction = {};
   for (k in action) {
     v = action[k];
-    if (k !== "board") displayAction[k] = v;
+    if (k !== "board" && k !== "log") displayAction[k] = v;
   }
   $("#action-label").text(JSON.stringify(displayAction));
+  $("#log-label").text(action.log || "");
   kyoku = getCurrentKyoku();
   for (i = 0; i < 4; i++) {
     player = action.board.players[i];
-    view = Dytem.players.at(i);
+    view = Dytem.players.at((i - currentViewpoint + 4) % 4);
     infoView = Dytem.playerInfos.at(i);
     infoView.score.text(player.score);
+    infoView.viewpoint.text(i === currentViewpoint ? "+" : "");
     if (!player.tehais) {
       renderPais([], view.tehais);
       view.tsumoPai.hide();
@@ -429,8 +433,8 @@ renderAction = function(action) {
     }
   }
   wanpais = ["?", "?", "?", "?", "?", "?"];
-  for (i = 0, _ref4 = kyoku.doraMarkers.length; 0 <= _ref4 ? i < _ref4 : i > _ref4; 0 <= _ref4 ? i++ : i--) {
-    wanpais[i + 2] = kyoku.doraMarkers[i];
+  for (i = 0, _ref4 = action.board.doraMarkers.length; 0 <= _ref4 ? i < _ref4 : i > _ref4; 0 <= _ref4 ? i++ : i--) {
+    wanpais[i + 2] = action.board.doraMarkers[i];
   }
   return renderPais(wanpais, Dytem.wanpais);
 };
@@ -478,6 +482,10 @@ $(function() {
     currentActionId = 0;
     return renderCurrentAction();
   });
+  $("#viewpoint-button").click(function() {
+    currentViewpoint = (currentViewpoint + 1) % 4;
+    return renderCurrentAction();
+  });
   for (_i = 0, _len = allActions.length; _i < _len; _i++) {
     action = allActions[_i];
     loadAction(action);

data/share/html/views/archive_player.erb

@@ -45,17 +45,25 @@
     <div>
       <button id="prev-button">Prev</button>
       <button id="next-button">Next</button>
-      <input id="action-id-label" type="text" size="3">
+      <input id="action-id-label" type="text" size="3" value="0">
       <button id="go-button">Go</button>
     </div>
     <table border="0">
+      <tr>
+        <th>#</th>
+        <th>Name</th>
+        <th>Score</th>
+        <th><button id="viewpoint-button">Viewpoint</button></th>
+      </tr>
       <tr id="playerInfos" class="repeated">
         <td id="playerInfos.index"></td>
         <td id="playerInfos.name"></td>
         <td id="playerInfos.score"></td>
+        <td id="playerInfos.viewpoint"></td>
       </tr>
     </table>
     <div id="action-label"></div>
+    <div id="log-label" class="log-label"></div>
   </div>
   
 </body></html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mjai
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &76710820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *76710820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &76710120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +37,44 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *76710120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &76709680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *76709680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Game server for Japanese Mahjong AI.
 email:
 - gimite+github@gmail.com
@@ -62,6 +93,7 @@ files:
 - lib/mjai/active_game.rb
 - lib/mjai/tcp_game_server.rb
 - lib/mjai/mentsu.rb
+- lib/mjai/tcp_active_game_server.rb
 - lib/mjai/puppet_player.rb
 - lib/mjai/action.rb
 - lib/mjai/shanten_player.rb
@@ -70,6 +102,7 @@ files:
 - lib/mjai/validation_error.rb
 - lib/mjai/hora.rb
 - lib/mjai/with_fields.rb
+- lib/mjai/confidence_interval.rb
 - lib/mjai/tcp_client_game.rb
 - lib/mjai/game.rb
 - lib/mjai/tcp_player.rb
@@ -428,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Game server for Japanese Mahjong AI.