wsy182/mjAi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wsy182:54a9161c0a36068f1473fb673a914f25af45fa91
Branches Tags
wsy182:main wsy182:dev
...
compare: wsy182:211189a7767f342ab55ed0fd5f0cd96570a1bbb3
Branches Tags
wsy182:main wsy182:dev

4 Commits
54a9161c0a ... 211189a776

Author SHA1 Message Date
wsy182
211189a776 Update test_calculate_fan.py 2024-11-30 16:57:29 +08:00
wsy182
4e563ae946 Update calculate_fan.py 2024-11-30 16:55:56 +08:00
wsy182
066436b4e5 Update calculate_fan.py 2024-11-30 16:53:47 +08:00
wsy182
705afd596b Update calculate_fan.py 2024-11-30 16:52:18 +08:00
2 changed files with 12 additions and 9 deletions
Expand all files Collapse all files

19
src/engine/calculate_fan.py
View File

@@ -36,17 +36,20 @@ def calculate_fan(hand, melds, is_self_draw, is_cleared, conditions):
"is_tian_hu": lambda: 12 if conditions.get("is_tian_hu", False) else 0, "is_tian_hu": lambda: 12 if conditions.get("is_tian_hu", False) else 0,
"is_di_hu": lambda: 12 if conditions.get("is_di_hu", False) else 0, "is_di_hu": lambda: 12 if conditions.get("is_di_hu", False) else 0,
"basic_win": lambda: 1 if not (conditions.get("is_seven_pairs", False) or "basic_win": lambda: 1 if not (conditions.get("is_seven_pairs", False) or
conditions.get("is_big_pairs", False) or conditions.get("is_big_pairs", False) or
conditions.get("is_dragon_seven_pairs", False) or conditions.get("is_dragon_seven_pairs", False) or
conditions.get("is_pure_cleared", False) or conditions.get("is_pure_cleared", False) or
conditions.get("is_double_pure_cleared", False) or conditions.get("is_double_pure_cleared", False) or
conditions.get("is_small_pairs", False) or conditions.get("is_small_pairs", False) or
conditions.get("is_clear_seven_pairs", False) or conditions.get("is_clear_seven_pairs", False) or
conditions.get("is_full_request", False)) else 0, conditions.get("is_full_request", False) or
conditions.get("is_rob_gang", False) or
conditions.get("is_under_the_sea", False) or
conditions.get("is_tian_hu", False) or
conditions.get("is_di_hu", False)) else 0,
} }
print("\nCalculating fan...") print("\nCalculating fan...")
# 逐一应用规则 # 逐一应用规则
for rule, func in rules.items(): for rule, func in rules.items():

2
tests/test_calculate_fan.py
View File

@@ -253,7 +253,7 @@ def test_dragon_seven_pairs():
} }
fan = calculate_fan(hand, melds, is_self_draw=True, is_cleared=False, conditions=conditions) fan = calculate_fan(hand, melds, is_self_draw=True, is_cleared=False, conditions=conditions)
assert fan == 13, f"Expected 13 fans (1 self-draw + 12 dragon seven pairs), got {fan}" assert fan == 12, f"Expected 13 fans (1 self-draw + 12 dragon seven pairs), got {fan}"
def test_self_draw(): def test_self_draw():
""" """