ソースを参照

Hardcode group vars to simplify

Bryan Roessler 7 ヶ月 前
コミット
219dc15a45
1 ファイル変更7 行追加3 行削除
  1. 7 3
      qhtcp-workflow/apps/r/calculate_interaction_zscores.R

+ 7 - 3
qhtcp-workflow/apps/r/calculate_interaction_zscores.R

@@ -186,7 +186,10 @@ calculate_summary_stats <- function(df, variables, group_vars) {
   return(list(summary_stats = summary_stats, df_with_stats = df_with_stats))
 }
 
-calculate_interaction_scores <- function(df, max_conc, variables, group_vars) {
+calculate_interaction_scores <- function(df, max_conc) {
+
+  variables <- c("L", "K", "r", "AUC")
+  group_vars <- c("OrfRep", "Gene", "num")
 
   # Calculate total concentration variables
   total_conc_num <- length(unique(df$conc_num))
@@ -206,6 +209,7 @@ calculate_interaction_scores <- function(df, max_conc, variables, group_vars) {
     AUC = df %>% filter(conc_num == 0) %>% pull(sd_AUC) %>% first()
   )
 
+  # Calculate per spot
   stats <- calculate_summary_stats(df,
     variables = variables,
     group_vars = c("OrfRep", "Gene", "num", "conc_num", "conc_num_factor")
@@ -1282,14 +1286,14 @@ main <- function() {
         ungroup()
 
       message("Calculating reference strain interaction scores")
-      reference_results <- calculate_interaction_scores(reference_strain, max_conc, group_vars = c("OrfRep", "Gene", "num"))
+      reference_results <- calculate_interaction_scores(reference_strain, max_conc)
       zscores_calculations_reference <- reference_results$calculations
       zscores_interactions_reference <- reference_results$interactions
       zscores_calculations_reference_joined <- reference_results$calculations_joined
       zscores_interactions_reference_joined <- reference_results$interactions_joined
 
       message("Calculating deletion strain(s) interactions scores")
-      deletion_results <- calculate_interaction_scores(deletion_strains, max_conc, group_vars = c("OrfRep", "Gene", "num"))
+      deletion_results <- calculate_interaction_scores(deletion_strains, max_conc)
       zscores_calculations <- deletion_results$calculations
       zscores_interactions <- deletion_results$interactions
       zscores_calculations_joined <- deletion_results$calculations_joined