Changed calculate_legal_states to allow for possible face_value of 0
This commit is contained in:
parent
c08e7fe540
commit
7764a70799
95
board.py
95
board.py
|
@ -55,39 +55,70 @@ class Board:
|
|||
|
||||
|
||||
# tesauro
|
||||
# @staticmethod
|
||||
# def board_features_tesauro(board, cur_player):
|
||||
# def ordinary_trans(val, player):
|
||||
# abs_val = val * player
|
||||
# if abs_val <= 0: return (0,0,0,0)
|
||||
# elif abs_val == 1: return (1,0,0,0)
|
||||
# elif abs_val == 2: return (1,1,0,0)
|
||||
# elif abs_val == 3: return (1,1,1,0)
|
||||
# else: return (1,1,1, (abs_val - 3) / 2)
|
||||
|
||||
# def bar_trans(board, player):
|
||||
# if player == 1: return (abs(board[0]/2),)
|
||||
# elif player == -1: return (abs(board[25]/2),)
|
||||
|
||||
# # def ordinary_trans_board(board, player):
|
||||
# # return np.array(
|
||||
# # [ordinary_trans(x, player) for x in board[1:25]]
|
||||
# # ).flatten()
|
||||
|
||||
# board_rep = []
|
||||
# for player in [1,-1]:
|
||||
# for x in board[1:25]:
|
||||
# board_rep += ordinary_trans(x, player)
|
||||
# board_rep += bar_trans(board, player)
|
||||
# board_rep += (15 - Board.num_of_checkers_for_player(board, player),)
|
||||
|
||||
# board_rep += ([1,0] if cur_player == 1 else [1,0])
|
||||
|
||||
# return np.array(board_rep).reshape(1,198)
|
||||
|
||||
|
||||
@staticmethod
|
||||
def board_features_tesauro(board, cur_player):
|
||||
def ordinary_trans(val, player):
|
||||
abs_val = val * player
|
||||
if abs_val <= 0: return (0,0,0,0)
|
||||
elif abs_val == 1: return (1,0,0,0)
|
||||
elif abs_val == 2: return (1,1,0,0)
|
||||
elif abs_val == 3: return (1,1,1,0)
|
||||
else: return (1,1,1, (abs_val - 3) / 2)
|
||||
features = []
|
||||
for player in [-1,1]:
|
||||
sum = 0.0
|
||||
for board_range in range(1,25):
|
||||
pin = board[board_range]
|
||||
#print("PIIIN:",pin)
|
||||
feature = [0.0]*4
|
||||
if np.sign(pin) == np.sign(player):
|
||||
sum += abs(pin)
|
||||
for i in range(min(abs(pin), 3)):
|
||||
feature[i] = 1
|
||||
if (abs(pin) > 3):
|
||||
feature[3] = (abs(pin)-3)/2
|
||||
features += feature
|
||||
#print("SUUUM:",sum)
|
||||
# Append the amount of men on the bar of the current player divided by 2
|
||||
features.append((board[0] if np.sign(player) < 0 else board[25]) / 2.0)
|
||||
# Calculate how many pieces there must be in the home state and divide it by 15
|
||||
features.append((15 - sum) / 15)
|
||||
features += ([1,0] if np.sign(cur_player) > 0 else [0,1])
|
||||
test = np.array(features).reshape(1,-1)
|
||||
#print("TEST:",test)
|
||||
return test
|
||||
|
||||
def bar_trans(board, player):
|
||||
if player == 1: return (abs(board[0]/2),)
|
||||
elif player == -1: return (abs(board[25]/2),)
|
||||
|
||||
# def ordinary_trans_board(board, player):
|
||||
# return np.array(
|
||||
# [ordinary_trans(x, player) for x in board[1:25]]
|
||||
# ).flatten()
|
||||
|
||||
board_rep = []
|
||||
for player in [1,-1]:
|
||||
for x in board[1:25]:
|
||||
board_rep += ordinary_trans(x, player)
|
||||
board_rep += bar_trans(board, player)
|
||||
board_rep += (15 - Board.num_of_checkers_for_player(board, player),)
|
||||
|
||||
board_rep += ([1,0] if cur_player == 1 else [0,1])
|
||||
|
||||
return np.array(board_rep).reshape(1,198)
|
||||
|
||||
|
||||
@staticmethod
|
||||
def is_move_valid(board, player, face_value, move):
|
||||
if face_value == 0:
|
||||
return True
|
||||
else:
|
||||
def sign(a):
|
||||
return (a > 0) - (a < 0)
|
||||
|
||||
|
@ -158,6 +189,10 @@ class Board:
|
|||
all_checkers_in_last_quadrant() ])
|
||||
|
||||
# TODO: add switch here instead of wonky ternary in all
|
||||
# print("is_forward:",is_forward_move())
|
||||
# print("face_value:",face_value_match_move_length())
|
||||
# print("Checkes_at_from:",checkers_at_from_idx())
|
||||
# print("no_block:",no_block_at_to_idx())
|
||||
|
||||
return all([ is_forward_move(),
|
||||
face_value_match_move_length(),
|
||||
|
@ -232,11 +267,11 @@ class Board:
|
|||
(idx, idx + (face_value * player)))
|
||||
else None)
|
||||
for idx in idxs_with_checkers]
|
||||
|
||||
# print("pls:",boards)
|
||||
board_list = list(filter(None, boards)) # Remove None-values
|
||||
# if len(board_list) == 0:
|
||||
# return [board]
|
||||
|
||||
# print("board list:", board_list)
|
||||
return board_list
|
||||
|
||||
# Problem with cal_moves: Method can return empty list (should always contain at least same board).
|
||||
|
@ -250,9 +285,8 @@ class Board:
|
|||
|
||||
if not Board.any_move_valid(board, player, roll):
|
||||
return { board }
|
||||
|
||||
dice_permutations = list(itertools.permutations(roll)) if roll[0] != roll[1] else [[roll[0]]*4]
|
||||
|
||||
print("Dice permuts:",dice_permutations)
|
||||
for roll in dice_permutations:
|
||||
# Calculate boards resulting from first move
|
||||
#print("initial board: ", board)
|
||||
|
@ -265,7 +299,6 @@ class Board:
|
|||
nested_boards = [calc_moves(board, die) for board in boards]
|
||||
#print("nested boards: ", nested_boards)
|
||||
boards = [board for boards in nested_boards for board in boards]
|
||||
|
||||
# What the fuck
|
||||
#for board in boards:
|
||||
# print(board)
|
||||
|
|
Loading…
Reference in New Issue
Block a user