Skip to content
Snippets Groups Projects
Commit 6146cadd authored by Nathalie Vialaneix's avatar Nathalie Vialaneix
Browse files

correcting a minor problem in documentation + improved a bit wording

parent 550142e1
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#' #'
#' @description This function converts Hi-C data into trees, using the adjclust #' @description This function converts Hi-C data into trees, using the adjclust
#' algorithm. It takes as input a file path vector, the format of the input #' algorithm. It takes as input a file path vector, the format of the input
#' data, the bins size of the Hi-C array, the chromosomes to be included in the #' data, the bin size of the Hi-C array, the chromosomes to be included in the
#' analysis, and the number of replicates. It returns a list containing all #' analysis, and the number of replicates. It returns a list containing all
#' trees, metadata, index and treediff results. #' trees, metadata, index and treediff results.
#' #'
...@@ -10,13 +10,14 @@ ...@@ -10,13 +10,14 @@
#' @param format A character vector indicating the format of the input data: #' @param format A character vector indicating the format of the input data:
#' "tabular", "cooler", "juicer", or "HiC-Pro". #' "tabular", "cooler", "juicer", or "HiC-Pro".
#' @param binsize An integer indicating the bin size of the Hi-C matrix. #' @param binsize An integer indicating the bin size of the Hi-C matrix.
#' @param index Index of the input data, only needed with the "HiC-Pro" format. #' @param index A character indicating the path of the index for the input data.
#' Required (and used) only with the "HiC-Pro" format.
#' @param chromosomes A vector containing the chromosomes to be included in the #' @param chromosomes A vector containing the chromosomes to be included in the
#' analysis. #' analysis.
#' @param replicates An integer indicating the number of replicates to be used #' @param replicates An integer indicating the number of replicates to be used
#' in treediff. #' in treediff.
#' #'
#' @return A list containing: #' @return A list containing:
#' \itemize{ #' \itemize{
#' \item{trees}{ A list of all trees.} #' \item{trees}{ A list of all trees.}
#' \item{metadata}{ A data frame containing the following columns: names (name #' \item{metadata}{ A data frame containing the following columns: names (name
...@@ -48,7 +49,7 @@ ...@@ -48,7 +49,7 @@
#' format <- rep(rep("HiC-Pro", 6), nb_chr) #' format <- rep(rep("HiC-Pro", 6), nb_chr)
#' binsize <- 200000 #' binsize <- 200000
#' files <- system.file("extdata", unlist(all_mat_chr), package = "treediff") #' files <- system.file("extdata", unlist(all_mat_chr), package = "treediff")
#' replicates <- c(3,3) #' replicates <- c(3, 3)
#' #'
#' HiC2Tree(files, format, binsize, index, chromosomes, replicates) #' HiC2Tree(files, format, binsize, index, chromosomes, replicates)
#' #'
...@@ -376,7 +377,6 @@ normalizeCount.HiCDOCDataSetList <- function(count_matrice){ ...@@ -376,7 +377,6 @@ normalizeCount.HiCDOCDataSetList <- function(count_matrice){
#' @param mat A matrix containing the data to cluster. It should have columns #' @param mat A matrix containing the data to cluster. It should have columns
#' named 'index1', 'index2', 'chromosome and one column for each matrices. #' named 'index1', 'index2', 'chromosome and one column for each matrices.
#' #'
#' @return
#' @return A list containing the following objects: #' @return A list containing the following objects:
#' \describe{ #' \describe{
#' \item{trees}{ A list of hierarchical clustering trees, one for each cluster #' \item{trees}{ A list of hierarchical clustering trees, one for each cluster
......
...@@ -14,7 +14,8 @@ HiC2Tree(files, format, binsize = NULL, index = NULL, chromosomes, replicates) ...@@ -14,7 +14,8 @@ HiC2Tree(files, format, binsize = NULL, index = NULL, chromosomes, replicates)
\item{binsize}{An integer indicating the bin size of the Hi-C matrix.} \item{binsize}{An integer indicating the bin size of the Hi-C matrix.}
\item{index}{Index of the input data, only needed with the "HiC-Pro" format.} \item{index}{A character indicating the path of the index for the input data.
Required (and used) only with the "HiC-Pro" format.}
\item{chromosomes}{A vector containing the chromosomes to be included in the \item{chromosomes}{A vector containing the chromosomes to be included in the
analysis.} analysis.}
...@@ -23,7 +24,7 @@ analysis.} ...@@ -23,7 +24,7 @@ analysis.}
in treediff.} in treediff.}
} }
\value{ \value{
A list containing: A list containing:
\itemize{ \itemize{
\item{trees}{ A list of all trees.} \item{trees}{ A list of all trees.}
\item{metadata}{ A data frame containing the following columns: names (name \item{metadata}{ A data frame containing the following columns: names (name
...@@ -36,7 +37,7 @@ A list containing: ...@@ -36,7 +37,7 @@ A list containing:
\description{ \description{
This function converts Hi-C data into trees, using the adjclust This function converts Hi-C data into trees, using the adjclust
algorithm. It takes as input a file path vector, the format of the input algorithm. It takes as input a file path vector, the format of the input
data, the bins size of the Hi-C array, the chromosomes to be included in the data, the bin size of the Hi-C array, the chromosomes to be included in the
analysis, and the number of replicates. It returns a list containing all analysis, and the number of replicates. It returns a list containing all
trees, metadata, index and treediff results. trees, metadata, index and treediff results.
} }
...@@ -61,7 +62,7 @@ package = "treediff") ...@@ -61,7 +62,7 @@ package = "treediff")
format <- rep(rep("HiC-Pro", 6), nb_chr) format <- rep(rep("HiC-Pro", 6), nb_chr)
binsize <- 200000 binsize <- 200000
files <- system.file("extdata", unlist(all_mat_chr), package = "treediff") files <- system.file("extdata", unlist(all_mat_chr), package = "treediff")
replicates <- c(3,3) replicates <- c(3, 3)
HiC2Tree(files, format, binsize, index, chromosomes, replicates) HiC2Tree(files, format, binsize, index, chromosomes, replicates)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment