graph-games-proto 0.3.2035__py3-none-any.whl → 0.3.2039__py3-none-any.whl

graph_games_proto/fns.py

@@ -2353,7 +2353,7 @@ class PublicState(PClass):
     goals = field(type=list)  # List[Goal]
     nodes = field(type=list)  # List[Node]
     edges = field(type=list)  # List[BiEdge]
-    regions = field(type=list)
+    regions = field(type=list, initial=[])
     decks = field(type=list)  # List[PublicDeck]
     piles = field(type=list)  # List[Pile]
     player_idxs = field(type=list)  # List[int]
@@ -2558,24 +2558,15 @@ def getsettingvalue(s, setting_name):
 
 @dispatch(GameConfig)
 def getinitialstate(game_config):
-    fig = game_config.fig
     rng = getrng(game_config.seed)
-    unit_deck = shuffledeck(gettotaldeckcards(fig), rng)
-    route_deck_idx, unit_deck_idx = 0, 0
-    unit_deck_idx += 5
-    board_config = fig.board_config
-    deck_0_rng = getrng(1234321)
-    deck_1_rng = getrng(8738758)
+    board_config = game_config.fig.board_config
     nodes = get_nodes(board_config)
 
-    pieceuuid2piece = {}
     piles = []
     for piece_template in board_config.piece_templates:
         if piece_template.has_player:
             for player_idx in range(game_config.num_players):
                 pieces = generate_pieces(piece_template, player_idx)
-                for piece in pieces:
-                    pieceuuid2piece[piece.uuid] = piece
                 pile = Pile(
                     player_idx=player_idx,
                     num_pieces=piece_template.quantity,
@@ -2596,25 +2587,22 @@ def getinitialstate(game_config):
         )
         decks.append(deck_obj)
 
-    nodeuuid2idx = {node.uuid: idx for idx, node in enumerate(board_config.points)}
-    edges = get_edges(rng, board_config, nodeuuid2idx)
-
-    bonuses = game_config.fig.board_config.bonuses
-    bonus_statuses = [
-        BonusStatus(
-            bonus_uuid=bonus.uuid, 
-            winners=[],
-            player_statuses=[
-                BonusPlayerStatus(
-                    player_idx=player_idx,
-                    score=0,
-                    longest_trail=None,
-                )
-                for player_idx in range(game_config.num_players)
-            ]
-        ) 
-        for bonus in bonuses
-    ]
+    # bonuses = game_config.fig.board_config.bonuses
+    # bonus_statuses = [
+    #     BonusStatus(
+    #         bonus_uuid=bonus.uuid, 
+    #         winners=[],
+    #         player_statuses=[
+    #             BonusPlayerStatus(
+    #                 player_idx=player_idx,
+    #                 score=0,
+    #                 longest_trail=None,
+    #             )
+    #             for player_idx in range(game_config.num_players)
+    #         ]
+    #     ) 
+    #     for bonus in bonuses
+    # ]
 
     # state = State(
     #     bonus_statuses=bonus_statuses,
@@ -2638,6 +2626,9 @@ def getinitialstate(game_config):
     #     last_to_play=None,
     #     winners=[],
     # )
+
+    nodeuuid2idx = {node.uuid: idx for idx, node in enumerate(board_config.points)}
+    edges = get_edges(rng, board_config, nodeuuid2idx)
     
     kernel = init_state_kernel(
         rng=rng,
@@ -2657,15 +2648,23 @@ def getinitialstate(game_config):
 
     kernel = run_kernel_hooks(kernel, INITIALIZATION_HOOKS, True)
 
+    return init_memoized_state(kernel)
+
+
+@dispatch(StateKernel)
+def init_memoized_state(kernel):
     state = State(
         kernel=kernel,
         legal_actions_3=calc_legal_actions3(kernel),
         bonus_statuses_3=calc_bonus_statuses3(kernel),
     )
-    
+    return memoize_state(state)
+
+
+@dispatch(State)
+def memoize_state(state):
     state = state.set(player_scores_3=calc_player_scores3(state))
     state = state.set(winners=calc_winners_3(state))
-
     return state
 
 
@@ -2866,10 +2865,11 @@ def handle_last_to_play(game):
     return game
 
 
-def getfinalscores(game):
+@dispatch(State)
+def getfinalscores(state):
     return [
-        getpublicplayerscore(game, game.player_scores[player_idx]).total
-        for player_idx in range(len(game.players))
+        getpublicplayerscore(state, state.player_scores_3[player_idx]).total
+        for player_idx in range(len(state.kernel.players))
     ]
 
 
@@ -4371,46 +4371,14 @@ def get_next_player_shuffled_idx(state_kernel, last_action):
     return next_player_shuffled_idx
 
 
-def init_state(kernel):
-
-    legal_actions_3 = calc_legal_actions3(kernel)
-
-    return State(
-        kernel=kernel,
-        rng=kernel.rng,
-        game_config=kernel.game_config,
-        edges=kernel.edges,
-        decks=kernel.decks,
-        piles=kernel.piles,
-        players=kernel.players,
-        player_idxs=kernel.player_idxs,
-        history=kernel.history,
-        player_scores=kernel.player_scores,
-        is_terminal=False,
-        idx2path=kernel.idx2path,
-        carduuid2card=kernel.carduuid2card,
-        legal_actions_3=legal_actions_3,
-    )
-
-
 def getnextstate2(s, a, log=False):
     is_legal, reason = isactionlegal2(s, a)
     if not is_legal:
         raise ValueError(f"Action is not legal: {a}. Reason: {reason}")
-    
     kernel = s.kernel
     kernel = run_state_action_hooks(kernel, a, AFTER_ACCEPT_ACTION_HOOKS, log)
     kernel = run_state_action_hooks(kernel, a, HANDLE_ACTION_HOOKS, log)
-
-    state = State(
-        kernel=kernel,
-        legal_actions_3=calc_legal_actions3(kernel),
-        bonus_statuses_3=calc_bonus_statuses3(kernel),
-    )
-    state = state.set(player_scores_3=calc_player_scores3(state))
-    state = state.set(winners=calc_winners_3(state))
-
-    return state
+    return init_memoized_state(kernel)
 
 
 def getpublicplayerscore(s, player_score):
@@ -4498,7 +4466,7 @@ def get_deadlines(s):
 
 
 def get_public_player_scores(s):
-    return [getpublicplayerscore(s, player_score) for player_score in s.player_scores]
+    return [getpublicplayerscore(s, player_score) for player_score in s.player_scores_3]
 
 
 # deadlines = field(type=list)  # List[RemainingAllottedTime|None]
@@ -4552,19 +4520,23 @@ def imagine_decks(public_state, private_state):
 
 
 def imagine_state(public_state, private_state):
+    game_config = public_state.game_config
     imagined_kernel = init_state_kernel(
         rng=random.Random(),
-        game_config=public_state.game_config,
-        player_idxs=public_state.player_idxs,
-        piles=public_state.piles,
+        game_config=game_config,
         edges=public_state.edges,
         nodes=public_state.nodes,
+        piles=public_state.piles,
         decks=imagine_decks(public_state, private_state),
         players=imagine_players(public_state, private_state),
+        player_idxs=public_state.player_idxs,
         history=imagine_history(public_state, private_state),
         player_scores=imagine_player_scores(public_state, private_state),
+        starting_decks=[Deck.__fromdict__(x.__todict__()) for x in decks],
+        starting_piles=[Pile.__fromdict__(x.__todict__()) for x in public_state.piles],
+        goals=game_config.fig.board_config.goals,
     )
-    return init_state(imagined_kernel) 
+    return init_memoized_state(imagined_kernel)
 
 
 def isterminal(s):
@@ -5265,8 +5237,8 @@ def json2rng(json_str):
 def getprivatestate(s, player_idx):
     return PrivateState(
         my_history=[a for a in s.kernel.history if a.legal_action.player_idx == player_idx],
-        player_score=getprivateplayerscore(s, s.player_scores[player_idx]),
-        player=s.players[player_idx],
+        player_score=getprivateplayerscore(s, s.player_scores_3[player_idx]),
+        player=s.kernel.players[player_idx],
         legal_actions_3 = get_legal_actions3(s, player_idx),
         goal_completions=get_goal_completions(s, player_idx),
     )

{graph_games_proto-0.3.2035.dist-info → graph_games_proto-0.3.2039.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: graph_games_proto
-Version: 0.3.2035
+Version: 0.3.2039
 Requires-Dist: multipledispatch==1.0.0
 Requires-Dist: pyrsistent==0.20.0
 Requires-Dist: numpy==2.2.4

{graph_games_proto-0.3.2035.dist-info → graph_games_proto-0.3.2039.dist-info}/RECORD

@@ -1,9 +1,9 @@
 graph_games_proto/__init__.py,sha256=_EVQR-51XehfH45XZlba1WPdx3omS3Gm1nTwrgGyn2Q,667
 graph_games_proto/all_types.py,sha256=IpbwftEcHS5Ewz-saFNk0lO9FvcbuHG36odRTayCXUk,54911
-graph_games_proto/fns.py,sha256=L45L9Sp5X2aJ0vPgxQZ7U5VegWXXAMyzcHsE_ct67Tk,194410
+graph_games_proto/fns.py,sha256=xzSeQYeahx_uSrtHTJe39hKi3Yr62nbP8TqSfLI8hqo,193768
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.2035.dist-info/METADATA,sha256=k38aDe-Rv5buIekgLRJ7AAbgCMT-Taw6WjZSnNehyAQ,188
-graph_games_proto-0.3.2035.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.2035.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.2035.dist-info/RECORD,,
+graph_games_proto-0.3.2039.dist-info/METADATA,sha256=grOQHZLAL8ZQuABz0vYugwNOAcBE15jFo58975fsJi0,188
+graph_games_proto-0.3.2039.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.2039.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.2039.dist-info/RECORD,,