Hanabi/Py-Hanabi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename solve -> solve_sat, change output type to be an actual game

Browse source
This commit is contained in:
Maximilian Keßler 2023-03-15 15:44:33 +01:00
parent 1a43648ac7
commit b2ab5be3d9
Signed by: max
GPG key ID: BCC5A619923C0BA5
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sat.py
View file

@ -146,7 +146,7 @@ class Literals():
self.incr_clues = {m: Symbol('m{}c+'.format(m)) for m in range(self.max_moves)} self.incr_clues = {m: Symbol('m{}c+'.format(m)) for m in range(self.max_moves)}
def solve(game_state: GameState): def solve_sat(game_state: GameState):
ls = Literals(game_state.num_players, game_state.num_suits, game_state.num_dark_suits) ls = Literals(game_state.num_players, game_state.num_suits, game_state.num_dark_suits)
##### setup of initial game state ##### setup of initial game state
@ -330,7 +330,7 @@ def print_model(model, cur_game_state, ls: Literals):
print(', '.join(f for f in flags if model.get_py_value(getattr(ls, f)[m]))) print(', '.join(f for f in flags if model.get_py_value(getattr(ls, f)[m])))
def toJSON(model, cur_game_state: GameState, ls: Literals) -> dict: def toJSON(model, cur_game_state: GameState, ls: Literals) -> GameState:
for m in range(len(cur_game_state.actions), ls.max_moves): for m in range(len(cur_game_state.actions), ls.max_moves):
if model.get_py_value(ls.dummyturn[m]): if model.get_py_value(ls.dummyturn[m]):
break break
@ -343,10 +343,10 @@ def toJSON(model, cur_game_state: GameState, ls: Literals) -> dict:
else: else:
cur_game_state.clue() cur_game_state.clue()
return cur_game_state.to_json() return cur_game_state
def run_deck(): def run_deck():
puzzle = True puzzle = False
if puzzle: if puzzle:
deck_str = 'p5 p3 b4 r5 y4 y4 y5 r4 b2 y2 y3 g5 g2 g3 g4 p4 r3 b2 b3 b3 p4 b1 p2 b1 b1 p2 p1 p1 g1 r4 g1 r1 r3 r1 g1 r1 p1 b4 p3 g2 g3 g4 b5 y1 y1 y1 r2 r2 y2 y3' deck_str = 'p5 p3 b4 r5 y4 y4 y5 r4 b2 y2 y3 g5 g2 g3 g4 p4 r3 b2 b3 b3 p4 b1 p2 b1 b1 p2 p1 p1 g1 r4 g1 r1 r3 r1 g1 r1 p1 b4 p3 g2 g3 g4 b5 y1 y1 y1 r2 r2 y2 y3'
@ -354,26 +354,25 @@ def run_deck():
num_p = 5 num_p = 5
else: else:
deck_str = "15gfvqluvuwaqnmrkpkaignlaxpjbmsprksfcddeybfixchuhtwo" deck_str = "15gfvqluvuwaqnmrkpkaignlaxpjbmsprksfcddeybfixchuhtwo"
deck_str = "15diuknfwhqbplsrlkxjuvfbwyacoaxgtudcerskqfnhpgampmiv"
deck_str = "15jdxlpobvikrnhkslcuwggimtphafquqfvcwadampxkeyfrbnsu"
deck = decompress_deck(deck_str) deck = decompress_deck(deck_str)
num_p = 4 num_p = 6
print(deck) print(deck)
gs = GameState(num_p, deck) gs = GameState(num_p, deck)
if puzzle: if puzzle:
gs.play(2) gs.play(2)
pass
else: else:
strat = GreedyStrategy(gs) strat = GreedyStrategy(gs)
for _ in range(18): for _ in range(17):
strat.make_move() strat.make_move()
print(link(gs.to_json()))
solvable, sol = solve_sat(gs)
solvable, sol = solve(gs)
if solvable: if solvable:
print(sol) print(sol)
print(link(sol)) print(link(sol.to_json()))
else: else:
print('unsolvable') print('unsolvable')