graph-games-proto 0.3.1983__py3-none-any.whl → 0.3.1989__py3-none-any.whl

graph_games_proto/fns.py

@@ -1950,6 +1950,9 @@ class StateKernel(PClass):
     nodeuuid2idx = field(type=dict)  # Dict[str, int]
     carduuid2deckidx = field(type=dict)  # Dict[str, int]
     bonusuuid2bonusidx = field(type=dict)  # Dict[str, int]
+    starting_decks = field(type=list)  # List[Deck]
+    starting_piles = field(type=list) # List[Pile]
+    goals = field(type=list)  # List[FrozenGoal]
     def __todict__(self):
         return {
             "rng": rng2json(self.rng),
@@ -1969,6 +1972,9 @@ class StateKernel(PClass):
             "nodeuuid2idx": self.nodeuuid2idx,
             "carduuid2deckidx": self.carduuid2deckidx,
             "bonusuuid2bonusidx": self.bonusuuid2bonusidx,
+            "starting_decks": [deck.__todict__() for deck in self.starting_decks],
+            "starting_piles": [pile.__todict__() for pile in self.starting_piles],
+            "goals": [goal.__todict__() for goal in self.goals],
         }
     @staticmethod
     def __fromdict__(d):
@@ -1990,6 +1996,9 @@ class StateKernel(PClass):
             nodeuuid2idx=d["nodeuuid2idx"],
             carduuid2deckidx=d["carduuid2deckidx"],
             bonusuuid2bonusidx=d["bonusuuid2bonusidx"],
+            starting_decks=[Deck.__fromdict__(x) for x in d["starting_decks"]],
+            starting_piles=[Pile.__fromdict__(x) for x in d["starting_piles"]],
+            goals=[FrozenGoal.__fromdict__(goal) for goal in d["goals"]],
         )
 
 
@@ -2049,42 +2058,46 @@ def init_state_kernel(**kwargs):
         edgetuple2uuid=edgetuple2uuid,
         nodeuuid2idx=nodeuuid2idx,
         carduuid2deckidx=carduuid2deckidx,
-        bonusuuid2bonusidx=bonusuuid2bonusidx
+        bonusuuid2bonusidx=bonusuuid2bonusidx,
+        starting_decks=kwargs.get('starting_decks'),
+        starting_piles=kwargs.get('starting_piles'),
+        goals=kwargs.get('goals'),
     )
 
 
 class State(PClass):
+    # Identity
     kernel = field(type=StateKernel)
-    idx2path = field(type=list)  # List[Path2]
-    bonus_statuses = field(type=list)  # List[BonusStatus]
-    starting_decks = field(type=list)  # List[Deck]
-    starting_piles = field(type=list)
     history = field(type=list)  # List[Action2]
-    player_scores = field(type=list)  # List[PlayerScore2]
-    player_graphs = field(type=list)  # List[PlayerGraph]
-    goals = field(type=list)  # List[Goal]
+    players = field(type=list)  # List[Player]
     nodes = field(type=list)  # List[Node]
     edges = field(type=list)  # List[BiEdge]
     regions = field(type=list)  # List[Region]
-    legal_actions_3 = field(type=list)  # List[LegalAction]
     piles = field(type=list)  # List[Pile]
-    players = field(type=list)  # List[Player]
+    last_to_play = field(type=(int, type(None)), initial=None)
+    
+    idx2path = field(type=list)  # List[Path2]
+
+    # Scoring
     player_idxs = field(type=list)  # List[int]
     decks = field(type=list)  # List[Deck]
     rng = field(type=random.Random)
-    last_to_play = field(type=(int, type(None)), initial=None)
+    
+    # Memoized
+    player_graphs = field(type=list)  # List[PlayerGraph]
+    legal_actions_3 = field(type=list)  # List[LegalAction]
+    player_scores = field(type=list)  # List[PlayerScore2]
+    bonus_statuses = field(type=list)  # List[BonusStatus]
     winners = field(type=list)  # List[int]
+
     def __todict__(self):
         return {
             "kernel": self.kernel.__todict__(),
             "idx2path": [v.__todict__() for v in self.idx2path],
             "bonus_statuses": [status.__todict__() for status in self.bonus_statuses],
-            "starting_decks": [deck.__todict__() for deck in self.starting_decks],
-            "starting_piles": [pile.__todict__() for pile in self.starting_piles],
             "history": [x.__todict__() for x in self.history],
             "player_scores": [x.__todict__() for x in self.player_scores],
             "player_graphs": [x.__todict__() for x in self.player_graphs],
-            "goals": [goal.__todict__() for goal in self.goals],
             "nodes": [node.__todict__() for node in self.nodes],
             "edges": [edge.__todict__() for edge in self.edges],
             "regions": [region.__todict__() for region in self.regions],
@@ -2103,12 +2116,9 @@ class State(PClass):
             kernel=StateKernel.__fromdict__(d["kernel"]),
             idx2path=[Path2.__fromdict__(v) for v in d["idx2path"]],
             bonus_statuses=[BonusStatus.__fromdict__(x) for x in d["bonus_statuses"]],
-            starting_decks=[Deck.__fromdict__(x) for x in d["starting_decks"]],
-            starting_piles=[Pile.__fromdict__(x) for x in d["starting_piles"]],
             history=[Action2.__fromdict__(x) for x in d["history"]],
             player_scores=[PlayerScore2.__fromdict__(x) for x in d["player_scores"]],
             player_graphs=[PlayerGraph.__fromdict__(x) for x in d["player_graphs"]],
-            goals=[FrozenGoal.__fromdict__(goal) for goal in d["goals"]],
             nodes=[Node.__fromdict__(n) for n in d["nodes"]],
             edges=[BiEdge.__fromdict__(e) for e in d["edges"]],
             regions=[Region.__fromdict__(r) for r in d["regions"]],
@@ -2637,16 +2647,13 @@ def getinitialstate(game_config):
         ) 
         for bonus in bonuses
     ]
+    
+    starting_decks=[Deck.__fromdict__(x.__todict__()) for x in decks]
+    starting_piles=[Pile.__fromdict__(x.__todict__()) for x in piles]
 
     state = State(
         idx2path=idx2path,
         bonus_statuses=bonus_statuses,
-        starting_decks=[
-            Deck.__fromdict__(x.__todict__()) for x in decks
-        ],
-        starting_piles=[
-            Pile.__fromdict__(x.__todict__()) for x in piles
-        ],
         history=[],
         player_scores=[PlayerScore2(public_items=[], private_items=[]) for _ in range(game_config.num_players)],
         player_graphs=[
@@ -2655,7 +2662,6 @@ def getinitialstate(game_config):
                 neighbors=[[] for _ in range(len(nodes))]
             ) for player_idx in range(game_config.num_players)
         ],
-        goals = board_config.goals,
         nodes = nodes,
         edges = edges,
         regions = get_regions(board_config),
@@ -2681,6 +2687,9 @@ def getinitialstate(game_config):
         player_idxs=state.player_idxs,
         history=state.history,
         player_scores=state.player_scores,
+        starting_decks=starting_decks,
+        starting_piles=starting_piles,
+        goals=board_config.goals,
     )
 
     state = state.set(kernel=kernel)
@@ -2752,10 +2761,11 @@ def score_public_items(state, player_idx):
     return items
 
 
-def score_private_items(game, player_idx):
+@dispatch(State, int)
+def score_private_items(state, player_idx):
     items = []
-    goaluuid2goal = {goal.uuid: goal for goal in game.goals}
-    goal_completions = get_goal_completions(game, player_idx)
+    goaluuid2goal = {goal.uuid: goal for goal in state.kernel.goals}
+    goal_completions = get_goal_completions(state, player_idx)
     complete_goal_uuids = [gc.goal_uuid for gc in goal_completions if gc.complete]
     incomplete_goal_uuids = [gc.goal_uuid for gc in goal_completions if not gc.complete]
     for complete_goal_uuid in complete_goal_uuids:
@@ -4101,6 +4111,9 @@ def getnextstate2(s, a, log=False):
         player_idxs=s.player_idxs,
         history=s.history,
         player_scores=s.player_scores,
+        starting_decks=s.kernel.starting_decks,
+        starting_piles=s.kernel.starting_piles,
+        goals=s.kernel.goals,
     )
     s = s.set(legal_actions_3=calc_legal_actions3(state_kernel))
 
@@ -4272,8 +4285,8 @@ def getpublicstate(s):
         all_pieces=list(s.kernel.pieceuuid2piece.values()),
         to_play_2=getpublictoplay(s),
         bonus_statuses=s.bonus_statuses,
-        starting_decks=s.starting_decks,
-        starting_piles=s.starting_piles,
+        starting_decks=s.kernel.starting_decks,
+        starting_piles=s.kernel.starting_piles,
         history=get_public_history(s),
         player_scores=get_public_player_scores(s),
         player_graphs=s.player_graphs,
@@ -4506,9 +4519,10 @@ def get_player_graph(s, player_idx):
     return nodes
 
 
+@dispatch(State, int)
 def get_goals(s, player_idx):
     player = s.players[player_idx]
-    goaluuid2goal = {goal.uuid: goal for goal in s.goals}
+    goaluuid2goal = {goal.uuid: goal for goal in s.kernel.goals}
     goal_uuids = [s.kernel.carduuid2card[card_uuid].goal_uuid for card_uuid in player.cards if s.kernel.carduuid2card[card_uuid].goal_uuid]
     return [
         goaluuid2goal[goal_uuid] for goal_uuid in goal_uuids if goal_uuid in goaluuid2goal

{graph_games_proto-0.3.1983.dist-info → graph_games_proto-0.3.1989.dist-info}/METADATA

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

{graph_games_proto-0.3.1983.dist-info → graph_games_proto-0.3.1989.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=yB1kxoIYiYt6D_Xx9A6Vp6CVTPe3m30M3GDVULVF7SI,182235
+graph_games_proto/fns.py,sha256=I5TKswJWFPFWBORV9VOArGWBlXgUW3GXb-1GP0HVhxE,182680
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1983.dist-info/METADATA,sha256=GbtVYo6tdOH0n-whQiol1hXhN0SOA3khUr8SuSk-SAQ,188
-graph_games_proto-0.3.1983.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1983.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1983.dist-info/RECORD,,
+graph_games_proto-0.3.1989.dist-info/METADATA,sha256=Mv0DRZjDx42RK5lO5oFiwkJofNq6YmNqokhkaH2rwVA,188
+graph_games_proto-0.3.1989.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1989.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1989.dist-info/RECORD,,