Bug fix for automatic namings

caravagnalab · Oct 26, 2020 · e66b2d7 · e66b2d7
1 parent 67aa0fe
commit e66b2d7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/R/.DS_Store b/R/.DS_Store
diff --git a/R/Clusters_denovo.R b/R/Clusters_denovo.R
@@ -27,26 +27,30 @@
 #' ggplot(new_assignments, aes(VAF, fill = cluster)) + geom_histogram(binwidth = 0.01)
 Clusters_denovo = function(x, y)
 {
-  is_mobster_fit(x)
-  is_mobster_input_dataset(y)
+  mobster:::is_mobster_fit(x)
+  mobster:::is_mobster_input_dataset(y)
 
   # actual clusters
   components = names(mobster:::.params_Pi(x))
 
   # per-component density
-  densities = NULL
+  densities = y
   for(component in seq_along(components))
   {
+    comp_density = ddbpmm(x, data = y$VAF, components = component, log = TRUE) %>% data.frame()
+    colnames(comp_density) = components[component]
+
     densities = dplyr::bind_cols(
       densities,
-      ddbpmm(x, data = y$VAF, components = component, log = TRUE) %>% data.frame()
+      comp_density
     )
   }
-  colnames(densities) = components
+  # colnames(densities) = components
   densities = densities %>% as_tibble()
 
   # Hard clustering assignments
-  densities$cluster = components[apply(densities, 1, which.max)]
+  densities$cluster = components[apply(densities[, components, drop = FALSE], 1, which.max)]
 
-  dplyr::bind_cols(y, densities) %>% as_tibble()
+  densities
+  # dplyr::bind_cols(y, densities) %>% as_tibble()
 }
diff --git a/mobster.Rproj b/mobster.Rproj
@@ -0,0 +1,17 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX
+
+BuildType: Package
+PackageUseDevtools: Yes
+PackageInstallArgs: --no-multiarch --with-keep.source