Mercurial > repos > lecorguille > camera_annotate

comparison CAMERA.r @ 33:3b2b642542f6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload commit 896ef116e72008394779322f65137c632af5f4d2
author lecorguille
date Wed, 05 Apr 2017 11:27:56 -0400
parents fce12d692a41
children b02797fbead1
comparison
equal deleted inserted replaced
32:23e33e354bb7 33:3b2b642542f6
89 variableMetadataOutput = "variableMetadata.tsv" 89 variableMetadataOutput = "variableMetadata.tsv"
90 if (!is.null(listArguments[["variableMetadataOutput"]])){ 90 if (!is.null(listArguments[["variableMetadataOutput"]])){
91 variableMetadataOutput = listArguments[["variableMetadataOutput"]]; listArguments[["variableMetadataOutput"]]=NULL 91 variableMetadataOutput = listArguments[["variableMetadataOutput"]]; listArguments[["variableMetadataOutput"]]=NULL
92 } 92 }
93 93
94 if (!is.null(listArguments[["new_file_path"]])){
95 new_file_path = listArguments[["new_file_path"]]; listArguments[["new_file_path"]]=NULL
96 }
97
98 #Import the different functions 94 #Import the different functions
99 source_local("lib.r") 95 source_local("lib.r")
100 96
101 # We unzip automatically the chromatograms from the zip files. 97 # We unzip automatically the chromatograms from the zip files.
102 if (thefunction %in% c("annotatediff")) { 98 if (thefunction %in% c("annotatediff")) {
126 #change the default display settings 122 #change the default display settings
127 pdf(file=rplotspdf, width=16, height=12) 123 pdf(file=rplotspdf, width=16, height=12)
128 124
129 125
130 if (thefunction %in% c("annotatediff")) { 126 if (thefunction %in% c("annotatediff")) {
131 results_list=annotatediff(xset=xset,listArguments=listArguments,variableMetadataOutput=variableMetadataOutput,dataMatrixOutput=dataMatrixOutput,new_file_path=new_file_path) 127 results_list=annotatediff(xset=xset,listArguments=listArguments,variableMetadataOutput=variableMetadataOutput,dataMatrixOutput=dataMatrixOutput)
132 xa=results_list[["xa"]] 128 xa=results_list[["xa"]]
133 diffrep=results_list[["diffrep"]] 129 diffrep=results_list[["diffrep"]]
134 variableMetadata=results_list[["variableMetadata"]] 130 variableMetadata=results_list[["variableMetadata"]]
135 131
136 cat("\n\n") 132 cat("\n\n")