graph-games-proto 0.3.1934__py3-none-any.whl → 0.3.1937__py3-none-any.whl

graph_games_proto/fns.py

@@ -16,7 +16,7 @@ from itertools import combinations as itertools_combinations, chain
 from collections import deque
 
 DEFAULT_ALLOTTED_SECONDS = 12
-INITIAL_ALLOTTED_SECONDS = 120
+INITIAL_ALLOTTED_SECONDS = 22
 
 class NoAction(PClass):
     pass
@@ -1946,6 +1946,7 @@ class StateKernal(PClass):
     pieceuuid2piece = field(type=dict)  # Dict[str, Piece]
     edgeuuid2idx = field(type=dict)  # Dict[str, int]
     carduuid2card = field(type=dict)  # Dict[str, Card]
+    edgetuple2uuid = field(type=dict)  # Dict[Tuple[int, int], str]
     def __todict__(self):
         return {
             "rng": rng2json(self.rng),
@@ -1961,6 +1962,7 @@ class StateKernal(PClass):
             "pieceuuid2piece": {k: v.__todict__() for k, v in self.pieceuuid2piece.items()},
             "edgeuuid2idx": self.edgeuuid2idx,
             "carduuid2card": {k: v.__todict__() for k, v in self.carduuid2card.items()},
+            "edgetuple2uuid": [{"k": list(k), "v": v} for k, v in self.edgetuple2uuid.items()],
         }
     @staticmethod
     def __fromdict__(d):
@@ -1978,10 +1980,12 @@ class StateKernal(PClass):
             pieceuuid2piece={k: Piece.__fromdict(v) for k, v in d["pieceuuid2piece"].items()},
             edgeuuid2idx=d["edgeuuid2idx"],
             carduuid2card={k: Card.__fromdict(v) for k, v in d["carduuid2card"].items()},
+            edgetuple2uuid={tuple(item["k"]): item["v"] for item in d["edgetuple2uuid"]},
         )
 
 
 def init_state_kernel(**kwargs):
+    rng = kwargs.get('rng')
     game_config = kwargs.get('game_config')
     fig = game_config.fig
     board_config = fig.board_config
@@ -2003,9 +2007,18 @@ def init_state_kernel(**kwargs):
         cards = generate_cards(dek)
         for card in cards:
             carduuid2card[card.uuid] = card
+
+    nodeuuid2idx = {node.uuid: idx for idx, node in enumerate(board_config.points)}
+    edges = get_edges(rng, board_config, nodeuuid2idx)
+    edgetuple2uuid = {}
+    for edge in edges:
+        node_1_idx = nodeuuid2idx[edge.node_1_uuid]
+        node_2_idx = nodeuuid2idx[edge.node_2_uuid]
+        edge_tuple = (min(node_1_idx, node_2_idx), max(node_1_idx, node_2_idx))
+        edgetuple2uuid[edge_tuple] = edge.uuid
     
     return StateKernal(
-        rng=kwargs.get('rng'),
+        rng=rng,
         game_config=game_config,
         edges=edges,
         decks=kwargs.get('decks'),
@@ -2018,6 +2031,7 @@ def init_state_kernel(**kwargs):
         edgeuuid2idx=edgeuuid2idx,
         carduuid2card=carduuid2card,
         pieceuuid2piece=pieceuuid2piece,
+        edgetuple2uuid=edgetuple2uuid,
     )
 
 
@@ -2037,7 +2051,6 @@ class State(PClass):
     nodes = field(type=list)  # List[Node]
     nodeuuid2idx = field(type=dict)  # Dict[str, int]
     edges = field(type=list)  # List[BiEdge]
-    edgetuple2uuid = field(type=dict)  # Dict[Tuple[int, int], str]
     regions = field(type=list)  # List[Region]
     legal_actions_3 = field(type=list)  # List[LegalAction]
     piles = field(type=list)  # List[Pile]
@@ -2065,7 +2078,6 @@ class State(PClass):
             "nodes": [node.__todict__() for node in self.nodes],
             "nodeuuid2idx": self.nodeuuid2idx,
             "edges": [edge.__todict__() for edge in self.edges],
-            "edgetuple2uuid": [{"k": list(k), "v": v} for k, v in self.edgetuple2uuid.items()],
             "regions": [region.__todict__() for region in self.regions],
             "legal_actions_3": [x.__todict__() for x in self.legal_actions_3],
             "piles": [pile.__todict__() for pile in self.piles],
@@ -2095,7 +2107,6 @@ class State(PClass):
             nodes=[Node.__fromdict__(n) for n in d["nodes"]],
             nodeuuid2idx=d["nodeuuid2idx"],
             edges=[BiEdge.__fromdict__(e) for e in d["edges"]],
-            edgetuple2uuid={tuple(item["k"]): item["v"] for item in d["edgetuple2uuid"]},
             regions=[Region.__fromdict__(r) for r in d["regions"]],
             legal_actions_3=[LegalAction.__fromdict__(x) for x in d["legal_actions_3"]],
             piles=[Pile.__fromdict__(p) for p in d["piles"]],
@@ -2603,12 +2614,6 @@ def getinitialstate(game_config):
 
     nodeuuid2idx = {node.uuid: idx for idx, node in enumerate(board_config.points)}
     edges = get_edges(rng, board_config, nodeuuid2idx)
-    edgetuple2uuid = {}
-    for edge in edges:
-        node_1_idx = nodeuuid2idx[edge.node_1_uuid]
-        node_2_idx = nodeuuid2idx[edge.node_2_uuid]
-        edge_tuple = (min(node_1_idx, node_2_idx), max(node_1_idx, node_2_idx))
-        edgetuple2uuid[edge_tuple] = edge.uuid
 
     idx2path = []
     
@@ -2658,7 +2663,6 @@ def getinitialstate(game_config):
         nodes = nodes,
         nodeuuid2idx = nodeuuid2idx,
         edges = edges,
-        edgetuple2uuid = edgetuple2uuid,
         regions = get_regions(board_config),
         legal_actions_3=[],
         piles=piles,
@@ -3193,7 +3197,7 @@ def calc_path_len_from_edges(game, edge_tuples):
         return 0
     edge_lens = []
     for edge_tuple in edge_tuples:
-        edge_uuid = game.edgetuple2uuid.get(edge_tuple)
+        edge_uuid = game.kernel.edgetuple2uuid.get(edge_tuple)
         edge_idx = game.edgeuuid2idx.get(edge_uuid)
         if edge_idx is not None:
             edge = game.edges[edge_idx]

{graph_games_proto-0.3.1934.dist-info → graph_games_proto-0.3.1937.dist-info}/METADATA

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

{graph_games_proto-0.3.1934.dist-info → graph_games_proto-0.3.1937.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=VGAFpUF4NHnQqnuLNYIc9EfNumKx49IKvg7a-8eQEDo,182032
+graph_games_proto/fns.py,sha256=7Sub-734RnmdNZ2bR9r4b2dYjWdaTNcD8v6MxS6dBhQ,182190
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1934.dist-info/METADATA,sha256=06szQT5VQPzcO7sGenz5Ozo0sd32urAf2ydz9mBsNhU,188
-graph_games_proto-0.3.1934.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1934.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1934.dist-info/RECORD,,
+graph_games_proto-0.3.1937.dist-info/METADATA,sha256=L7F7-8wAqBVh6XrujYeaukSL2Lcn_xTOHKdVhDknwoQ,188
+graph_games_proto-0.3.1937.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1937.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1937.dist-info/RECORD,,