Skip to content

Restyle Sourcery refactor of whole repo - master branch #2

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

Open
restyled-io wants to merge 4 commits into
base: master-sourcery
Choose a base branch
from
Open

Restyle Sourcery refactor of whole repo - master branch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f476427
Restyled by autopep8
restyled-commits Mar 19, 2020
e0b5c11
Restyled by black
restyled-commits Mar 19, 2020
e7ada8e
Restyled by reorder-python-imports
restyled-commits Mar 19, 2020
1c0d91f
Restyled by yapf
restyled-commits Mar 19, 2020
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
78 changes: 39 additions & 39 deletions consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,37 +22,37 @@
FOURS = []
# Horizontal
for row in range(HEIGHT):
for column in range(WIDTH - 3):
four = np.zeros([HEIGHT, WIDTH], bool)
for i in range(4):
four[row, column + i] = True
FOURS.append(four)
for column in range(WIDTH - 3):
four = np.zeros([HEIGHT, WIDTH], bool)
for i in range(4):
four[row, column + i] = True
FOURS.append(four)
# Vertical
for row in range(HEIGHT - 3):
for column in range(WIDTH):
four = np.zeros([HEIGHT, WIDTH], bool)
for i in range(4):
four[row + i, column] = True
FOURS.append(four)
for column in range(WIDTH):
four = np.zeros([HEIGHT, WIDTH], bool)
for i in range(4):
four[row + i, column] = True
FOURS.append(four)
# Diagonal
for row in range(HEIGHT - 3):
for column in range(WIDTH - 3):
four1 = np.zeros([HEIGHT, WIDTH], bool)
four2 = np.zeros([HEIGHT, WIDTH], bool)
for i in range(4):
four1[row + i, column + i] = True
four2[row + 3 - i, column + i] = True
FOURS.append(four1)
FOURS.append(four2)
for column in range(WIDTH - 3):
four1 = np.zeros([HEIGHT, WIDTH], bool)
four2 = np.zeros([HEIGHT, WIDTH], bool)
for i in range(4):
four1[row + i, column + i] = True
four2[row + 3 - i, column + i] = True
FOURS.append(four1)
FOURS.append(four2)
FOURS = np.array(FOURS)

DISK_FOURS = {}
DISK_FOUR_COUNTS = np.zeros([HEIGHT, WIDTH], int)
for row in range(HEIGHT):
for column in range(WIDTH):
disk_fours = [four for four in FOURS if four[row, column]]
DISK_FOURS[row, column] = disk_fours
DISK_FOUR_COUNTS[row, column] = len(disk_fours)
for column in range(WIDTH):
disk_fours = [four for four in FOURS if four[row, column]]
DISK_FOURS[row, column] = disk_fours
DISK_FOUR_COUNTS[row, column] = len(disk_fours)

# Results
RED_WIN = 1
Expand All @@ -68,21 +68,21 @@
NEW_POSITION_HASH = np.uint64(0)
DISK_HASHES = np.zeros([COLOURS, HEIGHT, WIDTH], np.uint64)
for colour in range(COLOURS):
for row in range(HEIGHT):
disks_in_column = row ^ (row + 1)
yellow_disks = 2**(row + 3) if colour == YELLOW else 0
row_hash = disks_in_column | yellow_disks
for column in range(WIDTH):
row_column_hash = row_hash << (9 * column)
DISK_HASHES[colour, HEIGHT - row - 1, column] = row_column_hash
for row in range(HEIGHT):
disks_in_column = row ^ (row + 1)
yellow_disks = 2**(row + 3) if colour == YELLOW else 0
row_hash = disks_in_column | yellow_disks
for column in range(WIDTH):
row_column_hash = row_hash << (9 * column)
DISK_HASHES[colour, HEIGHT - row - 1, column] = row_column_hash

if __name__ == '__main__':
print(FOURS[0])
print(DISK_FOURS[0, 0])
print(DISK_FOUR_COUNTS)
print(TILED_COLUMNS.reshape([HEIGHT, WIDTH]))
print(TILED_ROWS.reshape([HEIGHT, WIDTH]))
print(ROW_EDGE_DISTANCE.reshape([HEIGHT, WIDTH]))
print(COLUMN_EDGE_DISTANCE.reshape([HEIGHT, WIDTH]))
print(ODDS.reshape([HEIGHT, WIDTH]))
print(np.array(map(bin, DISK_HASHES.flatten())).reshape(DISK_HASHES.shape))
if __name__ == "__main__":
print(FOURS[0])
print(DISK_FOURS[0, 0])
print(DISK_FOUR_COUNTS)
print(TILED_COLUMNS.reshape([HEIGHT, WIDTH]))
print(TILED_ROWS.reshape([HEIGHT, WIDTH]))
print(ROW_EDGE_DISTANCE.reshape([HEIGHT, WIDTH]))
print(COLUMN_EDGE_DISTANCE.reshape([HEIGHT, WIDTH]))
print(ODDS.reshape([HEIGHT, WIDTH]))
print(np.array(map(bin, DISK_HASHES.flatten())).reshape(DISK_HASHES.shape))
Loading