change x to variant. #33

README.md

@@ -124,7 +124,7 @@ $ install_reversi_examples
 - [07_minmax_strategy.py](https://github.com/y-tetsu/reversi/blob/master/reversi/examples/07_minmax_strategy.py) - MinMax法で手を選ぶAIを実装するサンプル
 - [08_alphabeta_strategy.py](https://github.com/y-tetsu/reversi/blob/master/reversi/examples/08_alphabeta_strategy.py) - AlphaBeta法で手を選ぶAIを実装するサンプル
 - [09_genetic_algorithm.py](https://github.com/y-tetsu/reversi/blob/master/reversi/examples/09_genetic_algorithm.py) - 遺伝的アルゴリズムを使ってテーブルの重みを求めるサンプル
-- [10_x_elucidator.py](https://github.com/y-tetsu/reversi/blob/master/reversi/examples/10_x_elucidator.py) - 変則ボードの解析ツール
+- [10_variant_elucidator.py](https://github.com/y-tetsu/reversi/blob/master/reversi/examples/10_variant_elucidator.py) - 変則ボードの解析ツール
 
 サンプルの実行方法はそれぞれ下記のとおりです。
 ```
@@ -138,7 +138,7 @@ $ python 06_table_strategy.py
 $ python 07_minmax_strategy.py
 $ python 08_alphabeta_strategy.py
 $ python 09_genetic_algorithm.py
-$ python 10_x_elucidator.py
+$ python 10_variant_elucidator.py
 ```
 
 

reversi/__init__.py

@@ -1,7 +1,7 @@
 from .board import Board, BitBoard, PyListBoard, PyBitBoard, MIN_BOARD_SIZE, MAX_BOARD_SIZE
 from .color import C
 from .move import Move, LOWER, UPPER
-from .x import X
+from .variant import V
 from .player import Player
 from .display import ConsoleDisplay, NoneDisplay, WindowDisplay
 from .game import Game
@@ -26,7 +26,7 @@
     'Move',
     'LOWER',
     'UPPER',
-    'X',
+    'V',
     'Player',
     'ConsoleDisplay',
     'NoneDisplay',

reversi/app.py

@@ -9,7 +9,7 @@
 import threading
 from platform import system
 
-from reversi import BitBoard, Player, Window, WindowDisplay, ConsoleDisplay, Game, ErrorMessage, strategies, X, Recorder
+from reversi import BitBoard, Player, Window, WindowDisplay, ConsoleDisplay, Game, ErrorMessage, strategies, V, Recorder
 
 
 class Reversi:
@@ -375,7 +375,7 @@ def _get_board_type(self):
         """
         self._clear_screen()
 
-        board_list = list(X.keys())
+        board_list = list(V.keys())
 
         print('select board type')
         print('-----------------------------')
@@ -416,10 +416,10 @@ def __play(self):
         self._clear_screen()
 
         # ボード準備
-        size = X[self.board_type]['size']
-        hole = X[self.board_type]['hole']
-        ini_black = X[self.board_type]['ini_black']
-        ini_white = X[self.board_type]['ini_white']
+        size = V[self.board_type]['size']
+        hole = V[self.board_type]['hole']
+        ini_black = V[self.board_type]['ini_black']
+        ini_white = V[self.board_type]['ini_white']
         board = BitBoard(size=size, hole=hole, ini_black=ini_black, ini_white=ini_white)
 
         # プレイヤー準備

reversi/simulator.py

@@ -5,7 +5,7 @@
 import itertools
 from multiprocessing import Pool
 
-from reversi import BitBoard, PyListBoard, Player, NoneDisplay, Game, X
+from reversi import BitBoard, PyListBoard, Player, NoneDisplay, Game, V
 from reversi.strategies import RandomOpening
 
 
@@ -140,11 +140,11 @@ def __init__(
         self.hole = 0x0000000000000000
         self.ini_black = None
         self.ini_white = None
-        if self.board_name in X:
-            self.board_size = X[self.board_name]['size']
-            self.hole = X[self.board_name]['hole']
-            self.ini_black = X[self.board_name]['ini_black']
-            self.ini_white = X[self.board_name]['ini_white']
+        if self.board_name in V:
+            self.board_size = V[self.board_name]['size']
+            self.hole = V[self.board_name]['hole']
+            self.ini_black = V[self.board_name]['ini_black']
+            self.ini_white = V[self.board_name]['ini_white']
             print(f'[{self.board_name}]')
 
         print(BitBoard(self.board_size, hole=self.hole, ini_black=self.ini_black, ini_white=self.ini_white))