Merge pull request #19 from gambitproject/node-logic-adjust

Small adjustment to default gambit node level spacing logic

Author: edwardchalstrey1

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.13"]
+        python-version: ["3.10", "3.14"]
 
     steps:
     - uses: actions/checkout@v4

src/draw_tree/core.py

@@ -1261,7 +1261,7 @@ def generate_tikz(
     game: str | "pygambit.gambit.Game",
     save_to: Optional[str] = None,
     scale_factor: float = 0.8,
-    level_spacing: int = 6,
+    level_spacing: int = 4,
     sublevel_spacing: int = 2,
     width_spacing: int = 2,
     show_grid: bool = False,
@@ -1357,7 +1357,7 @@ def draw_tree(
     game: str | "pygambit.gambit.Game",
     save_to: Optional[str] = None,
     scale_factor: float = 0.8,
-    level_spacing: int = 6,
+    level_spacing: int = 4,
     sublevel_spacing: int = 2,
     width_spacing: int = 2,
     show_grid: bool = False,

src/draw_tree/gambit_layout.py

@@ -5,20 +5,20 @@
 def determine_node_level(
     gbt_level: int,
     gbt_sublevel: int,
-    level_multiplier: int = 6,
+    level_multiplier: int = 4,
     sublevel_multiplier: int = 2,
 ) -> int:
     """Determine the node level in the .ef format based on Gambit layout levels."""
     # If node is in an infoset
-    if gbt_level > 1 and gbt_sublevel != 0:
+    if gbt_sublevel != 0:
         return (gbt_level * level_multiplier) + ((gbt_sublevel - 1) * sublevel_multiplier) - (level_multiplier / 2)
-    return gbt_level * level_multiplier
+    return (gbt_level * level_multiplier) - (level_multiplier / 2)
 
 
 def gambit_layout_to_ef(
     game: pygambit.gambit.Game,
     save_to: Optional[str] = None,
-    level_multiplier: int = 6,
+    level_multiplier: int = 4,
     sublevel_multiplier: int = 2,
     xshift_multiplier: int = 2
 ) -> str: