From 3d250b0b438a41a1a85fdcd4f6555294eec02620 Mon Sep 17 00:00:00 2001
From: Tanushree Tunstall <tanu@tunstall.in>
Date: Mon, 12 Sep 2022 14:12:30 +0100
Subject: [PATCH] remove combined_data

---
 ml/global.R | 23 ++++++++++++-----------
 ml/server.R | 11 ++++++-----
 ml/ui.R     | 12 ++++++------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/ml/global.R b/ml/global.R
index 7a2c5a3..71babe9 100644
--- a/ml/global.R
+++ b/ml/global.R
@@ -227,12 +227,12 @@ if (interactive()){
                      #               ),
                      #),
                      
-                     radioButtons("combined_data",
-                                  label="Data Type",
-                                  choiceNames = c("Complete", "Actual"),
-                                  choiceValues = c("complete", "actual"),
-                                  selected="complete"
-                     ),
+                     # radioButtons("combined_data",
+                     #              label="Data Type",
+                     #              choiceNames = c("Complete", "Actual"),
+                     #              choiceValues = c("complete", "actual"),
+                     #              selected="complete"
+                     # ),
                      radioButtons("combined_training_genes",
                                   label="Training Genes",
                                   choiceNames = c("Five", "Six"),
@@ -276,7 +276,7 @@ if (interactive()){
   server=shinyServer(function(input, output, session) {
     observeEvent({
       input$combined_model
-      input$combined_data
+      #input$combined_data
       input$combined_training_genes
       input$score_dropdown
       input$resample_dropdown
@@ -289,7 +289,7 @@ if (interactive()){
       resampler               = input$resample_dropdown
       selected_drug           = input$drug_dropdown
       selected_split          = input$split_dropdown
-      combined_data           = input$combined_data
+      #combined_data           = input$combined_data
       combined_training_genes = input$combined_training_genes
       
       selected_gene           = combo[combo$drug == selected_drug,'gene']
@@ -314,14 +314,15 @@ if (interactive()){
         
         hide("split_dropdown")
         #show("resample_dropdown")
-        show("combined_data")
+        #show("combined_data")
         show("combined_training_genes")
         #show("feature_plot")
         filedata = paste0(combined_training_genes,
                           'genes_logo_skf_BT_',
                           selected_gene,
                           '_',
-                          combined_data
+                          "complete"
+                          #combined_data
         )
         feature_data = paste0(as.character(as.numeric(combined_training_genes)-4), # lol
                               'genes_logo_skf_BT_',
@@ -359,7 +360,7 @@ if (interactive()){
       } else {
         show("split_dropdown")
         #show("resample_dropdown")
-        hide("combined_data")
+        #hide("combined_data")
         hide("combined_training_genes")
         #hide("feature_plot")
         
diff --git a/ml/server.R b/ml/server.R
index 7b2820f..bb4d1bd 100644
--- a/ml/server.R
+++ b/ml/server.R
@@ -2,7 +2,7 @@ library(shiny)
 shinyServer(function(input, output, session) {
   observeEvent({
     input$combined_model
-    input$combined_data
+    #input$combined_data
     input$combined_training_genes
     input$score_dropdown
     input$resample_dropdown
@@ -15,7 +15,7 @@ shinyServer(function(input, output, session) {
     resampler               = input$resample_dropdown
     selected_drug           = input$drug_dropdown
     selected_split          = input$split_dropdown
-    combined_data           = input$combined_data
+    #combined_data           = input$combined_data
     combined_training_genes = input$combined_training_genes
     
     selected_gene           = combo[combo$drug == selected_drug,'gene']
@@ -40,14 +40,15 @@ shinyServer(function(input, output, session) {
       
       hide("split_dropdown")
       #show("resample_dropdown")
-      show("combined_data")
+      #show("combined_data")
       show("combined_training_genes")
       #show("feature_plot")
       filedata = paste0(combined_training_genes,
                         'genes_logo_skf_BT_',
                         selected_gene,
                         '_',
-                        combined_data
+                        "combined"
+                        #combined_data
       )
       feature_data = paste0(as.character(as.numeric(combined_training_genes)-4), # lol
                             'genes_logo_skf_BT_',
@@ -85,7 +86,7 @@ shinyServer(function(input, output, session) {
     } else {
       show("split_dropdown")
       #show("resample_dropdown")
-      hide("combined_data")
+      #hide("combined_data")
       hide("combined_training_genes")
       #hide("feature_plot")
       
diff --git a/ml/ui.R b/ml/ui.R
index d7e9ff4..9677ab2 100644
--- a/ml/ui.R
+++ b/ml/ui.R
@@ -23,12 +23,12 @@ dashboardPage(skin="purple",
                 #               ),
                 #),
                 
-                radioButtons("combined_data",
-                             label="Data Type",
-                             choiceNames = c("Complete", "Actual"),
-                             choiceValues = c("complete", "actual"),
-                             selected="complete"
-                ),
+                # radioButtons("combined_data",
+                #              label="Data Type",
+                #              choiceNames = c("Complete", "Actual"),
+                #              choiceValues = c("complete", "actual"),
+                #              selected="complete"
+                # ),
                 radioButtons("combined_training_genes",
                              label="Training Genes",
                              choiceNames = c("Five", "Six"),