fix shanten calculation rules in regard with chiitoitsu consideration

Author: bogachev-pa

project/game/ai/first_version/hand_builder.py

@@ -114,13 +114,35 @@ def discard_tile(self, tiles, closed_hand, melds, print_log=True):
 
         return self.process_discard_option(selected_tile, closed_hand, print_log=print_log)
 
+    def calculate_shanten(self, tiles_34, open_sets_34=None):
+        shanten_with_chiitoitsu = self.ai.shanten_calculator.calculate_shanten(tiles_34,
+                                                                               open_sets_34,
+                                                                               chiitoitsu=True)
+        shanten_without_chiitoitsu = self.ai.shanten_calculator.calculate_shanten(tiles_34,
+                                                                                  open_sets_34,
+                                                                                  chiitoitsu=False)
+
+        if shanten_with_chiitoitsu == 0 and shanten_without_chiitoitsu >= 1:
+            shanten = shanten_with_chiitoitsu
+            use_chiitoitsu = True
+        elif shanten_with_chiitoitsu == 1 and shanten_without_chiitoitsu >= 3:
+            shanten = shanten_with_chiitoitsu
+            use_chiitoitsu = True
+        else:
+            shanten = shanten_without_chiitoitsu
+            use_chiitoitsu = False
+
+        return shanten, use_chiitoitsu
+
     def calculate_waits(self, tiles_34, open_sets_34=None):
         """
         :param tiles_34: array of tiles in 34 formant, 13 of them (this is important)
         :param open_sets_34: array of array with tiles in 34 format
         :return: array of waits in 34 format and number of shanten
         """
-        shanten = self.ai.shanten_calculator.calculate_shanten(tiles_34, open_sets_34, chiitoitsu=self.ai.use_chitoitsu)
+
+        shanten, use_chiitoitsu = self.calculate_shanten(tiles_34, open_sets_34)
+
         waiting = []
         for j in range(0, 34):
             if tiles_34[j] == 4:
@@ -131,7 +153,7 @@ def calculate_waits(self, tiles_34, open_sets_34=None):
             key = '{},{},{}'.format(
                 ''.join([str(x) for x in tiles_34]),
                 ';'.join([str(x) for x in open_sets_34]),
-                self.ai.use_chitoitsu and 1 or 0
+                use_chiitoitsu and 1 or 0
             )
 
             if key in self.ai.hand_cache:
@@ -140,7 +162,7 @@ def calculate_waits(self, tiles_34, open_sets_34=None):
                 new_shanten = self.ai.shanten_calculator.calculate_shanten(
                     tiles_34,
                     open_sets_34,
-                    chiitoitsu=self.ai.use_chitoitsu
+                    chiitoitsu=use_chiitoitsu
                 )
                 self.ai.hand_cache[key] = new_shanten
 
@@ -188,10 +210,9 @@ def find_discard_options(self, tiles, closed_hand, melds=None):
         if is_agari:
             shanten = Shanten.AGARI_STATE
         else:
-            shanten = self.ai.shanten_calculator.calculate_shanten(
+            shanten, _ = self.calculate_shanten(
                 tiles_34,
-                open_sets_34,
-                chiitoitsu=self.ai.use_chitoitsu
+                open_sets_34
             )
 
         return results, shanten

project/game/ai/first_version/main.py

@@ -44,7 +44,6 @@ class ImplementationAI(InterfaceAI):
 
     current_strategy = None
     last_discard_option = None
-    use_chitoitsu = False
 
     hand_cache = {}
 
@@ -70,7 +69,6 @@ def erase_state(self):
 
         self.current_strategy = None
         self.last_discard_option = None
-        self.use_chitoitsu = False
 
         self.hand_cache = {}
 
@@ -81,9 +79,7 @@ def init_hand(self):
             'Hand: {}'.format(self.player.format_hand_for_print()),
         ])
 
-        self.shanten = self.shanten_calculator.calculate_shanten(
-            TilesConverter.to_34_array(self.player.tiles)
-        )
+        self.shanten, _ = self.hand_builder.calculate_shanten(TilesConverter.to_34_array(self.player.tiles))
 
     def draw_tile(self, tile_136):
         self.determine_strategy(self.player.tiles)
@@ -111,11 +107,8 @@ def try_to_call_meld(self, tile_136, is_kamicha_discard):
             return None, None
 
         tiles_34 = TilesConverter.to_34_array(tiles_136)
-        previous_shanten = self.shanten_calculator.calculate_shanten(
-            tiles_34,
-            self.player.meld_34_tiles,
-            chiitoitsu=self.use_chitoitsu
-        )
+
+        previous_shanten, _ = self.hand_builder.calculate_shanten(tiles_34, self.player.meld_34_tiles)
 
         if previous_shanten == Shanten.AGARI_STATE and not self.current_strategy.can_meld_into_agari():
             return None, None
@@ -133,8 +126,6 @@ def try_to_call_meld(self, tile_136, is_kamicha_discard):
         return meld, discard_option
 
     def determine_strategy(self, tiles_136):
-        self.use_chitoitsu = False
-
         # for already opened hand we don't need to give up on selected strategy
         if self.player.is_open_hand and self.current_strategy:
             return False
@@ -160,8 +151,6 @@ def determine_strategy(self, tiles_136):
                 self.current_strategy = strategy
 
         if self.current_strategy:
-            self.use_chitoitsu = self.current_strategy.type == BaseStrategy.CHIITOITSU
-
             if not old_strategy or self.current_strategy.type != old_strategy.type:
                 DecisionsLogger.debug(
                     log.STRATEGY_ACTIVATE,

project/game/ai/first_version/tests/strategies/tests_chiitoitsu.py

@@ -50,3 +50,15 @@ def test_dont_call_meld(self):
         tile = self._string_to_136_tile(man='9')
         meld, _ = player.try_to_call_meld(tile, True)
         self.assertEqual(meld, None)
+
+    def test_keep_chiitoitsu_tempai(self):
+        table = Table()
+        player = table.player
+
+        tiles = self._string_to_136_array(sou='113355', man='22669', pin='99')
+        player.init_hand(tiles)
+
+        player.draw_tile(self._string_to_136_tile(man='6'))
+
+        discard = player.discard_tile()
+        self.assertEqual(self._to_string([discard]), '6m')