fs.to_dataframe column order fix #2

elphick · Nov 5, 2024 · 98a7bcd · 98a7bcd
1 parent bfb4c47
commit 98a7bcd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/elphick/geomet/flowsheet/flowsheet.py b/elphick/geomet/flowsheet/flowsheet.py
@@ -708,8 +708,9 @@ def to_dataframe(self, stream_names: Optional[list[str]] = None, tidy: bool = Tr
 
         results: pd.DataFrame = pd.concat(chunks, axis='index').set_index('name', append=True)
         if not tidy:  # wide format
-            results = results.unstack(level='name').swaplevel(axis=1)
-            results.columns = [f'{col[0]}_{col[1]}' for col in results.columns]
+            results = results.unstack(level='name', sort=False)
+            results.columns = [f'{name}_{attr}' for name in results.columns.levels[1] for attr in
+                               results.columns.levels[0]]
 
         return results