From 90a4c464e477ffd61158da90b0147d59443d766f Mon Sep 17 00:00:00 2001
From: Tanushree Tunstall <tanu@tunstall.in>
Date: Mon, 12 Sep 2022 14:46:09 +0100
Subject: [PATCH] complete != combined

---
 ml/global.R | 8 ++++----
 ml/server.R | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ml/global.R b/ml/global.R
index 71babe9..ab798ae 100644
--- a/ml/global.R
+++ b/ml/global.R
@@ -141,9 +141,9 @@ makeplot = function(x, # the DataFrame to plot
                     combined_training_genes = '999' # used only for the info box
 ){
   plot_data    = x[x$resampling==resampler,]
-  y_coord_min = min(plot_data[selection])
+  y_coord_min = min(plot_data[selection], na.rm=TRUE)
   
-  if (y_coord_min > 0) {
+  if (y_coord_min >= 0) {
     y_coord_min = 0
   }
   if (display_infobox) {
@@ -155,7 +155,7 @@ makeplot = function(x, # the DataFrame to plot
                       "\nResampling: ", metadata$resampling,
                       "\nFeatures: ", metadata$n_features,
                       "\nGenes Trained: ", combined_training_genes,
-                      "\nTest Gene: ", gene
+                      #"\nTest Gene: ", gene
       )
     } else {
       metatext=paste0("Train/Test: ",
@@ -350,7 +350,7 @@ if (interactive()){
             selection,
             "none", # always 'none' for Feature Selection
             gene = combo[drug==selected_drug,"gene"],
-            combined_training_genes = "NO DATA",
+            combined_training_genes = combined_training_genes,
             display_combined = TRUE
           ),height=450
         )
diff --git a/ml/server.R b/ml/server.R
index 181537a..4f834d9 100644
--- a/ml/server.R
+++ b/ml/server.R
@@ -76,7 +76,7 @@ shinyServer(function(input, output, session) {
           selection,
           "none", # always 'none' for Feature Selection
           gene = combo[drug==selected_drug,"gene"],
-          combined_training_genes = "NO DATA",
+          combined_training_genes = combined_training_genes,
           display_combined = TRUE
         ),height=450
       )