git.ucc.asn.au
/
progcomp2013.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Making dedicated match making server
[progcomp2013.git]
/
qchess
/
src
/
board.py
diff --git
a/qchess/src/board.py
b/qchess/src/board.py
index
5f75d39
..
439ab77
100644
(file)
--- a/
qchess/src/board.py
+++ b/
qchess/src/board.py
@@
-172,10
+172,11
@@
class Board():
# Update the board when a piece has been selected
# "type" is apparently reserved, so I'll use "state"
# Update the board when a piece has been selected
# "type" is apparently reserved, so I'll use "state"
- def update_select(self, x, y, type_index, state):
+ def update_select(self, x, y, type_index, state, sanity=True, deselect=True):
+ debug(str(self) + " update_select called")
piece = self.grid[x][y]
if piece.types[type_index] == "unknown":
piece = self.grid[x][y]
if piece.types[type_index] == "unknown":
- if not state in self.unrevealed_types[piece.colour].keys():
+ if not state in self.unrevealed_types[piece.colour].keys()
and sanity == True
:
raise Exception("SANITY: Too many " + piece.colour + " " + state + "s")
self.unrevealed_types[piece.colour][state] -= 1
if self.unrevealed_types[piece.colour][state] <= 0:
raise Exception("SANITY: Too many " + piece.colour + " " + state + "s")
self.unrevealed_types[piece.colour][state] -= 1
if self.unrevealed_types[piece.colour][state] <= 0:
@@
-184,19
+185,19
@@
class Board():
piece.types[type_index] = state
piece.current_type = state
piece.types[type_index] = state
piece.current_type = state
- if len(self.possible_moves(piece)) <= 0:
+ if
deselect == True and
len(self.possible_moves(piece)) <= 0:
piece.deselect() # Piece can't move; deselect it
# Piece needs to recalculate moves
piece.possible_moves = None
# Update the board when a piece has been moved
piece.deselect() # Piece can't move; deselect it
# Piece needs to recalculate moves
piece.possible_moves = None
# Update the board when a piece has been moved
- def update_move(self, x, y, x2, y2):
-
+ def update_move(self, x, y, x2, y2
, sanity=True
):
+ debug(str(self) + " update_move called \""+str(x)+ " " + str(y) + " -> " + str(x2) + " " + str(y2) + "\"")
piece = self.grid[x][y]
#print "Moving " + str(x) + "," + str(y) + " to " + str(x2) + "," + str(y2) + "; possible_moves are " + str(self.possible_moves(piece))
piece = self.grid[x][y]
#print "Moving " + str(x) + "," + str(y) + " to " + str(x2) + "," + str(y2) + "; possible_moves are " + str(self.possible_moves(piece))
- if not [x2,y2] in self.possible_moves(piece):
+ if not [x2,y2] in self.possible_moves(piece)
and sanity == True
:
raise Exception("ILLEGAL move " + str(x2)+","+str(y2))
self.grid[x][y] = None
raise Exception("ILLEGAL move " + str(x2)+","+str(y2))
self.grid[x][y] = None
@@
-231,8
+232,8
@@
class Board():
# Update the board from a string
# Guesses what to do based on the format of the string
# Update the board from a string
# Guesses what to do based on the format of the string
- def update(self, result):
- #print "Update called with \"" + str(result) + "\""
+ def update(self, result
, sanity=True, deselect=True
):
+ debug(str(self) + " update called \""+str(result)+"\"")
# String always starts with 'x y'
try:
s = result.split(" ")
# String always starts with 'x y'
try:
s = result.split(" ")
@@
-241,8
+242,8
@@
class Board():
raise Exception("GIBBERISH \""+ str(result) + "\"") # Raise expectations
piece = self.grid[x][y]
raise Exception("GIBBERISH \""+ str(result) + "\"") # Raise expectations
piece = self.grid[x][y]
- if piece == None:
- raise Exception("EMPTY
"
)
+ if piece == None
and sanity == True
:
+ raise Exception("EMPTY
" + str(x) + " " + str(y)
)
# If a piece is being moved, the third token is '->'
# We could get away with just using four integers, but that wouldn't look as cool
# If a piece is being moved, the third token is '->'
# We could get away with just using four integers, but that wouldn't look as cool
@@
-254,7
+255,7
@@
class Board():
raise Exception("GIBBERISH \"" + str(result) + "\"") # Raise the alarm
# Move the piece (take opponent if possible)
raise Exception("GIBBERISH \"" + str(result) + "\"") # Raise the alarm
# Move the piece (take opponent if possible)
- self.update_move(x, y, x2, y2)
+ self.update_move(x, y, x2, y2
, sanity
)
else:
# Otherwise we will just assume a piece has been selected
else:
# Otherwise we will just assume a piece has been selected
@@
-264,8
+265,9
@@
class Board():
except:
raise Exception("GIBBERISH \"" + result + "\"") # Throw a hissy fit
except:
raise Exception("GIBBERISH \"" + result + "\"") # Throw a hissy fit
+
# Select the piece
# Select the piece
- self.update_select(x, y, type_index, state)
+ self.update_select(x, y, type_index, state
, sanity=sanity, deselect=deselect
)
return result
return result
@@
-308,7
+310,7
@@
class Board():
for i in range(len(p.types)):
t = p.types[i]
for i in range(len(p.types)):
t = p.types[i]
- prob =
0.5
+ prob =
1.0 / float(len(p.types))
if t == "unknown" or p.types[i][0] == '?':
total_types = 0
for t2 in self.unrevealed_types[p.colour].keys():
if t == "unknown" or p.types[i][0] == '?':
total_types = 0
for t2 in self.unrevealed_types[p.colour].keys():
@@
-316,17
+318,17
@@
class Board():
for t2 in self.unrevealed_types[p.colour].keys():
prob2 = float(self.unrevealed_types[p.colour][t2]) / float(total_types)
for t2 in self.unrevealed_types[p.colour].keys():
prob2 = float(self.unrevealed_types[p.colour][t2]) / float(total_types)
- p.current_type = t2
- for point in self.possible_moves(p, reject_allied):
+
#
p.current_type = t2
+ for point in self.possible_moves(p, reject_allied
, state=t2
):
result[point[0]][point[1]] += prob2 * prob
else:
result[point[0]][point[1]] += prob2 * prob
else:
- p.current_type = t
- for point in self.possible_moves(p, reject_allied):
- result[point[0]][point[1]] += prob
+
#
p.current_type = t
+ for point in self.possible_moves(p, reject_allied
, state=t
):
+
result[point[0]][point[1]] += prob
#self.verify()
#self.verify()
- p.current_type = "unknown"
+
#
p.current_type = "unknown"
return result
def prob_is_type(self, p, state):
return result
def prob_is_type(self, p, state):
@@
-364,8
+366,7
@@
class Board():
p.current_type = old_type
return result
p.current_type = old_type
return result
- if p.possible_moves != None:
- return p.possible_moves
+
result = []
result = []
@@
-373,7
+374,7
@@
class Board():
if p.current_type == "unknown":
if p.current_type == "unknown":
- raise Exception("SANITY:
Piece state unknown"
)
+ raise Exception("SANITY:
Unknown state for piece: "+str(p)
)
# The below commented out code causes things to break badly
#for t in p.types:
# if t == "unknown":
# The below commented out code causes things to break badly
#for t in p.types:
# if t == "unknown":
UCC
git Repository :: git.ucc.asn.au