graph-games-proto 0.3.1699__py3-none-any.whl → 0.3.1701__py3-none-any.whl

graph_games_proto/fns.py

@@ -2003,16 +2003,19 @@ class Segment2(PClass):
 
 
 class Path2(PClass):
+    uuid = field(type=str)
     idx = field(type=int)
     segments = field(type=list)  # List[Segment]
     def __todict__(self):
         return {
+            "uuid": self.uuid,
             "idx": self.idx,
             "segments": [segment.__todict__() for segment in self.segments],
         }
     @staticmethod
     def __fromdict__(d):
         return Path2(
+            uuid=d["uuid"],
             idx=d["idx"],
             segments=[Segment2.__fromdict__(segment) for segment in d["segments"]],
         )
@@ -2148,6 +2151,9 @@ class BonusStatus(PClass):
 
 
 class State(PClass):
+    uuid2edge = field(type=dict)  # Dict[str, BiEdge]
+    uuid2path = field(type=dict)  # Dict[str, Path2]
+    uuid2segment = field(type=dict)  # Dict[str, Segment]
     pieceuuid2piece = field(type=dict)  # Dict[str, Piece]
     carduuid2card = field(type=dict)  # Dict[str, Card]
     final_scores = field(type=(list, type(None)), initial=None)  # Optional[List[int]]
@@ -2189,6 +2195,9 @@ class State(PClass):
     # market_refills::Vector{MarketRefill}
     def __todict__(self):
         return {
+            "uuid2edge": {k: v.__todict__() for k, v in self.uuid2edge.items()},
+            "uuid2path": {k: v.__todict__() for k, v in self.uuid2path.items()},
+            "uuid2segment": {k: v.__todict__() for k, v in self.uuid2segment.items()},
             "pieceuuid2piece": {k: v.__todict__() for k, v in self.pieceuuid2piece.items()},
             "carduuid2card": {k: v.__todict__() for k, v in self.carduuid2card.items()},
             "final_scores": self.final_scores,
@@ -2231,6 +2240,9 @@ class State(PClass):
     @staticmethod
     def __fromdict__(d):
         return State(
+            uuid2edge={k: BiEdge.__fromdict__(v) for k, v in d["uuid2edge"].items()},
+            uuid2path={k: Path2.__fromdict__(v) for k, v in d["uuid2path"].items()},
+            uuid2segment={k: Segment2.__fromdict__(v) for k, v in d["uuid2segment"].items()},
             pieceuuid2piece={k: Piece.__fromdict__(v) for k, v in d["pieceuuid2piece"].items()},
             carduuid2card={k: Card.__fromdict__(v) for k, v in d["carduuid2card"].items()},
             final_scores=d["final_scores"],
@@ -2688,7 +2700,7 @@ def get_nodes(board_config):
     return []
 
 
-def get_edges(board_config, nodeuuid2idx):
+def get_edges(rng, board_config, nodeuuid2idx):
     edges = []
     
 
@@ -2703,7 +2715,7 @@ def get_edges(board_config, nodeuuid2idx):
             segments = [
                 Segment2(uuid=s.uuid, pieces=[]) for s in matching_board_path.path.segments
             ]
-            path = Path2(idx=path_idx, segments=segments)
+            path = Path2(uuid=str(generate_uuid_with_rng(rng)), idx=path_idx, segments=segments)
             paths.append(path)
         
         if len(paths) == 0:
@@ -2848,7 +2860,7 @@ def getinitialstate(game_config):
         decks.append(deck_obj)
 
     nodeuuid2idx = {node.uuid: idx for idx, node in enumerate(board_config.points)}
-    edges = get_edges(board_config, nodeuuid2idx)
+    edges = get_edges(rng, board_config, nodeuuid2idx)
     edgeuuid2idx = {edge.uuid: idx for idx, edge in enumerate(edges)}
     edgetuple2uuid = {}
     for edge in edges:
@@ -2857,6 +2869,18 @@ def getinitialstate(game_config):
         edge_tuple = (min(node_1_idx, node_2_idx), max(node_1_idx, node_2_idx))
         edgetuple2uuid[edge_tuple] = edge.uuid
 
+
+    uuid2edge = {}
+    uuid2path = {}
+    uuid2segment = {}
+    
+    for edge in edges:
+        uuid2edge[edge.uuid] = edge
+        for path in edge.paths:
+            uuid2path[path.uuid] = path
+            for segment in path.segments:
+                uuid2segment[segment.uuid] = segment
+
     bonuses = game_config.fig.board_config.bonuses
     bonusuuid2bonusidx = {bonus.uuid: idx for idx, bonus in enumerate(bonuses)}
     bonus_statuses = [
@@ -2876,6 +2900,9 @@ def getinitialstate(game_config):
     ]
 
     state = State(
+        uuid2edge=uuid2edge,
+        uuid2path=uuid2path,
+        uuid2segment=uuid2segment,
         pieceuuid2piece=pieceuuid2piece,
         carduuid2card=carduuid2card,
         final_scores=None,
@@ -3864,7 +3891,7 @@ def append_default_legal_actions_for_next_player(game, action, log=False):
 
 
 def get_total_path_count(game):
-    return sum(len(edge.paths) for edge in game.edges)
+    return len(game.uuid2path.values())
 
 
 def get_legal_actions_for_path(game, player_idx, path_idx):
@@ -3873,9 +3900,6 @@ def get_legal_actions_for_path(game, player_idx, path_idx):
     
     if not is_path_open_to_player(game, path_idx, player_idx):
         return []
-    
-    # TODO check if player has enough pieces to claim the path
-    player_pieces = game.players[player_idx].pieces
 
     legal_actions = []
     default = get_sample_actionclaimpath(game, player_idx, path_idx)
@@ -3914,11 +3938,13 @@ def get_legal_actions_for_paths(game, player_idx):
 
 
 def is_path_open_to_player(game, path_idx, player_idx):
-    # TODO check if player has enough pieces to claim the path
 
     if not game or path_idx < 0 or path_idx >= get_total_path_count(game):
         return False
     
+    # Check if edge is too crowded for the number of players
+    
+    
     # Check if any segment of the path has pieces from any player
     path = get_path_by_idx(game, path_idx)
     if path.segments[0].pieces:
@@ -7073,7 +7099,7 @@ def get_imagined_state(static_board_config, player_state):
 
 
     nodeuuid2idx = {node.uuid: idx for idx, node in enumerate(board_config.points)}
-    edges = get_edges(board_config, nodeuuid2idx)
+    edges = get_edges(rng, board_config, nodeuuid2idx)
     edgeuuid2idx = {edge.uuid: idx for idx, edge in enumerate(edges)}
     edgetuple2uuid = {}
     for edge in edges:
@@ -7087,7 +7113,7 @@ def get_imagined_state(static_board_config, player_state):
         player_graphs = [],
         nodes = get_nodes(board_config),
         nodeuuid2idx = nodeuuid2idx,
-        edges = get_edges(board_config, nodeuuid2idx),
+        edges = edges,
         edgeuuid2idx = edgeuuid2idx,
         edgetuple2uuid = edgetuple2uuid,
         regions = get_regions(board_config),

{graph_games_proto-0.3.1699.dist-info → graph_games_proto-0.3.1701.dist-info}/METADATA

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

{graph_games_proto-0.3.1699.dist-info → graph_games_proto-0.3.1701.dist-info}/RECORD

@@ -1,9 +1,9 @@
 graph_games_proto/__init__.py,sha256=LOpk1mGZxPWMRGrPNoXDENn7JPG6rNfhieehItW8bEA,881
 graph_games_proto/all_types.py,sha256=IpbwftEcHS5Ewz-saFNk0lO9FvcbuHG36odRTayCXUk,54911
-graph_games_proto/fns.py,sha256=_1TSlhRwtpwLbk5bHKrLPv_sHHSbWPCBwJ50kezzw6g,263497
+graph_games_proto/fns.py,sha256=VhyabYcA34Oo4QNUHLPVXCnf050jj3PI3pP1IYz6-aU,264543
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1699.dist-info/METADATA,sha256=BKDzvlucWgKvaWmzobi-y_mAVwUULSKpMR6JoQHDFD4,188
-graph_games_proto-0.3.1699.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1699.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1699.dist-info/RECORD,,
+graph_games_proto-0.3.1701.dist-info/METADATA,sha256=72HOO9KiT8Eg17THvFR0FNTXLo1WL2JjD_6FN64m_gE,188
+graph_games_proto-0.3.1701.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1701.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1701.dist-info/RECORD,,