Fix variance_explained_grouped

MLO-lab · Jun 6, 2024 · 6eb1064 · 6eb1064
1 parent ec67cac
commit 6eb1064
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/muvi/tools/plotting.py b/muvi/tools/plotting.py
@@ -158,8 +158,13 @@ def variance_explained(
     """Heatmap of variance explained, see `muvi.tl.variance_explained`."""
 
     model_cache = _get_model_cache(model)
-    r2_fac = model_cache.factor_metadata
-    r2_cov = model_cache.cov_metadata
+    r2_fac = None
+    if model_cache.factor_metadata is not None:
+        r2_fac = model_cache.factor_metadata.copy()
+    r2_cov = None
+    if model_cache.cov_metadata is not None:
+        r2_cov = model_cache.cov_metadata.copy()
+
     if r2_fac is None and r2_cov is None:
         raise ValueError(
             "No scores found in model cache, rerun `muvi.tl.variance_explained`."

diff --git a/muvi/tools/utils.py b/muvi/tools/utils.py
@@ -415,8 +415,10 @@ def variance_explained_grouped(model, groupby, factor_idx: Index = "all", **kwar
                 model,
                 sample_idx=group_df.index,
                 factor_idx=factor_idx,
+                cache=False,
+                sort=False,
                 **kwargs,
-            )[1]
+            )[1].copy()
         )
         .reset_index()
     )