From 0821371174c39765a3624f3306bc0278312f3dc7 Mon Sep 17 00:00:00 2001 From: shraddhapai Date: Wed, 9 Dec 2020 16:45:18 -0500 Subject: [PATCH] changed signature for curatedTCGAData() call to include version --- R/buildPredictor.R | 4 ++-- R/createPSN_MultiData.R | 4 ++-- man/buildPredictor.Rd | 4 ++-- man/createPSN_MultiData.Rd | 4 ++-- man/replacePattern.Rd | 26 ++++++++++++++++++++++++++ vignettes/BuildPredictor.Rmd | 9 ++++++--- vignettes/ThreeWayClassifier.Rmd | 6 +++--- 7 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 man/replacePattern.Rd diff --git a/R/buildPredictor.R b/R/buildPredictor.R index 7e9fe9eb..c44f595c 100644 --- a/R/buildPredictor.R +++ b/R/buildPredictor.R @@ -95,10 +95,10 @@ #' #' library(curatedTCGAData) #' library(MultiAssayExperiment) -#' curatedTCGAData(diseaseCode="BRCA", assays="*",dry.run=TRUE) +#' curatedTCGAData(diseaseCode="BRCA", assays="*",dry.run=TRUE,version="1.1.38") #' #' # fetch mrna, mutation data -#' brca <- curatedTCGAData("BRCA",c("mRNAArray"),FALSE) +#' brca <- curatedTCGAData("BRCA",c("mRNAArray"),FALSE,version="1.1.38") #' #' # get subtype info #' pID <- colData(brca)$patientID diff --git a/R/createPSN_MultiData.R b/R/createPSN_MultiData.R index fa8cff4b..ea6e976c 100644 --- a/R/createPSN_MultiData.R +++ b/R/createPSN_MultiData.R @@ -25,10 +25,10 @@ #' #' library(curatedTCGAData) #' library(MultiAssayExperiment) -#' curatedTCGAData(diseaseCode='BRCA', assays='*',dry.run=TRUE) +#' curatedTCGAData(diseaseCode='BRCA', assays='*',dry.run=TRUE,version="1.1.38") #' #' # fetch mrna, mutation data -#' brca <- curatedTCGAData('BRCA',c('mRNAArray'),FALSE) +#' brca <- curatedTCGAData('BRCA',c('mRNAArray'),FALSE,version="1.1.38") #' #' # get subtype info #' pID <- colData(brca)$patientID diff --git a/man/buildPredictor.Rd b/man/buildPredictor.Rd index 55137c80..b0480695 100644 --- a/man/buildPredictor.Rd +++ b/man/buildPredictor.Rd @@ -140,10 +140,10 @@ Clinical -> single or grouped nets library(curatedTCGAData) library(MultiAssayExperiment) -curatedTCGAData(diseaseCode="BRCA", assays="*",dry.run=TRUE) +curatedTCGAData(diseaseCode="BRCA", assays="*",dry.run=TRUE,version="1.1.38") # fetch mrna, mutation data -brca <- curatedTCGAData("BRCA",c("mRNAArray"),FALSE) +brca <- curatedTCGAData("BRCA",c("mRNAArray"),FALSE,version="1.1.38") # get subtype info pID <- colData(brca)$patientID diff --git a/man/createPSN_MultiData.Rd b/man/createPSN_MultiData.Rd index 63e9e8a1..3e6d45e5 100644 --- a/man/createPSN_MultiData.Rd +++ b/man/createPSN_MultiData.Rd @@ -54,10 +54,10 @@ Wrapper to create custom input features (patient similarity networks) library(curatedTCGAData) library(MultiAssayExperiment) -curatedTCGAData(diseaseCode='BRCA', assays='*',dry.run=TRUE) +curatedTCGAData(diseaseCode='BRCA', assays='*',dry.run=TRUE,version="1.1.38") # fetch mrna, mutation data -brca <- curatedTCGAData('BRCA',c('mRNAArray'),FALSE) +brca <- curatedTCGAData('BRCA',c('mRNAArray'),FALSE,version="1.1.38") # get subtype info pID <- colData(brca)$patientID diff --git a/man/replacePattern.Rd b/man/replacePattern.Rd new file mode 100644 index 00000000..c13355eb --- /dev/null +++ b/man/replacePattern.Rd @@ -0,0 +1,26 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/compileFeatures.R +\name{replacePattern} +\alias{replacePattern} +\title{Replace pattern in all files in dir} +\usage{ +replacePattern(pattern = ",", target = ".", path = getwd(), fileType = "txt$") +} +\arguments{ +\item{pattern}{(char) pattern to find} + +\item{target}{(char) pattern to replace} + +\item{path}{(char) dir to replace pattern in} + +\item{fileType}{(char) pattern for files to replace pattern in} +} +\value{ +No value. Files have patterns replaced in place. +} +\description{ +find/replace pattern in all files of specified file type +in specified directory. Needed to modify number format when intefacing +with GeneMANIA, on French locale machines. Without this step, +CacheBuilder throws error with commas. +} diff --git a/vignettes/BuildPredictor.Rmd b/vignettes/BuildPredictor.Rmd index 74f7baa7..ac22adf2 100644 --- a/vignettes/BuildPredictor.Rmd +++ b/vignettes/BuildPredictor.Rmd @@ -19,7 +19,8 @@ suppressWarnings(suppressMessages(require(netDx))) suppressWarnings(suppressMessages(library(curatedTCGAData))) # fetch data remotely -brca <- suppressMessages(curatedTCGAData("BRCA",c("mRNAArray"),FALSE)) +brca <- suppressMessages(curatedTCGAData("BRCA",c("mRNAArray"),FALSE, + version="1.1.38")) # process input variables staget <- sub("[abcd]","",sub("t","",colData(brca)$pathology_T_stage)) @@ -241,12 +242,14 @@ suppressMessages(library(curatedTCGAData)) Take a look at the available data without downloading any: ```{r,eval=TRUE} -curatedTCGAData(diseaseCode="BRCA", assays="*",dry.run=TRUE) +curatedTCGAData(diseaseCode="BRCA", assays="*",dry.run=TRUE, + version="1.1.38") ``` We will work only with the mRNA data in this example: ```{r,eval=TRUE} -brca <- suppressMessages(curatedTCGAData("BRCA",c("mRNAArray"),FALSE)) +brca <- suppressMessages(curatedTCGAData("BRCA",c("mRNAArray"),FALSE, + version="1.1.38")) ``` This next code block prepares the TCGA data. In practice you would do this once, and save the data before running netDx, but we run it here to see an end-to-end example. diff --git a/vignettes/ThreeWayClassifier.Rmd b/vignettes/ThreeWayClassifier.Rmd index afcd879b..457ec03c 100644 --- a/vignettes/ThreeWayClassifier.Rmd +++ b/vignettes/ThreeWayClassifier.Rmd @@ -22,7 +22,7 @@ suppressWarnings(suppressMessages(library(curatedTCGAData))) brca <- suppressMessages( curatedTCGAData("BRCA", c("mRNAArray","RPPA*","Methylation_methyl27*"), - dry.run=FALSE)) + dry.run=FALSE,version="1.1.38")) # process input variables # prepare clinical variable - stage @@ -168,7 +168,7 @@ suppressMessages(library(curatedTCGAData)) We use the `curatedTCGAData()` command to look at available assays in the breast cancer dataset. ```{r,eval=TRUE} -curatedTCGAData(diseaseCode="BRCA", assays="*",dry.run=TRUE) +curatedTCGAData(diseaseCode="BRCA", assays="*",dry.run=TRUE,version="1.1.38") ``` In this call we fetch only the gene expression, proteomic and methylation data; setting `dry.run=FALSE` initiates the fetching of the data. @@ -177,7 +177,7 @@ In this call we fetch only the gene expression, proteomic and methylation data; brca <- suppressMessages( curatedTCGAData("BRCA", c("mRNAArray","RPPA*","Methylation_methyl27*"), - dry.run=FALSE)) + dry.run=FALSE,version="1.1.38")) ``` This next code block prepares the TCGA data. In practice you would do this once, and save the data before running netDx, but we run it here to see an end-to-end example.