algorhino-anemone 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

{algorhino_anemone-0.1.2.dist-info → algorhino_anemone-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: algorhino-anemone
-Version: 0.1.2
+Version: 0.1.3
 Summary: anemone searches trees
 Author-email: Victor Gabillon <victorgabillon@gmail.com>
 License-Expression: GPL-3.0-only
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: valanga
-Requires-Dist: atomheart
+Requires-Dist: valanga>=0.1.4
+Requires-Dist: atomheart>=0.1.2
 Requires-Dist: rich
 Requires-Dist: sortedcollections>=2.1.0
 Requires-Dist: graphviz

{algorhino_anemone-0.1.2.dist-info → algorhino_anemone-0.1.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
-algorhino_anemone-0.1.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+algorhino_anemone-0.1.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 anemone/__init__.py,sha256=iKX9OGJxbyIqe9Fy-xxZY6sdH7WcG4RFyPR0WBai7Ls,942
-anemone/basics.py,sha256=jMKY9mFLbbMZ_xNvtBVlbZI_vP15rg2tUGUf9ZQ-9tw,1023
+anemone/basics.py,sha256=plCN-SfAcCj4TPDVD3r19Q36UFjiKmNvuEyPH0kQ7Qs,574
 anemone/factory.py,sha256=Nmx84UrSqED3R9891XoBTX56jKlINvZn4DLYduSbHgo,6020
 anemone/state_transition.py,sha256=fxvHZOYRtWV5ExXRIoehdRg9qV6zhgiE5uiCeOc80Dc,1418
-anemone/tree_and_value_branch_selector.py,sha256=bervTIx03h79g-Qu1npGpcA5YlSzZKRk0xA86l69jX4,3480
-anemone/tree_exploration.py,sha256=Fb6mNw0UxbaaFtbBAhxjjKJQbClbRPzhrEG2pWHQkjY,10378
+anemone/tree_and_value_branch_selector.py,sha256=7s_Tz3JeG0rFYfFLSEUegMSb-av7vKg_9jM2AANUbig,3474
+anemone/tree_exploration.py,sha256=cg1iTp3j9p9jUNjm07ogbflX8VC15AV8GEhGz3g1YNU,10529
 anemone/indices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anemone/indices/index_manager/__init__.py,sha256=P49ofGrnP_Nfmv63Rg_-Zvwn5NFvFFDQ3MD3GMeWNWw,515
 anemone/indices/index_manager/factory.py,sha256=Fti6PTnLOEg0g5cqqRBMsmGGNZw6uVFiKpjv0B766qE,1783
@@ -18,8 +18,8 @@ anemone/node_evaluation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 anemone/node_evaluation/node_direct_evaluation/__init__.py,sha256=2_YwJ3oe0KBfIc3Hs-FLz093RLZsTG-VaNmecLceoiY,898
 anemone/node_evaluation/node_direct_evaluation/factory.py,sha256=lpFmBJkIGAnar5-pQ1vMze9jUFKFchp5Pg2S8eK-ABM,470
 anemone/node_evaluation/node_direct_evaluation/node_direct_evaluator.py,sha256=jM-gkNeaOOXBXS4JNAAVeXJ5K2bAOppQwV7wpTBX1Ck,5787
-anemone/node_evaluation/node_tree_evaluation/node_minmax_evaluation.py,sha256=npqy9r7ZKHGMJsDhSY7bZZbRvakwoTyABpwQOVTQ-ww,35126
-anemone/node_evaluation/node_tree_evaluation/node_tree_evaluation.py,sha256=-fiuTO0nWKKiKWAdgFi-L8kKxIjH0A_0yeUKrp4fk34,4260
+anemone/node_evaluation/node_tree_evaluation/node_minmax_evaluation.py,sha256=KfU781UnaD9P2qibIKHXXnc8q7Rd2eJJl5NzKKsntsc,35126
+anemone/node_evaluation/node_tree_evaluation/node_tree_evaluation.py,sha256=x5fnbf6NhKGouBgU0rNVNSmusmNovbcnQ3eLH6JV7Ow,4260
 anemone/node_evaluation/node_tree_evaluation/node_tree_evaluation_factory.py,sha256=UY1glqflqMOqOPAHhtuzJ8QhGOp55Y9InqdhCMt9KJ8,1279
 anemone/node_factory/__init__.py,sha256=qhbX58hu8-TdFof5zo3ibfPFvF-OWNSgJf3RDMrtyTQ,553
 anemone/node_factory/algorithm_node_factory.py,sha256=eHsyZ6_no8i9ACfZV8VSKefV3kXiQHvdMNEighDn8Lc,3947
@@ -40,16 +40,16 @@ anemone/node_selector/sequool/sequool.py,sha256=NSGwIQk8KxD-TSzdw2LvFIOPUlNfQX8O
 anemone/node_selector/uniform/__init__.py,sha256=fRGC0FL_fnXXeNoj3QeMQmNoESrFfSDaiHp-zHpF_zw,366
 anemone/node_selector/uniform/uniform.py,sha256=Frxyik7Vx2-vF0CcMWclPqymj7XEl08nILtMv4Wjxj8,3745
 anemone/nodes/__init__.py,sha256=XWTr9wZGGX9XHp-bw3zjKfCVdKnNEgVGL1wFWW-ozzI,393
-anemone/nodes/itree_node.py,sha256=ywQIvF8LIihf-7p8OgzMjfTg6S39GRbY3u1b4Ka4JoM,3536
-anemone/nodes/tree_node.py,sha256=DxsFJw5Y8vromLu-oZL8D5F9aLME4FjI1d8XF9e3Eq8,7728
+anemone/nodes/itree_node.py,sha256=ZXyux7M2BBEGyraUWLHyYeoLgEHvuRgB0JJb-W-Ln_g,3547
+anemone/nodes/tree_node.py,sha256=C9jKzA62ToYhANYjwhS2qPAHti81l-x-p7RmKe6Sb0Q,7739
 anemone/nodes/tree_traversal.py,sha256=sE9as_8-74bIUuAYNhk2MK6VvlrN1Y3mFExff_HGpQ8,3958
 anemone/nodes/utils.py,sha256=_NPGFnjzouFMpepyNPw5D0d3999_F3tmJHa0bafwo7M,4501
 anemone/nodes/algorithm_node/__init__.py,sha256=8cNk3PmDzd22K78YWiO29Mu5A1FCObzPwEfWE1ym6Jk,116
-anemone/nodes/algorithm_node/algorithm_node.py,sha256=VzZsLZ0KmRt92me1U_mwATLu_uyVVafTOA-wtugtyms,6517
+anemone/nodes/algorithm_node/algorithm_node.py,sha256=SlYxmClzIgd6y1yPB3G2vZMoPIzylo8hHqcO2iXJje8,6528
 anemone/progress_monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anemone/progress_monitor/progress_monitor.py,sha256=ExuvwOntZBwrBjIbNr8ZpeCd2F5s21rsX74FFog7gqY,10896
 anemone/recommender_rule/__init__.py,sha256=9K73T0bkpvHg0IsQc1OW8QgsUhCNYq9ceqPMkwdqE8c,347
-anemone/recommender_rule/recommender_rule.py,sha256=Ck34nf3fw6FZOi-1HR_XJpuEggcCTxGoCJE_ueUNVO4,4587
+anemone/recommender_rule/recommender_rule.py,sha256=yQlIWWWFKJQFSxuDaEBNtUrgDe1PRwNusM2a1ds89hw,4427
 anemone/search_factory/__init__.py,sha256=ToU88Fa1lBBdf2AYTJ2PNVwWzi5Hzh-78-WOxClVkN4,619
 anemone/search_factory/search_factory.py,sha256=vCkxJk4cs6i6jjrTrUAsRBtp38N84j_uhyvpYIODoG4,6757
 anemone/tree_manager/__init__.py,sha256=D3j8emzRNF1fkPTpNUPsXbqAzMM9SyI3Ty_4Y_b2Tas,962
@@ -76,7 +76,7 @@ anemone/utils/dict_of_numbered_dict_with_pointer_on_max.py,sha256=s5Z-O5mBwJUh4P
 anemone/utils/logger.py,sha256=bJQ8COqdn5obtbi8TuokQHmdHpp57XRksTmfvCLLfyM,2973
 anemone/utils/my_value_sorted_dict.py,sha256=LbqtpBSCS7VrUTUChWCsi18IKZj65FkTJREqbl-xSVA,619
 anemone/utils/small_tools.py,sha256=l9dy5Oqvuvg8qQXqJUfyb3uwBHwVGVrKz6WeTHjyLTk,2766
-algorhino_anemone-0.1.2.dist-info/METADATA,sha256=BxqVitC0TFU3tWcoxkf_aSsdefABd1flA9_uYBKkgdM,5677
-algorhino_anemone-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-algorhino_anemone-0.1.2.dist-info/top_level.txt,sha256=G1vbB-vAevQVde3UZ5X1_Ysy1_6sJDEueHRi2qcDgrY,8
-algorhino_anemone-0.1.2.dist-info/RECORD,,
+algorhino_anemone-0.1.3.dist-info/METADATA,sha256=1ky2d5juHL2FQc6VTlRsVJNqej1Pr69dvR0dYX1ZoJA,5691
+algorhino_anemone-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+algorhino_anemone-0.1.3.dist-info/top_level.txt,sha256=G1vbB-vAevQVde3UZ5X1_Ysy1_6sJDEueHRi2qcDgrY,8
+algorhino_anemone-0.1.3.dist-info/RECORD,,

anemone/basics.py

@@ -1,11 +1,8 @@
 """Basic types and protocols for Anemone."""
 
-from dataclasses import dataclass
-from typing import Annotated, Mapping, Protocol
+from typing import Annotated, Protocol
 
-from valanga import BoardEvaluation, BranchKey, Color, HasTurn, State
-
-from anemone.recommender_rule.recommender_rule import BranchPolicy
+from valanga import Color, HasTurn, State
 
 type Seed = Annotated[int, "seed"]
 type TreeDepth = Annotated[int, "Depth level of a node in a tree structure"]
@@ -17,16 +14,6 @@ class StateWithTurn(State, HasTurn, Protocol):
     ...
 
 
-@dataclass(frozen=True, slots=True)
-class BranchRecommendation:
-    """A recommendation for a specific branch in a tree node."""
-
-    branch_key: BranchKey
-    evaluation: BoardEvaluation | None = None
-    policy: BranchPolicy | None = None
-    child_evals: Mapping[BranchKey, BoardEvaluation] | None = None
-
-
 class HasBlackAndWhiteTurn(Protocol):
     """Protocol for state that has black and white turns."""
 

anemone/node_evaluation/node_tree_evaluation/node_minmax_evaluation.py

@@ -21,12 +21,12 @@ from random import choice
 from typing import Any, Protocol, Self, runtime_checkable
 
 from valanga import (
-    BoardEvaluation,
     BranchKey,
     Color,
     FloatyStateEvaluation,
     ForcedOutcome,
     OverEvent,
+    StateEvaluation,
     TurnState,
 )
 
@@ -874,8 +874,8 @@ class NodeMinmaxEvaluation[
                     best_branches.append(branch_key)
         return best_branches
 
-    def evaluate(self) -> BoardEvaluation:
-        """Build a BoardEvaluation from current minmax state."""
+    def evaluate(self) -> StateEvaluation:
+        """Build a StateEvaluation from current minmax state."""
         if self.over_event.is_over():
             return ForcedOutcome(
                 outcome=self.over_event,

anemone/node_evaluation/node_tree_evaluation/node_tree_evaluation.py

@@ -1,10 +1,10 @@
 from typing import TYPE_CHECKING, Protocol, Self
 
 from valanga import (
-    BoardEvaluation,
     BranchKey,
     OverEvent,
     State,
+    StateEvaluation,
 )
 
 type BranchSortValue = tuple[float, int, int]
@@ -90,8 +90,8 @@ class NodeTreeEvaluation[StateT: State = State](Protocol):
         """Update terminal state based on updated branches."""
         ...
 
-    def evaluate(self) -> BoardEvaluation:
-        """Return a board evaluation for this node."""
+    def evaluate(self) -> StateEvaluation:
+        """Return a state evaluation for this node."""
         ...
 
     def description_tree_visualizer_branch(self, child: "ITreeNode[StateT]") -> str:

anemone/nodes/algorithm_node/algorithm_node.py

@@ -145,7 +145,7 @@ class AlgorithmNode[StateT: State = State]:
         )
 
     @property
-    def all_branches_keys(self) -> BranchKeyGeneratorP:
+    def all_branches_keys(self) -> BranchKeyGeneratorP[BranchKey]:
         """
         Returns a generator that yields the branch keys for the current board state.
 

anemone/nodes/itree_node.py

@@ -108,7 +108,7 @@ class ITreeNode[StateT: State = State](Protocol):
         """
 
     @property
-    def all_branches_keys(self) -> BranchKeyGeneratorP:
+    def all_branches_keys(self) -> BranchKeyGeneratorP[BranchKey]:
         """
         Get the available branch keys of the node.
 

anemone/nodes/tree_node.py

@@ -152,7 +152,7 @@ class TreeNode[
         return not self.parent_nodes
 
     @property
-    def all_branches_keys(self) -> BranchKeyGeneratorP:
+    def all_branches_keys(self) -> BranchKeyGeneratorP[BranchKey]:
         """
         Returns a generator that yields the branch keys for the current state.
 

anemone/recommender_rule/recommender_rule.py

@@ -16,9 +16,10 @@ Example usage:
 from dataclasses import dataclass
 from enum import Enum
 from random import Random
-from typing import Literal, Mapping, Protocol
+from typing import Literal, Protocol
 
 from valanga import BranchKey, State
+from valanga.policy import BranchPolicy
 
 from anemone.nodes.algorithm_node.algorithm_node import (
     AlgorithmNode,
@@ -26,15 +27,6 @@ from anemone.nodes.algorithm_node.algorithm_node import (
 from anemone.utils.small_tools import softmax
 
 
-@dataclass(frozen=True, slots=True)
-class BranchPolicy:
-    """
-    Represents a probability distribution over branches.
-    """
-
-    probs: Mapping[BranchKey, float]  # should sum to ~1.0
-
-
 def sample_from_policy(policy: BranchPolicy, rng: Random) -> BranchKey:
     """Sample a branch key from a probability policy using a RNG."""
     branches = list(policy.probs.keys())

anemone/tree_and_value_branch_selector.py

@@ -5,8 +5,9 @@ from queue import Queue
 from random import Random
 
 from valanga import TurnState
+from valanga.policy import Recommendation
 
-from anemone.basics import BranchRecommendation, Seed
+from anemone.basics import Seed
 from anemone.progress_monitor.progress_monitor import (
     AllStoppingCriterionArgs,
 )
@@ -43,9 +44,7 @@ class TreeAndValueBranchSelector[StateT: TurnState = TurnState]:
     recommend_branch_after_exploration: recommender_rule.AllRecommendFunctionsArgs
     queue_progress_player: Queue[IsDataclass] | None
 
-    def select_branch(
-        self, state: StateT, selection_seed: Seed
-    ) -> BranchRecommendation:
+    def select_branch(self, state: StateT, selection_seed: Seed) -> Recommendation:
         """
         Selects the best branch based on the tree and value strategy.
 
@@ -59,7 +58,7 @@ class TreeAndValueBranchSelector[StateT: TurnState = TurnState]:
         tree_exploration: TreeExploration = self.create_tree_exploration(state=state)
         self.random_generator.seed(selection_seed)
 
-        branch_recommendation: BranchRecommendation = tree_exploration.explore(
+        branch_recommendation: Recommendation = tree_exploration.explore(
             random_generator=self.random_generator
         ).branch_recommendation
 

anemone/tree_exploration.py

@@ -20,9 +20,10 @@ from queue import Queue
 from random import Random
 from typing import TYPE_CHECKING, Any, Callable
 
-from valanga import BoardEvaluation, BranchKey, PlayerProgressMessage, State, TurnState
+from valanga import BranchKey, PlayerProgressMessage, State, StateEvaluation, TurnState
+from valanga.game import BranchName
+from valanga.policy import Recommendation
 
-from anemone.basics import BranchRecommendation
 from anemone.nodes.algorithm_node.algorithm_node import AlgorithmNode
 from anemone.progress_monitor.progress_monitor import (
     AllStoppingCriterionArgs,
@@ -39,7 +40,7 @@ from . import tree_manager as tree_man
 from .trees.factory import ValueTreeFactory
 
 if TYPE_CHECKING:
-    from anemone.recommender_rule.recommender_rule import BranchPolicy
+    from valanga.policy import BranchPolicy
 
 
 @dataclass
@@ -48,21 +49,22 @@ class TreeExplorationResult[NodeT: AlgorithmNode[Any] = AlgorithmNode[Any]]:
     Tree Exploration Result holds the result of a tree exploration.
     """
 
-    branch_recommendation: BranchRecommendation
+    branch_recommendation: Recommendation
     tree: trees.Tree[NodeT]
 
 
 def compute_child_evals[StateT: State](
     root: AlgorithmNode[StateT],
-) -> dict[BranchKey, BoardEvaluation]:
+) -> dict[BranchName, StateEvaluation]:
     """Compute evaluations for each existing child branch."""
-    evals: dict[BranchKey, BoardEvaluation] = {}
+    evals: dict[BranchName, StateEvaluation] = {}
     for bk, child in root.branches_children.items():
         if child is None:
             continue
 
         # Use whatever your canonical per-node evaluation is:
-        evals[bk] = child.tree_evaluation.evaluate()
+        bk_name = root.state.branch_name_from_key(bk)
+        evals[bk_name] = child.tree_evaluation.evaluate()
     return evals
 
 
@@ -188,15 +190,16 @@ class TreeExploration[NodeT: AlgorithmNode[Any] = AlgorithmNode[Any]]:
             policy, random_generator
         )
 
+        best_branch_name = self.tree.root_node.state.branch_name_from_key(best_branch)
         self.tree_manager.print_best_line(
             tree=self.tree
         )  # todo maybe almost best chosen line no?
 
-        branch_recommendation = BranchRecommendation(
-            branch_key=best_branch,
+        branch_recommendation = Recommendation(
+            recommended_name=best_branch_name,
             evaluation=self.tree.root_node.tree_evaluation.evaluate(),
             policy=policy,
-            child_evals=compute_child_evals(self.tree.root_node),
+            branch_evals=compute_child_evals(self.tree.root_node),
         )
 
         tree_exploration_result: TreeExplorationResult[NodeT] = TreeExplorationResult(