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

graph_games_proto/fns.py

@@ -2066,8 +2066,16 @@ def init_state_kernel(**kwargs):
 
 
 class State(PClass):
-    # Identity
     kernel = field(type=StateKernel)
+
+    # Identity: these fields should be in the kernel (set once at the start of the game and never changes)
+    rng = field(type=random.Random)
+
+    # Identity: these fields should be in the kernel (can only be changed in "get_initial_state")
+    player_idxs = field(type=list)  # List[int]
+
+    # Identity - these fields should be in the kernel (can only be changed in "get_initial_state" and "get_next_state")
+    # The struture should be this: uuid2segment, uuid2edge, uuid2path, uuid2region, uuid2node
     history = field(type=list)  # List[Action2]
     players = field(type=list)  # List[Player]
     nodes = field(type=list)  # List[Node]
@@ -2075,14 +2083,11 @@ class State(PClass):
     regions = field(type=list)  # List[Region]
     piles = field(type=list)  # List[Pile]
     last_to_play = field(type=(int, type(None)), initial=None)
+    decks = field(type=list)  # List[Deck]
     
+    # Not sure yet
     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)
-    
     # Memoized
     player_graphs = field(type=list)  # List[PlayerGraph]
     legal_actions_3 = field(type=list)  # List[LegalAction]
@@ -4073,7 +4078,11 @@ def get_next_player_shuffled_idx(state_kernel, last_action):
 
 
 def init_state(kernel):
-    state = State(
+
+    legal_actions_3 = calc_legal_actions3(kernel)
+
+    return State(
+        kernel=kernel,
         rng=kernel.rng,
         game_config=kernel.game_config,
         edges=kernel.edges,
@@ -4083,13 +4092,11 @@ def init_state(kernel):
         player_idxs=kernel.player_idxs,
         history=kernel.history,
         player_scores=kernel.player_scores,
-        legal_actions_3=[],
         is_terminal=False,
         idx2path=kernel.idx2path,
         carduuid2card=kernel.carduuid2card,
+        legal_actions_3=legal_actions_3,
     )
-    state = state.set(legal_actions_3=calc_legal_actions3(kernel))
-    return state
 
 
 def getnextstate2(s, a, log=False):
@@ -4257,7 +4264,7 @@ def imagine_decks(public_state, private_state):
 
 
 def imagine_state(public_state, private_state):
-    kernel = init_state_kernel(
+    imagined_kernel = init_state_kernel(
         rng=random.Random(),
         game_config=public_state.game_config,
         player_idxs=public_state.player_idxs,
@@ -4268,8 +4275,7 @@ def imagine_state(public_state, private_state):
         history=imagine_history(public_state, private_state),
         player_scores=imagine_player_scores(public_state, private_state),
     )
-    imagined_state = init_state(kernel)
-    return imagined_state
+    return init_state(imagined_kernel) 
 
 
 def isterminal(s):
@@ -4290,7 +4296,7 @@ def getpublicstate(s):
         history=get_public_history(s),
         player_scores=get_public_player_scores(s),
         player_graphs=s.player_graphs,
-        goals=s.goals,
+        goals=s.kernel.goals,
         nodes=s.nodes,
         edges=s.edges,
         regions=s.regions,

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

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

{graph_games_proto-0.3.1989.dist-info → graph_games_proto-0.3.1991.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=I5TKswJWFPFWBORV9VOArGWBlXgUW3GXb-1GP0HVhxE,182680
+graph_games_proto/fns.py,sha256=6Ige7fQpiwFfp_8hs0Y8UigGukPcZikTOlvqUH9SFnI,183080
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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,,
+graph_games_proto-0.3.1991.dist-info/METADATA,sha256=yRJWt5u49G0lNdYHF4reIbt_djNo4HoYPH61eCrd_SU,188
+graph_games_proto-0.3.1991.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1991.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1991.dist-info/RECORD,,