graph-games-proto 0.3.1879__py3-none-any.whl → 0.3.1883__py3-none-any.whl

graph_games_proto/fns.py

@@ -1960,7 +1960,6 @@ class State(PClass):
     decks = field(type=list)  # List[Deck]
     game_config = field(type=GameConfig)
     rng = field(type=random.Random)
-    terminal = field(type=bool)
     last_to_play = field(type=(int, type(None)), initial=None)
     winners = field(type=list)  # List[int]
     def __todict__(self):
@@ -1992,7 +1991,6 @@ class State(PClass):
             "decks": [deck.__todict__() for deck in self.decks],
             "game_config": self.game_config.__todict__(),
             "rng": rng2json(self.rng),
-            "terminal": self.terminal,
             "last_to_play": self.last_to_play,
             "winners": self.winners,
         }
@@ -2026,7 +2024,6 @@ class State(PClass):
             decks=[Deck.__fromdict__(deck) for deck in d["decks"]],
             game_config=GameConfig.__fromdict__(d["game_config"]),
             rng=json2rng(d["rng"]),
-            terminal=d["terminal"],
             last_to_play=d.get("last_to_play"),
             winners=d["winners"],
         )
@@ -2361,7 +2358,7 @@ def autoplay(seed, fig, num_players, policy, log=False):
     actions = []
     try:
 
-        while not s.terminal:
+        while not isterminal(s):
             if log:
                 printstate(s)
             a = getnextaction(s, policy)
@@ -2605,7 +2602,6 @@ def getinitialstate(game_config):
         rng=rng,
         last_to_play=None,
         winners=[],
-        terminal=False,
     )
 
     state = run_state_hooks(state, INITIALIZATION_HOOKS, True)
@@ -2721,7 +2717,7 @@ def getfinalscores(game):
 
 
 def handle_calc_winners(game):
-    if game.terminal:
+    if isterminal(game):
         players_with_highest_score = []
         highest_score = -1000
         final_scores = getfinalscores(game)
@@ -4032,7 +4028,7 @@ def getnextstate2(s, a, log=False):
 
 
 def getpublicplayerscore(s, player_score):
-    if s.terminal:
+    if isterminal(s):
         # Join the arrays of public and private items
         items = player_score.public_items + player_score.private_items
     else:
@@ -4106,7 +4102,7 @@ def get_deadline(s, max_allotted_time):
 
 
 def get_deadlines(s):
-    if s.terminal:
+    if isterminal(s):
         return [None for _ in range(s.game_config.num_players)]
     return [
         get_deadline(s, max_alloted_time)
@@ -4191,7 +4187,6 @@ def imagine_state(public_state, private_state):
         edgeuuid2idx = public_state.edgeuuid2idx,
         edgetuple2uuid = public_state.edgetuple2uuid,
         regions = public_state.regions,
-        terminal = public_state.terminal,
         last_to_play = public_state.last_to_play,
         winners = public_state.winners,
         piles = public_state.piles,
@@ -4206,6 +4201,10 @@ def imagine_state(public_state, private_state):
     )
 
 
+def isterminal(s):
+    return len(s.legal_actions_2) > 0
+
+
 @dispatch(State)
 def getpublicstate(s):
     return PublicState(
@@ -4230,7 +4229,7 @@ def getpublicstate(s):
         players=[getpublicplayer(s, p) for p in s.players],
         last_to_play=s.last_to_play,
         winners=s.winners,
-        terminal=s.terminal,
+        terminal=isterminal(s),
     )
 
 
@@ -4462,43 +4461,7 @@ def get_goals(s, player_idx):
         goaluuid2goal[goal_uuid] for goal_uuid in goal_uuids if goal_uuid in goaluuid2goal
     ]
 
-# @dispatch(AltState, RouteDiscardAction)
-# def gettoplay(s, action_type):
-#     return [1]
 
-
-# @dispatch(AltState, DrawUnitDeckAction)
-# def gettoplay(s, action_type):
-#     return [2]
-
-# Implementing the following Julia function:
-# function getlegalactions(s::State, player_idx::Int)
-#     # Causal function chain: gettoplay => getlegalactions =>  isterminal
-#     if s.terminal
-#         return []
-#     end
-#     if !in(player_idx, gettoplay(s))
-#         return []
-#     end
-#     getlegalactionsforplayer(s::State, player_idx, getrepeatplayerkey(s, player_idx), getlastactionkey(s))
-# end
-@dispatch(State, int)
-def getlegalactionspecs(s, player_idx):
-    # Causal function chain: gettoplay => getlegalactions =>  isterminal
-    if s.terminal:
-        return []
-    if player_idx not in gettoplay(s):
-        return []
-    return getlegalactionspecsforplayer(s, player_idx, getrepeatplayerbooltype(s, player_idx), getlastactiontype(s))
-
-# Implementing the following Julia function:
-# function getrepeatplayerkey(s::State, player_idx)
-#     last_action = getlastaction(s)
-#     if isnothing(last_action)
-#         return Val(false)
-#     end
-#     Val(player_idx == last_action.player_idx)
-# end
 def getrepeatplayerbooltype(s, player_idx):
     pass
 
@@ -4803,28 +4766,6 @@ def getunavailablepoints(s):
     return unavailable_points
 
 
-# Implementing the following Julia function:
-# function calcwinners(s::State)
-#     if !s.terminal
-#         return s
-#     end
-#     s = calcfinalscores(s)
-#     player_scores = [p.final_score for p in s.player_hands]
-#     max_score = maximum([p.total for p in player_scores])
-#     @reset s.winners = [h.player_idx for h in s.player_hands if h.final_score.total == max_score]
-#     s
-# end
-@dispatch(State)
-def calcwinners(s):
-    if not s.terminal:
-        return s
-    s = calcfinalscores(s)
-    player_scores = [p.final_score for p in s.player_hands]
-    max_score = max([p.total for p in player_scores])
-    winners = [h.player_idx for h in s.player_hands if h.final_score.total == max_score]
-    return s.set(winners=winners)
-
-
 def printplayer(s, player_idx):
     pass
 
@@ -4881,31 +4822,6 @@ def getvalidspotnums(s):
     return [n for n in range(1, len(s.faceup_spots) + 1) if s.faceup_spots[n-1] is not None]
 
 
-# Implementing the following Julia function:
-# function getlegalactions(s::State)
-#     getlegalactions(s, gettoplay(s))
-# end
-@dispatch(State)
-def getlegalactionspecs(s):
-    return getlegalactionspecs(s, gettoplay(s))
-
-
-# Implementing the following Julia function:
-# function getlegalactions(s::State, player_idxs::Vector{Int})
-#     legal_actions = []
-#     for player_idx in player_idxs
-#         append!(legal_actions, getlegalactions(s, player_idx))
-#     end
-#     legal_actions
-# end
-@dispatch(State, list)
-def getlegalactionspecs(s, player_idxs):
-    legal_actions = []
-    for player_idx in player_idxs:
-        legal_actions.extend(getlegalactionspecs(s, player_idx))
-    return legal_actions
-
-
 def json_serializer(obj):
     if isinstance(obj, set):
         return list(obj)
@@ -4961,7 +4877,7 @@ def json2rng(json_str):
 @dispatch(State, int)
 def getprivatestate(s, player_idx):
     return PrivateState(
-        my_history=[a for a in s.history if a.player_idx == player_idx],
+        my_history=[a for a in s.history if a.legal_action.player_idx == player_idx],
         player_score=getprivateplayerscore(s, s.player_scores[player_idx]),
         player=s.players[player_idx],
         legal_actions_2 = get_legal_actions(s, player_idx),
@@ -5170,7 +5086,7 @@ def getqproxy0(ps, a, td):
 
     def qproxybase():
         next_s, rewards = imagine_dynamics(ps, a)
-        if next_s.terminal:
+        if isterminal(next_s):
             return rewards
         v_proxies = [
             getvproxy0(getprivatestate(next_s, i))
@@ -5184,7 +5100,7 @@ def getqproxy0(ps, a, td):
 
     def qproxyrecurse():
         next_s, rewards = imagine_dynamics(ps, a)
-        if next_s.terminal:
+        if isterminal(next_s):
             return rewards
         next_p_idx = get_default_toplay(next_s)
         next_ps = getprivatestate(next_s, next_p_idx)

{graph_games_proto-0.3.1879.dist-info → graph_games_proto-0.3.1883.dist-info}/METADATA

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

{graph_games_proto-0.3.1879.dist-info → graph_games_proto-0.3.1883.dist-info}/RECORD

@@ -1,9 +1,9 @@
 graph_games_proto/__init__.py,sha256=6JU5hcSKyQZsznafiC7ai9i-fa9U3EkuSCsWTKcKacw,655
 graph_games_proto/all_types.py,sha256=IpbwftEcHS5Ewz-saFNk0lO9FvcbuHG36odRTayCXUk,54911
-graph_games_proto/fns.py,sha256=S6fm3DR2C-Oirg2Jn_tdejq16yiYqny2LdYmiOB1K28,184052
+graph_games_proto/fns.py,sha256=wges3b5aBKcXAU2NQE68QWiWtOVwTMSoKKFQgSlIc3k,181331
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1879.dist-info/METADATA,sha256=azdf6XC2xVJZuIb_OG7CWmwNDmnVmLGviQfVK3XGuIk,188
-graph_games_proto-0.3.1879.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1879.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1879.dist-info/RECORD,,
+graph_games_proto-0.3.1883.dist-info/METADATA,sha256=2x2rCMRSdtA1BpkE5dvnh8KHN8RWrUBrjWsR7J38LKI,188
+graph_games_proto-0.3.1883.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1883.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1883.dist-info/RECORD,,