Skip to content

Commit

Permalink
fix merge issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jminnier committed Dec 9, 2019
1 parent 774d8a9 commit 801ea02
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
13 changes: 1 addition & 12 deletions server-inputdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -145,18 +145,7 @@ analyzeDataReactive <-
alldata <- inputDataReactive()$data
# remove empty columns
alldata = alldata %>% remove_empty(which=c("rows","cols"))
validate(not_numeric(alldata))

}
}
NULL
} else {
FALSE
} else if (input == "") {
Please check your input file."
"Your data does not appear to be formatted correctly (no numeric columns).
if(sum(unlist(lapply(input,function(k) class(k)%in%c("numeric","integer"))))==0) {
not_numeric <- function(input) {

# Check for numeric columns

## ==================================================================================== ##
Expand Down
2 changes: 1 addition & 1 deletion server.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


options(shiny.maxRequestSize = 100*1024^2)
options(repos = BiocInstaller::biocinstallRepos())
#options(repos = BiocInstaller::biocinstallRepos()) # use setRepositories() 1 2

source("helpers.R")
print(sessionInfo())
Expand Down

0 comments on commit 801ea02

Please sign in to comment.