- linopy/variables.py: ffill, bfill, sanitize — labels were cast back to int64 via astype(int), now use DEFAULT_LABEL_DTYPE. Also Variables.to_dataframe arange for

  map_labels.
  - linopy/constraints.py: Constraints.to_dataframe arange for map_labels.
  - linopy/common.py: save_join outer-join fallback was casting to int64.

Author: FBumann

linopy/common.py

@@ -460,7 +460,7 @@ def save_join(*dataarrays: DataArray, integer_dtype: bool = False) -> Dataset:
         )
         arrs = xr_align(*dataarrays, join="outer")
         if integer_dtype:
-            arrs = tuple([ds.fillna(-1).astype(int) for ds in arrs])
+            arrs = tuple([ds.fillna(-1).astype(DEFAULT_LABEL_DTYPE) for ds in arrs])
     return Dataset({ds.name: ds for ds in arrs})
 
 

linopy/constraints.py

@@ -56,6 +56,7 @@
 )
 from linopy.config import options
 from linopy.constants import (
+    DEFAULT_LABEL_DTYPE,
     EQUAL,
     GREATER_EQUAL,
     HELPER_DIMS,
@@ -1071,7 +1072,10 @@ def flat(self) -> pd.DataFrame:
             return pd.DataFrame(columns=["coeffs", "vars", "labels", "key"])
         df = pd.concat(dfs, ignore_index=True)
         unique_labels = df.labels.unique()
-        map_labels = pd.Series(np.arange(len(unique_labels)), index=unique_labels)
+        map_labels = pd.Series(
+            np.arange(len(unique_labels), dtype=DEFAULT_LABEL_DTYPE),
+            index=unique_labels,
+        )
         df["key"] = df.labels.map(map_labels)
         return df
 

linopy/variables.py

@@ -52,7 +52,7 @@
     to_polars,
 )
 from linopy.config import options
-from linopy.constants import HELPER_DIMS, TERM_DIM
+from linopy.constants import DEFAULT_LABEL_DTYPE, HELPER_DIMS, TERM_DIM
 from linopy.solver_capabilities import SolverFeature, solver_supports
 from linopy.types import (
     ConstantLike,
@@ -1066,7 +1066,9 @@ def ffill(self, dim: str, limit: None = None) -> Variable:
             .map(DataArray.ffill, dim=dim, limit=limit)
             .fillna(self._fill_value)
         )
-        return self.assign_multiindex_safe(labels=data.labels.astype(int))
+        return self.assign_multiindex_safe(
+            labels=data.labels.astype(DEFAULT_LABEL_DTYPE)
+        )
 
     def bfill(self, dim: str, limit: None = None) -> Variable:
         """
@@ -1093,7 +1095,7 @@ def bfill(self, dim: str, limit: None = None) -> Variable:
             .map(DataArray.bfill, dim=dim, limit=limit)
             .fillna(self._fill_value)
         )
-        return self.assign(labels=data.labels.astype(int))
+        return self.assign(labels=data.labels.astype(DEFAULT_LABEL_DTYPE))
 
     def sanitize(self) -> Variable:
         """
@@ -1104,7 +1106,9 @@ def sanitize(self) -> Variable:
         linopy.Variable
         """
         if issubdtype(self.labels.dtype, floating):
-            return self.assign(labels=self.labels.fillna(-1).astype(int))
+            return self.assign(
+                labels=self.labels.fillna(-1).astype(DEFAULT_LABEL_DTYPE)
+            )
         return self
 
     def equals(self, other: Variable) -> bool:
@@ -1525,7 +1529,10 @@ def flat(self) -> pd.DataFrame:
         """
         df = pd.concat([self[k].flat for k in self], ignore_index=True)
         unique_labels = df.labels.unique()
-        map_labels = pd.Series(np.arange(len(unique_labels)), index=unique_labels)
+        map_labels = pd.Series(
+            np.arange(len(unique_labels), dtype=DEFAULT_LABEL_DTYPE),
+            index=unique_labels,
+        )
         df["key"] = df.labels.map(map_labels)
         return df