Commit 5bbcbfb3 authored by houyun's avatar houyun
Browse files

Merge branch 'master' of github.com:Hy4m/linkET

# Conflicts:
#	R/network.R
#	man/adjacency_matrix.Rd
parents 8113a420 5b063d4f
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ as_tbl_graph.corr.test <- function(x, ...) {
#' @param type one of "full", "upper" or "lower", used to extract upper or lower
#' triangular part of a adjacency matrix.
#' @param diag if FALSE (default),  self-edges will be removed.
#' @param missing numeric, used to fill in missing values.
#' @return a matrix object.
#' @author Hou Yun
#' @rdname adjacency_matrix
+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ coefficient matrix, and if (FALSE) will return adjacency matrix.}
triangular part of a adjacency matrix.}

\item{diag}{if FALSE (default),  self-edges will be removed.}

\item{missing}{numeric, used to fill in missing values.}
}
\value{
a matrix object.