Skip to content

refactor: optimize performance for hand calculations #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Apricot-S merged 6 commits into from
Feb 6, 2026
Merged

refactor: optimize performance for hand calculations #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
97cfe02
refactor: optimize performance for hand
Nihisil Feb 5, 2026
29b16f8
add missed tests and minor refactoring
Nihisil Feb 6, 2026
837d551
refactor iipeiko
Nihisil Feb 6, 2026
9ee76a7
refactor ryanpeiko
Nihisil Feb 6, 2026
364dbea
update aka dora list
Nihisil Feb 6, 2026
64663d6
fix linters
Nihisil Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
197 changes: 118 additions & 79 deletions mahjong/hand_calculating/hand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
from collections.abc import Collection

from mahjong.agari import Agari
from mahjong.constants import CHUN, FIVE_RED_MAN, FIVE_RED_PIN, FIVE_RED_SOU, HAKU, HATSU
from mahjong.constants import AKA_DORA_LIST, CHUN, HAKU, HATSU
from mahjong.hand_calculating.divider import HandDivider
from mahjong.hand_calculating.fu import FuCalculator
from mahjong.hand_calculating.hand_config import HandConfig
from mahjong.hand_calculating.hand_response import HandResponse
from mahjong.hand_calculating.scores import Aotenjou, ScoresCalculator
from mahjong.meld import Meld
from mahjong.tile import TilesConverter
from mahjong.utils import build_dora_count_map, count_dora_for_hand, is_chi, is_kan, is_pon, plus_dora
from mahjong.utils import build_dora_count_map, classify_hand_suits, count_dora_for_hand, plus_dora

# suit bitmask: sou=1, pin=2, man=4
_ALL_SUITS_MASK = 7

_DEFAULT_CONFIG = HandConfig()

Expand Down Expand Up @@ -168,18 +171,50 @@ def estimate_hand_value(

precomputed_aka_dora = 0
if config.options.has_aka_dora:
precomputed_aka_dora = tiles.count(FIVE_RED_MAN) + tiles.count(FIVE_RED_PIN) + tiles.count(FIVE_RED_SOU)
precomputed_aka_dora = sum(t in AKA_DORA_LIST for t in tiles)

precomputed_ura_dora = 0
if config.is_riichi or config.is_daburu_riichi:
ura_count_map = build_dora_count_map(ura_dora_indicators)
precomputed_ura_dora = count_dora_for_hand(tiles_34, ura_count_map)

yakuhai_seat_wind_yaku = (
config.yaku.seat_wind_east,
config.yaku.seat_wind_south,
config.yaku.seat_wind_west,
config.yaku.seat_wind_north,
)
yakuhai_round_wind_yaku = (
config.yaku.round_wind_east,
config.yaku.round_wind_south,
config.yaku.round_wind_west,
config.yaku.round_wind_north,
)

calculated_hands = []
for hand in hand_options:
is_chiitoitsu = config.yaku.chiitoitsu.is_condition_met(hand)
valued_tiles = [HAKU, HATSU, CHUN, config.player_wind, config.round_wind]

# precompute hand-level properties (invariant across win groups)
# classify sets in single pass: chi (sequential), pon (triplet), kan (quad)
chi_sets: list[list[int]] = []
pon_sets: list[list[int]] = []
kan_sets: list[list[int]] = []
for x in hand:
length = len(x)
if length == 4:
kan_sets.append(x)
elif length == 3:
if x[0] == x[1]:
pon_sets.append(x)
else:
chi_sets.append(x)

is_tanyao_hand = config.yaku.tanyao.is_condition_met(hand)
suit_mask, honor_count = classify_hand_suits(hand)
has_honors = honor_count > 0

win_groups = HandCalculator._find_win_groups(win_tile, hand, opened_melds)
for win_group in win_groups:
cost = None
Expand All @@ -191,10 +226,6 @@ def estimate_hand_value(

is_pinfu = len(fu_details) == 1 and not is_chiitoitsu and not is_open_hand

pon_sets = [x for x in hand if is_pon(x)]
kan_sets = [x for x in hand if is_kan(x)]
chi_sets = [x for x in hand if is_chi(x)]

if config.is_tsumo and not is_open_hand:
hand_yaku.append(config.yaku.tsumo)

Expand All @@ -216,7 +247,7 @@ def estimate_hand_value(
if config.options.has_daichisei and config.yaku.daichisei.is_condition_met(hand):
hand_yaku.append(config.yaku.daichisei)

if (not is_open_hand or config.options.has_open_tanyao) and config.yaku.tanyao.is_condition_met(hand):
if (not is_open_hand or config.options.has_open_tanyao) and is_tanyao_hand:
hand_yaku.append(config.yaku.tanyao)

if config.is_riichi and not config.is_daburu_riichi:
Expand Down Expand Up @@ -273,14 +304,15 @@ def estimate_hand_value(

# tsuisou, honroto, chinroto require no chi sets (chi involves suited middle tiles)
if not chi_sets:
if config.yaku.tsuisou.is_condition_met(hand):
if has_honors and config.yaku.tsuisou.is_condition_met(hand):
hand_yaku.append(config.yaku.tsuisou)

if config.yaku.honroto.is_condition_met(hand):
hand_yaku.append(config.yaku.honroto)
if not is_tanyao_hand:
if config.yaku.honroto.is_condition_met(hand):
hand_yaku.append(config.yaku.honroto)

if config.yaku.chinroto.is_condition_met(hand):
hand_yaku.append(config.yaku.chinroto)
if not has_honors and config.yaku.chinroto.is_condition_met(hand):
hand_yaku.append(config.yaku.chinroto)

if config.yaku.ryuisou.is_condition_met(hand):
hand_yaku.append(config.yaku.ryuisou)
Expand All @@ -292,22 +324,25 @@ def estimate_hand_value(

# small optimization, try to detect yaku with chi required sets only if we have chi sets in hand
if chi_sets:
if config.yaku.chantai.is_condition_met(hand):
hand_yaku.append(config.yaku.chantai)
# chantai, junchan, ittsu require terminals, impossible with tanyao
if not is_tanyao_hand:
if config.yaku.chantai.is_condition_met(hand):
hand_yaku.append(config.yaku.chantai)

if config.yaku.junchan.is_condition_met(hand):
hand_yaku.append(config.yaku.junchan)
if config.yaku.junchan.is_condition_met(hand):
hand_yaku.append(config.yaku.junchan)

if config.yaku.ittsu.is_condition_met(hand):
hand_yaku.append(config.yaku.ittsu)
if config.yaku.ittsu.is_condition_met(hand):
hand_yaku.append(config.yaku.ittsu)

if not is_open_hand:
if config.yaku.ryanpeiko.is_condition_met(hand):
hand_yaku.append(config.yaku.ryanpeiko)
elif config.yaku.iipeiko.is_condition_met(hand):
hand_yaku.append(config.yaku.iipeiko)

if config.yaku.sanshoku.is_condition_met(hand):
# sanshoku requires same sequence in all 3 suits
if suit_mask == _ALL_SUITS_MASK and config.yaku.sanshoku.is_condition_met(hand):
hand_yaku.append(config.yaku.sanshoku)

# small optimization, try to detect yaku with pon required sets only if we have pon sets in hand
Expand All @@ -318,52 +353,43 @@ def estimate_hand_value(
if config.yaku.sanankou.is_condition_met(hand, win_tile, melds, config.is_tsumo):
hand_yaku.append(config.yaku.sanankou)

if config.yaku.sanshoku_douko.is_condition_met(hand):
# sanshoku douko requires same triplet in all 3 suits
if suit_mask == _ALL_SUITS_MASK and config.yaku.sanshoku_douko.is_condition_met(hand):
hand_yaku.append(config.yaku.sanshoku_douko)

if config.yaku.shosangen.is_condition_met(hand):
hand_yaku.append(config.yaku.shosangen)

if config.yaku.haku.is_condition_met(hand):
hand_yaku.append(config.yaku.haku)

if config.yaku.hatsu.is_condition_met(hand):
hand_yaku.append(config.yaku.hatsu)

if config.yaku.chun.is_condition_met(hand):
hand_yaku.append(config.yaku.chun)

yakuhai_seat_wind_yaku = {
config.yaku.seat_wind_east,
config.yaku.seat_wind_south,
config.yaku.seat_wind_west,
config.yaku.seat_wind_north,
}
for yaku in yakuhai_seat_wind_yaku:
if yaku.is_condition_met(hand, config.player_wind):
hand_yaku.append(yaku)

yakuhai_round_wind_yaku = {
config.yaku.round_wind_east,
config.yaku.round_wind_south,
config.yaku.round_wind_west,
config.yaku.round_wind_north,
}
for yaku in yakuhai_round_wind_yaku:
if yaku.is_condition_met(hand, config.round_wind):
hand_yaku.append(yaku)

if config.yaku.daisangen.is_condition_met(hand):
hand_yaku.append(config.yaku.daisangen)

if config.yaku.shosuushi.is_condition_met(hand):
hand_yaku.append(config.yaku.shosuushi)

if config.yaku.daisuushi.is_condition_met(hand):
hand_yaku.append(config.yaku.daisuushi)

# closed kan can't be used in chuuren_poutou
if not melds and config.yaku.chuuren_poutou.is_condition_met(hand):
# yakuhai, dragon, and wind yaku all require honor tiles
if has_honors:
if config.yaku.shosangen.is_condition_met(hand):
hand_yaku.append(config.yaku.shosangen)

if config.yaku.haku.is_condition_met(hand):
hand_yaku.append(config.yaku.haku)

if config.yaku.hatsu.is_condition_met(hand):
hand_yaku.append(config.yaku.hatsu)

if config.yaku.chun.is_condition_met(hand):
hand_yaku.append(config.yaku.chun)

for yaku in yakuhai_seat_wind_yaku:
if yaku.is_condition_met(hand, config.player_wind):
hand_yaku.append(yaku)

for yaku in yakuhai_round_wind_yaku:
if yaku.is_condition_met(hand, config.round_wind):
hand_yaku.append(yaku)

if config.yaku.daisangen.is_condition_met(hand):
hand_yaku.append(config.yaku.daisangen)

if config.yaku.shosuushi.is_condition_met(hand):
hand_yaku.append(config.yaku.shosuushi)

if config.yaku.daisuushi.is_condition_met(hand):
hand_yaku.append(config.yaku.daisuushi)

# closed kan can't be used in chuuren_poutou; requires terminals
if not melds and not is_tanyao_hand and config.yaku.chuuren_poutou.is_condition_met(hand):
if tiles_34[win_tile // 4] == 2 or tiles_34[win_tile // 4] == 4:
hand_yaku.append(config.yaku.daburu_chuuren_poutou)
else:
Expand Down Expand Up @@ -532,20 +558,33 @@ def estimate_hand_value(
@staticmethod
def _find_win_groups(win_tile: int, hand: list[list[int]], opened_melds: list[list[int]]) -> list[list[int]]:
win_tile_34 = (win_tile or 0) // 4
_opened_melds = opened_melds[:]

# to detect win groups
# we had to use only closed sets
closed_set_items = []
# track which opened melds have been matched using a consumed flags array
consumed = [False] * len(opened_melds)

# collect closed sets and find unique win groups in a single pass
seen: set[tuple[int, ...]] = set()
win_groups: list[list[int]] = []
for x in hand:
if x not in _opened_melds:
closed_set_items.append(x)
else:
_opened_melds.remove(x)

# for forms like 45666 and ron on 6
# we can assume that ron was on 456 form and on 66 form
# and depends on form we will have different hand cost
# so, we had to check all possible win groups
win_groups = [x for x in closed_set_items if win_tile_34 in x]
return [list(x) for x in {tuple(x) for x in win_groups}]
# check if this set matches an unconsumed opened meld
is_opened_meld = False
for i, meld in enumerate(opened_melds):
if not consumed[i] and x == meld:
consumed[i] = True
is_opened_meld = True
break

if is_opened_meld:
continue

# for forms like 45666 and ron on 6
# we can assume that ron was on 456 form and on 66 form
# and depends on form we will have different hand cost
# so, we check all possible win groups
if win_tile_34 in x:
key = tuple(x)
if key not in seen:
seen.add(key)
win_groups.append(x)

return win_groups
18 changes: 8 additions & 10 deletions mahjong/hand_calculating/yaku_list/iipeiko.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ class Iipeiko(Yaku):
han_closed = 1

def is_condition_met(self, hand: Collection[Sequence[int]], *args) -> bool:
chi_sets = [i for i in hand if is_chi(i)]
# count occurrences of each chi set (first tile uniquely identifies a chi)
chi_counts: dict[int, int] = {}
for item in hand:
if is_chi(item):
key = item[0]
chi_counts[key] = chi_counts.get(key, 0) + 1

count_of_identical_chi = 0
for x in chi_sets:
count = 0
for y in chi_sets:
if x == y:
count += 1
count_of_identical_chi = max(count_of_identical_chi, count)

return count_of_identical_chi >= 2
# iipeiko requires at least one pair of identical chi
return any(count >= 2 for count in chi_counts.values())
19 changes: 10 additions & 9 deletions mahjong/hand_calculating/yaku_list/ryanpeiko.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ class Ryanpeikou(Yaku):
han_closed = 3

def is_condition_met(self, hand: Collection[Sequence[int]], *args) -> bool:
chi_sets = [i for i in hand if is_chi(i)]
count_of_identical_chi = []
for x in chi_sets:
count = 0
for y in chi_sets:
if x == y:
count += 1
count_of_identical_chi.append(count)
# count occurrences of each chi set (first tile uniquely identifies a chi)
chi_counts: dict[int, int] = {}
for item in hand:
if is_chi(item):
key = item[0]
chi_counts[key] = chi_counts.get(key, 0) + 1

return len([x for x in count_of_identical_chi if x >= 2]) == 4
# ryanpeiko requires 4 chi that form 2 pairs
# count pairs: each pair of identical chi contributes 1, 4 identical chi contributes 2
total_pairs = sum(count // 2 for count in chi_counts.values())
return total_pairs >= 2
55 changes: 27 additions & 28 deletions mahjong/hand_calculating/yaku_list/sanankou.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,30 @@ def is_condition_met(
melds: Collection[Meld],
is_tsumo: bool,
) -> bool:
"""
Three closed pon sets, the other sets need not to be closed
:param hand: list of hand's sets
:param win_tile: 136 tiles format
:param melds: list Meld objects
:param is_tsumo:
:return: true|false
"""
win_tile //= 4

open_sets = [x.tiles_34 for x in melds if x.opened]

chi_sets = [x for x in hand if (is_chi(x) and win_tile in x and x not in open_sets)]
pon_sets = [x for x in hand if is_pon_or_kan(x)]

closed_pon_sets = []
for item in pon_sets:
if item in open_sets:
continue

# if we do the ron on syanpon wait our pon will be consider as open
# and it is not 789999 set
if win_tile in item and not is_tsumo and not chi_sets:
continue

closed_pon_sets.append(item)

return len(closed_pon_sets) == 3
win_tile_34 = win_tile // 4

open_sets: set[tuple[int, ...]] = set()
for m in melds:
if m.opened:
open_sets.add(tuple(m.tiles_34))

has_chi_with_win_tile = False
closed_pon_count = 0

for item in hand:
item_tuple = tuple(item)

if is_pon_or_kan(item):
if item_tuple not in open_sets:
closed_pon_count += 1
elif is_chi(item) and win_tile_34 in item and item_tuple not in open_sets:
has_chi_with_win_tile = True

# if ron on syanpon wait and no closed chi with win tile, that pon is considered open
if not is_tsumo and not has_chi_with_win_tile:
for item in hand:
if is_pon_or_kan(item) and item[0] == win_tile_34 and tuple(item) not in open_sets:
closed_pon_count -= 1
break

return closed_pon_count == 3
Loading