fixed input data issues

jminnier · Nov 8, 2019 · e211e9d · e211e9d
1 parent ce1e244
commit e211e9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/server-inputdata.R b/server-inputdata.R
@@ -166,8 +166,7 @@ analyzeDataReactive <-
                                          isfclogged = input$isfclogged) 
 
                     }else if(input$inputdat_type=="expression_only") {
-                        analyze_expression_data(alldata, tmpgenecols, tmpexprcols, 
-                                                analysis_method = input$analysis_method)
+                        analyze_expression_data(alldata, analysis_method = input$analysis_method)
 
                     }     
 

diff --git a/ui-tab-inputdata.R b/ui-tab-inputdata.R
@@ -58,8 +58,8 @@ tabPanel("Input Data",
                               ),
                               radioButtons("analysis_method","Analysis Method",
                                            c("edgeR"="edgeR",
-                                             "voom/limma"="voom_limma",
-                                             "Array or counts already normalized, linear models"="lmmodel"))
+                                             "voom/limma"="voom",
+                                             "Array or counts already normalized, linear models"="linear_model"))
                             ),
                             conditionalPanel(condition="input.inputdat_type=='analyzed'",
                                              downloadLink("example_analysis_file",label="Download Example Analysis Results File"),