Browse code

corrected check for experiment.table

ataudt authored on 23/10/2020 17:54:22
Showing 1 changed files

... ...
@@ -93,15 +93,15 @@ check.experiment.table <- function(experiment.table) {
93 93
         stop("Argument 'experiment.table' expects a data.frame with columns 'file', 'mark', 'condition', 'replicate', 'pairedEndReads' and 'controlFiles'.")
94 94
     }
95 95
     conditions <- unique(experiment.table$condition)
96
-    if (any(grepl('[[:punct:]]', conditions)) | any(grepl('[[:punct:]]', conditions)) | any(grepl('^[0-9]', conditions))) {
96
+    if (any(grepl('[[:punct:]]', conditions)) | any(grepl(' ', conditions)) | any(grepl('^[0-9]', conditions))) {
97 97
         stop("Column 'condition' of the experiment.table cannot contain special characters or spaces or start with a number.")
98 98
     }
99 99
     marks <- unique(experiment.table$mark)
100
-    if (any(grepl('[[:punct:]]', marks)) | any(grepl('[[:punct:]]', marks))) {
100
+    if (any(grepl('[[:punct:]]', marks)) | any(grepl(' ', marks))) {
101 101
         stop("Column 'mark' of the experiment.table cannot contain special characters or spaces.")
102 102
     }
103 103
     replicates <- unique(experiment.table$replicate)
104
-    if (any(grepl('[[:punct:]]', replicates)) | any(grepl('[[:punct:]]', replicates))) {
104
+    if (any(grepl('[[:punct:]]', replicates)) | any(grepl(' ', replicates))) {
105 105
         stop("Column 'replicate' of the experiment.table cannot contain special characters or spaces.")
106 106
     }
107 107
     IDs <- paste0(experiment.table$mark, '-', experiment.table$condition, '-rep', experiment.table$replicate)