diff --git a/DESCRIPTION b/DESCRIPTION index a5d46a7..c4e31a9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: MetaProViz Title: METabolomics pre-PRocessing, functiOnal analysis and VIZualisation -Version: 1.0.0 +Version: 1.0.1 Authors@R: c( person("Christina", "Schmidt", , "christina.schmidt@uni-heidelberg.de", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-3867-0881")), diff --git a/MetaProViz.Rproj b/MetaProViz.Rproj index aaa62a5..69fafd4 100644 --- a/MetaProViz.Rproj +++ b/MetaProViz.Rproj @@ -5,8 +5,13 @@ SaveWorkspace: No AlwaysSaveHistory: Default EnableCodeIndexing: Yes +UseSpacesForTab: Yes +NumSpacesForTab: 2 Encoding: UTF-8 +RnwWeave: Sweave +LaTeX: pdfLaTeX + AutoAppendNewline: Yes StripTrailingWhitespace: Yes LineEndingConversion: Posix diff --git a/R/DifferentialMetaboliteAnalysis.R b/R/DifferentialMetaboliteAnalysis.R index 117d0d9..95ddcf1 100644 --- a/R/DifferentialMetaboliteAnalysis.R +++ b/R/DifferentialMetaboliteAnalysis.R @@ -1372,20 +1372,6 @@ Shapiro <-function(Input_data, } } - ## ------------ Check Input SettingsInfo ----------- ## - #3. Input_SettingsInfo - if(Input_SettingsInfo[["conditions"]] %in% Input_SettingsInfo==TRUE){ - if(Input_SettingsInfo[["conditions"]] %in% colnames(Input_SettingsFile_Sample)== FALSE){ - stop("The ",Input_SettingsInfo[["conditions"]], " column selected as Conditions in Input_SettingsInfo was not found in Input_SettingsFile_Sample. Please check your input.") - }else{# if true rename to Conditions - Input_SettingsFile_Sample<- Input_SettingsFile_Sample%>% - dplyr::rename("Conditions"= paste(Input_SettingsInfo[["conditions"]]) ) - } - }else{ - stop("You have to provide a Input_SettingsInfo for conditions.") - } - - ########################## if("denominator" %in% names(Input_SettingsInfo)==TRUE){ if(Input_SettingsInfo[["denominator"]] %in% Input_SettingsFile_Sample$Conditions==FALSE){ stop("The ",Input_SettingsInfo[["denominator"]], " column selected as denominator in Input_SettingsInfo was not found in Input_SettingsFile_Sample. Please check your input.") @@ -1688,19 +1674,6 @@ Bartlett <-function(Input_data, } } - ## ------------ Check Input SettingsInfo ----------- ## - #3. Input_SettingsInfo - if(Input_SettingsInfo[["conditions"]] %in% Input_SettingsInfo==TRUE){ - if(Input_SettingsInfo[["conditions"]] %in% colnames(Input_SettingsFile_Sample)== FALSE){ - stop("The ",Input_SettingsInfo[["conditions"]], " column selected as Conditions in Input_SettingsInfo was not found in Input_SettingsFile_Sample. Please check your input.") - }else{# if true rename to Conditions - Input_SettingsFile_Sample<- Input_SettingsFile_Sample%>% - dplyr::rename("Conditions"= paste(Input_SettingsInfo[["conditions"]]) ) - } - }else{ - stop("You have to provide a Input_SettingsInfo for conditions.") - } - ########################## if("denominator" %in% names(Input_SettingsInfo)==TRUE){ if(Input_SettingsInfo[["denominator"]] %in% Input_SettingsFile_Sample$Conditions==FALSE){