Revert "refact: change the column as grouping"

This reverts commit 5834f5e.

Author: atrigila

assets/differentialabundance_report.Rmd

@@ -285,18 +285,11 @@ if (! 'id' %in% colnames(contrasts)){
     contrasts$id <- apply(contrasts, 1, paste, collapse='_')
 }
 
-# If 'variable' is empty, then use 'grouping' column
-contrasts$variable_or_grouping <- ifelse(
-  is.na(contrasts$variable) | contrasts$variable == "",
-  contrasts$grouping,
-  contrasts$variable
-)
-
 # Identify informative variables- those with a number of values greater than 1
 # but less than N, with N being the number of observations. Make sure contrast
 # variables are first in the list
 
-informative_variables <- unique(c(contrasts$variable_or_grouping, chooseGroupingVariables(observations)))
+informative_variables <- unique(c(contrasts$variable, chooseGroupingVariables(observations)))
 
 # Remove any informative variables that group observations the same way
 informative_variables <- informative_variables[ ! duplicated(lapply(structure(informative_variables, names= informative_variables), function(x) as.numeric(factor(observations[[x]], levels=unique(observations[[x]])))))]
@@ -340,7 +333,7 @@ informative_variables <- rownames(pca_vs_meta)[order(pca_vs_meta[,1])]
 
 # Pick the variable used for coloring purposes etc
 if (params$exploratory_main_variable == 'contrasts'){
-    main_grouping_variable <- contrasts$variable_or_grouping[1]
+    main_grouping_variable <- contrasts$variable[1]
 }else if (params$exploratory_main_variable == 'auto_pca'){
     main_grouping_variable <- informative_variables[1]
 }else{
@@ -446,7 +439,7 @@ names(differential_results) <- differential_names
 # Function to make friendly contrast name from contrast components, including optional bits
 
 name_contrast <- function(i){
-    contrast_name <- paste(contrasts$target[i], 'versus', contrasts$reference[i], 'in', contrasts$variable_or_grouping[i])
+    contrast_name <- paste(contrasts$target[i], 'versus', contrasts$reference[i], 'in', contrasts$variable[i])
     contrast_vals <- contrasts[i,]
     populated <- colnames(contrasts)[! (is.na(contrast_vals) | contrast_vals == '' | is.null(contrast_vals))]
     optional <- setdiff(populated, c('id', 'target', 'reference', 'variable'))
@@ -511,7 +504,7 @@ cat(paste0("\n## ", ucfirst(params$observations_type), "s\n"))
 A summary of `r params$observations_type` metadata is below:
 
 ```{r, echo=FALSE, results='asis'}
-display_columns <- union(c(params$observations_id_col, unique(contrasts$variable_or_grouping)), informative_variables)
+display_columns <- union(c(params$observations_id_col, unique(contrasts$variable)), informative_variables)
 minimal_fetchngs_cols <- c('sample', 'sample_title', 'strandedness', 'library_strategy', 'scientific_name')
 
 # If the data came via fetchngs then we can infer a couple of things about the most useful columns
@@ -553,7 +546,7 @@ contrasts_to_print$model <- sapply(contrasts_to_print$Id, function(id) {
 
 print( htmltools::tagList(datatable(contrasts_to_print, caption = paste0("Table of contrasts"), rownames = FALSE, options = list(dom = ifelse(nrow(contrasts_to_print) > 10, 'tp', 't'))) ))
 ```
-Note: For formula-based contrasts without a 'variable', the column 'grouping' was automatically filled with `params$report_grouping_variable` to support grouping in plots and reports.
+Note: For formula-based contrasts without a 'variable', the column was automatically filled with `params$report_grouping_variable` to support grouping in plots and reports.
 
 # Results
 

workflows/differentialabundance.nf

@@ -796,17 +796,16 @@ workflow DIFFERENTIALABUNDANCE {
             .map { meta, row ->
                 def variable = row.variable?.trim()
                 if (!variable || variable == 'NA') {
-                    row.grouping = (!variable || variable == 'NA') ? params.report_grouping_variable : ''
+                    row.variable = params.report_grouping_variable
                 }
-                if (!row.containsKey('grouping')) row.grouping = ''
                 [meta, row]
             }
             .groupTuple()
             .map { meta, rows ->
-                def header = (rows[0].keySet() + 'grouping').unique().join('\t')
+                def header = rows[0].keySet().join('\t')
                 def lines = rows.collect { it.values().join('\t') }
                 def content = ([header] + lines).join('\n')
-                def outFile = file("${workflow.workDir}/${meta.id ?: meta.paramset_name}_contrast_variable_grouping.tsv")
+                def outFile = file("${workflow.workDir}/${meta.id ?: meta.paramset_name}_contrast_variable_filled.tsv")
                 outFile.text = content
                 [meta, outFile]
             }