mjai 0.0.5 → 0.0.6

data/lib/mjai/active_game.rb

@@ -62,7 +62,7 @@ module Mjai
               mota()
               @actor = @players[(@actor.id + 1) % 4]
             end
-            process_ryukyoku()
+            process_fanpai()
           end
           do_action({:type => :end_kyoku})
         end
@@ -78,6 +78,10 @@ module Mjai
               # actions.size >= 2 in case of double/triple ron
               process_hora(actions)
               throw(:end_kyoku)
+            elsif actions[0].type == :ryukyoku
+              raise("should not happen") if actions.size != 1
+              process_kyushukyuhai(actions[0].actor)
+              throw(:end_kyoku)
             else
               raise("should not happen") if actions.size != 1
               action = actions[0]
@@ -178,7 +182,28 @@ module Mjai
           update_oya(actions.any?(){ |a| a.actor == self.oya }, false)
         end
         
-        def process_ryukyoku()
+        def process_kyushukyuhai(actor)
+          tehais = []
+          for player in players
+            if player == actor
+              tehais.push(player.tehais)
+            else
+              tehais.push([Pai::UNKNOWN] * player.tehais.size)
+            end
+          end
+          do_action({
+              :type => :ryukyoku,
+              :actor => actor,
+              :reason => :kyushukyuhai,
+              :tenpais => [false, false, false, false],
+              :tehais => tehais,
+              :deltas => [0, 0, 0, 0],
+              :scores => players.map(){ |player| player.score }
+          })
+          update_oya(true, true)
+        end
+        
+        def process_fanpai()
           tenpais = []
           tehais = []
           for player in players

data/lib/mjai/game.rb

@@ -157,6 +157,15 @@ module Mjai
               else
                 return action
               end
+            when :reach
+              if action.actor == player
+                return action.merge({
+                    :cannot_dahai =>
+                        with_response_hint ? (player.tehais.uniq() - player.possible_dahais) : nil,
+                })
+              else
+                return action
+              end
             else
               return action
           end
@@ -191,7 +200,7 @@ module Mjai
               when :tsumo
                 if is_actor
                   valid = response &&
-                      [:dahai, :reach, :ankan, :kakan, :hora].include?(response.type)
+                      [:dahai, :reach, :ankan, :kakan, :hora, :ryukyoku].include?(response.type)
                 else
                   valid = !response
                 end
@@ -306,6 +315,11 @@ module Mjai
               end
               validate(response.actor.can_hora?, "Cannot hora.")
             
+            when :ryukyoku
+              validate_fields_exist(response, [:reason])
+              validate(response.reason == :kyushukyuhai, "reason must be kyushukyuhai.")
+              validate(response.actor.can_ryukyoku?, "Cannot ryukyoku.")
+            
           end
           
         end

data/lib/mjai/game_stats.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require "mjai/archive"
 require "mjai/confidence_interval"
 
@@ -6,32 +8,135 @@ module Mjai
 
     class GameStats
 
+        YAKU_JA_NAMES = {
+          :menzenchin_tsumoho => "面前清自摸和", :reach => "立直", :ippatsu => "一発",
+          :chankan => "槍槓", :rinshankaiho => "嶺上開花", :haiteiraoyue => "海底摸月",
+          :hoteiraoyui => "河底撈魚", :pinfu => "平和", :tanyaochu => "断么九",
+          :ipeko => "一盃口", :jikaze => "面風牌", :bakaze => "圏風牌",
+          :sangenpai => "三元牌", :double_reach => "ダブル立直", :chitoitsu => "七対子",
+          :honchantaiyao => "混全帯么九", :ikkitsukan => "一気通貫",
+          :sanshokudojun => "三色同順", :sanshokudoko => "三色同刻", :sankantsu => "三槓子",
+          :toitoiho => "対々和", :sananko => "三暗刻", :shosangen => "小三元",
+          :honroto => "混老頭", :ryanpeko => "二盃口", :junchantaiyao => "純全帯么九",
+          :honiso => "混一色", :chiniso => "清一色", :renho => "人和", :tenho => "天和",
+          :chiho => "地和", :daisangen => "大三元", :suanko => "四暗刻",
+          :tsuiso => "字一色", :ryuiso => "緑一色", :chinroto => "清老頭",
+          :churenpoton => "九蓮宝燈", :kokushimuso => "国士無双",
+          :daisushi => "大四喜", :shosushi => "小四喜", :sukantsu => "四槓子",
+          :dora => "ドラ", :uradora => "裏ドラ", :akadora => "赤ドラ",
+        }
+
         def self.print(mjson_paths)
+
           num_errors = 0
           name_to_ranks = {}
+          name_to_scores = {}
+          name_to_kyoku_count = {}
+          name_to_hora_count = {}
+          name_to_yaku_stats = {}
+          name_to_dora_stats = {}
+          name_to_hoju_count = {}
+          name_to_furo_kyoku_count = {}
+          name_to_reach_count = {}
+          name_to_hora_points = {}
+
           for path in mjson_paths
+
             archive = Archive.load(path)
             first_action = archive.raw_actions[0]
             last_action = archive.raw_actions[-1]
-            archive.do_action(first_action)
-            if last_action.type != :end_game
+            if !last_action || last_action.type != :end_game
               num_errors += 1
               next
             end
+            archive.do_action(first_action)
+
+            scores = last_action.scores
+            id_to_name = first_action.names
+
             chicha_id = archive.raw_actions[1].oya.id
             ranked_player_ids =
-                (0...4).sort_by(){ |i| [-last_action.scores[i], (i + 4 - chicha_id) % 4] }
+                (0...4).sort_by(){ |i| [-scores[i], (i + 4 - chicha_id) % 4] }
             for r in 0...4
-              name = first_action.names[ranked_player_ids[r]]
+              name = id_to_name[ranked_player_ids[r]]
               name_to_ranks[name] ||= []
               name_to_ranks[name].push(r + 1)
             end
+
+            for p in 0...4
+              name = id_to_name[p]
+              name_to_scores[name] ||= []
+              name_to_scores[name].push(scores[p])
+            end
+
+            # Kyoku specific fields.
+            id_to_done_reach = {}
+            id_to_done_furo = {}
+            for raw_action in archive.raw_actions
+              if raw_action.type == :hora
+                name = id_to_name[raw_action.actor.id]
+                name_to_hora_count[name] ||= 0
+                name_to_hora_count[name] += 1
+                name_to_hora_points[name] ||= []
+                name_to_hora_points[name].push(raw_action.hora_points)
+                for yaku, fan in raw_action.yakus
+                  if yaku == :dora || yaku == :akadora || yaku == :uradora
+                    name_to_dora_stats[name] ||= {}
+                    name_to_dora_stats[name][yaku] ||= 0
+                    name_to_dora_stats[name][yaku] += fan
+                    next
+                  end
+                  name_to_yaku_stats[name] ||= {}
+                  name_to_yaku_stats[name][yaku] ||= 0
+                  name_to_yaku_stats[name][yaku] += 1
+                end
+                if raw_action.actor.id != raw_action.target.id
+                  target_name = id_to_name[raw_action.target.id]
+                  name_to_hoju_count[target_name] ||= 0
+                  name_to_hoju_count[target_name] += 1
+                end
+              end
+              if raw_action.type == :reach_accepted
+                id_to_done_reach[raw_action.actor.id] = true
+              end
+              if raw_action.type == :pon
+                id_to_done_furo[raw_action.actor.id] = true
+              end
+              if raw_action.type == :chi
+                id_to_done_furo[raw_action.actor.id] = true
+              end
+              if raw_action.type == :daiminkan
+                id_to_done_furo[raw_action.actor.id] = true
+              end
+              if raw_action.type == :end_kyoku
+                for p in 0...4
+                  name = id_to_name[p]
+
+                  if id_to_done_furo[p]
+                    name_to_furo_kyoku_count[name] ||= 0
+                    name_to_furo_kyoku_count[name] += 1
+                  end
+                  if id_to_done_reach[p]
+                    name_to_reach_count[name] ||= 0
+                    name_to_reach_count[name] += 1
+                  end
+                  
+                  name_to_kyoku_count[name] ||= 0
+                  name_to_kyoku_count[name] += 1
+                end
+
+                # Reset kyoku specific fields.
+                id_to_done_furo = {}
+                id_to_done_reach = {}
+              end
+            end
           end
           if num_errors > 0
             puts("errors: %d / %d" % [num_errors, mjson_paths.size])
           end
-          puts("ranks:")
-          for name, ranks in name_to_ranks
+
+          puts("Ranks:")
+          for name, ranks in name_to_ranks.sort
             rank_conf_interval = ConfidenceInterval.calculate(ranks, :min => 1.0, :max => 4.0)
             puts("  %s: %.3f [%.3f, %.3f]" % [
                 name,
@@ -40,8 +145,77 @@ module Mjai
                 rank_conf_interval[1],
             ])
           end
-        end
 
+          puts("Scores:")
+          for name, scores in name_to_scores.sort
+            puts("  %s: %d" % [
+                name,
+                scores.inject(0, :+).to_i() / scores.size,
+            ])
+          end
+
+          puts("Hora rates:")
+          for name, hora_count in name_to_hora_count.sort
+            puts("  %s: %.1f%%" % [
+                name,
+                100.0 * hora_count / name_to_kyoku_count[name]
+            ])
+          end
+
+          puts("Hoju rates:")
+          for name, hoju_count in name_to_hoju_count.sort
+            puts("  %s: %.1f%%" % [
+                name,
+                100.0 * hoju_count / name_to_kyoku_count[name]
+            ])
+          end
+
+          puts("Furo rates:")
+          for name, furo_kyoku_count in name_to_furo_kyoku_count.sort
+            puts("  %s: %.1f%%" % [
+                name,
+                100.0 * furo_kyoku_count / name_to_kyoku_count[name]
+            ])
+          end
+
+          puts("Reach rates:")
+          for name, reach_count in name_to_reach_count.sort
+            puts("  %s: %.1f%%" % [
+                name,
+                100.0 * reach_count / name_to_kyoku_count[name]
+            ])
+          end
+
+          puts("Average hora points:")
+          for name, hora_points in name_to_hora_points.sort
+            puts("  %s: %d" % [
+                name,
+                hora_points.inject(0, :+).to_i() / hora_points.size,
+            ])
+          end
+
+          puts("Yaku stats:")
+          for name, yaku_stats in name_to_yaku_stats.sort
+            hora_count = name_to_hora_count[name]
+            puts("  %s (%d horas):" % [name, hora_count])
+            for yaku, count in yaku_stats.sort_by{|yaku, count| -count}
+              yaku_name = YAKU_JA_NAMES[yaku]
+              puts("    %s: %d (%.1f%%)" % [yaku_name, count, 100.0 * count / hora_count])
+            end
+          end
+
+          puts("Dora stats:")
+          for name, dora_stats in name_to_dora_stats.sort
+            hora_count = name_to_hora_count[name]
+            puts("  %s (%d horas):" % [name, hora_count])
+            for dora, count in dora_stats.sort_by{|dora, count| -count}
+              dora_name = YAKU_JA_NAMES[dora]
+              puts("    %s: %d (%.3f/hora)" % [dora_name, count, count.to_f() / hora_count])
+            end
+          end
+
+        end
+        
     end
 
 end

data/lib/mjai/player.rb

@@ -192,7 +192,14 @@ module Mjai
               @game.get_hora(hora_action, {:previous_action => action}).valid? &&
               (hora_type == :tsumo || !self.furiten?)
         end
-
+        
+        def can_ryukyoku?
+          return @game.current_action.type == :tsumo &&
+              @game.current_action.actor == self &&
+              @game.first_turn? &&
+              @tehais.select(){ |pai| pai.yaochu? }.uniq().size >= 9
+        end
+        
         # Possible actions except for dahai.
         def possible_actions
           action = @game.current_action
@@ -209,6 +216,9 @@ module Mjai
             if can_reach?
               result.push(create_action({:type => :reach}))
             end
+            if can_ryukyoku?
+              result.push(create_action({:type => :ryukyoku, :reason => :kyushukyuhai}))
+            end
           end
           result += self.possible_furo_actions
           return result

data/lib/mjai/tcp_game_server.rb

@@ -40,7 +40,7 @@ module Mjai
                   send(socket, {
                       "type" => "hello",
                       "protocol" => "mjsonp",
-                      "protocol_version" => 2,
+                      "protocol_version" => 3,
                   })
                   line = socket.gets()
                   if !line

data/lib/mjai/tenhou_archive.rb

@@ -170,7 +170,7 @@ module Mjai
                   })
                   if elem["owari"]
                     do_action({:type => :end_kyoku})
-                    do_action({:type => :end_game})
+                    do_action({:type => :end_game, :scores => points_params[:scores]})
                   end
                   return nil
                 when "RYUUKYOKU"
@@ -209,7 +209,7 @@ module Mjai
                   })
                   if elem["owari"]
                     do_action({:type => :end_kyoku})
-                    do_action({:type => :end_game})
+                    do_action({:type => :end_game, :scores => points_params[:scores]})
                   end
                   return nil
                 when "N"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mjai
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json