bossanova 0.1.0.dev22__tar.gz → 0.1.0.dev23__tar.gz

{bossanova-0.1.0.dev22 → bossanova-0.1.0.dev23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bossanova
-Version: 0.1.0.dev22
+Version: 0.1.0.dev23
 Summary: Bridging statistical cultures with some jazz
 Author: Eshin Jolly
 License-Expression: MIT

{bossanova-0.1.0.dev22 → bossanova-0.1.0.dev23}/bossanova/internal/marginal/emm.py

@@ -653,8 +653,24 @@ def _compute_emm_crossed_mem(
         L_matrix = d[:, np.newaxis] * X_ref
 
     grid = pl.DataFrame(grid_data)
-    if grid_vars:
-        grid = grid.select(grid_vars + [c for c in grid.columns if c not in grid_vars])
+
+    # Add scalar-pinned conditions as constant columns (set_categoricals
+    # and at_overrides are applied to the design matrix but must also
+    # appear in the output grid so users can see the pinned values).
+    if resolved.set_categoricals:
+        for cond_var, cond_level in resolved.set_categoricals.items():
+            if cond_var not in grid.columns:
+                grid = grid.with_columns(pl.lit(cond_level).alias(cond_var))
+    if resolved.at_overrides:
+        for cond_var, cond_val in resolved.at_overrides.items():
+            if cond_var not in grid.columns:
+                grid = grid.with_columns(pl.lit(cond_val).alias(cond_var))
+
+    # Reorder: grid_vars + pinned conditions first, then focal
+    pin_cols = list(resolved.set_categoricals) + list(resolved.at_overrides)
+    leading = grid_vars + [c for c in pin_cols if c not in grid_vars]
+    if leading:
+        grid = grid.select(leading + [c for c in grid.columns if c not in leading])
 
     cond_str = " ~ " + ", ".join(grid_vars) if grid_vars else ""
     return build_mee_state(
@@ -770,8 +786,21 @@ def _compute_emm_crossed_gcomp(
     L_matrix = np.einsum("mnp,mn->mp", X_all, d_all) / X_all.shape[1]  # (C*K, p)
 
     grid = pl.DataFrame(grid_data)
-    if grid_vars:
-        grid = grid.select(grid_vars + [c for c in grid.columns if c not in grid_vars])
+
+    # Add scalar-pinned conditions as constant columns (mirrors MEM path)
+    if resolved.set_categoricals:
+        for cond_var, cond_level in resolved.set_categoricals.items():
+            if cond_var not in grid.columns:
+                grid = grid.with_columns(pl.lit(cond_level).alias(cond_var))
+    if resolved.at_overrides:
+        for cond_var, cond_val in resolved.at_overrides.items():
+            if cond_var not in grid.columns:
+                grid = grid.with_columns(pl.lit(cond_val).alias(cond_var))
+
+    pin_cols = list(resolved.set_categoricals) + list(resolved.at_overrides)
+    leading = grid_vars + [c for c in pin_cols if c not in grid_vars]
+    if leading:
+        grid = grid.select(leading + [c for c in grid.columns if c not in leading])
 
     cond_str = " ~ " + ", ".join(grid_vars) if grid_vars else ""
     return build_mee_state(

{bossanova-0.1.0.dev22 → bossanova-0.1.0.dev23}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "bossanova"
 requires-python = ">=3.11"
-version = "0.1.0.dev22"
+version = "0.1.0.dev23"
 authors = [
     {name = "Eshin Jolly"},
 ]