Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
07d6759
refactor: manually edit zzz-deprecate.R
maelle Dec 4, 2023
a6e7b36
refactor: add tools script&template
maelle Dec 4, 2023
18a9120
refactor: split zzz-deprecate
maelle Dec 4, 2023
efde49f
refactor!: change R/adjacency.R
maelle Dec 4, 2023
84554f1
refactor!: change R/assortativity.R
maelle Dec 4, 2023
bf9c8f0
refactor!: change R/attributes.R
maelle Dec 4, 2023
0242a3b
refactor!: change R/basic.R
maelle Dec 4, 2023
94039a8
refactor!: change R/bipartite.R
maelle Dec 4, 2023
3d56fb5
refactor!: change R/centrality.R
maelle Dec 4, 2023
2406eab
refactor!: change R/centralization.R
maelle Dec 4, 2023
0b82979
refactor!: change R/cliques.R
maelle Dec 4, 2023
f9e0417
refactor!: change R/cohesive.blocks.R
maelle Dec 4, 2023
992a744
refactor!: change R/community.R
maelle Dec 4, 2023
60997a3
refactor!: change R/components.R
maelle Dec 4, 2023
b6bd580
refactor!: change R/console.R
maelle Dec 4, 2023
bff9ec2
refactor!: change R/conversion.R
maelle Dec 4, 2023
e66fd7b
refactor!: change R/data_frame.R
maelle Dec 4, 2023
285e1f6
refactor!: change R/decomposition.R
maelle Dec 4, 2023
6d4a441
refactor!: change R/degseq.R
maelle Dec 4, 2023
b237cb7
refactor!: change R/demo.R
maelle Dec 4, 2023
a1430d5
refactor!: change R/fit.R
maelle Dec 4, 2023
ced42cd
refactor!: change R/flow.R
maelle Dec 4, 2023
f4fbc1c
refactor!: change R/foreign.R
maelle Dec 4, 2023
6ee5cf1
refactor!: change R/games.R
maelle Dec 4, 2023
97883ea
refactor!: change R/glet.R
maelle Dec 4, 2023
6f810cd
refactor!: change R/hrg.R
maelle Dec 4, 2023
2542e0c
refactor!: change R/incidence.R
maelle Dec 4, 2023
e874677
refactor!: change R/interface.R
maelle Dec 4, 2023
63d3518
refactor!: change R/layout_drl.R
maelle Dec 4, 2023
946969a
refactor!: change R/layout.R
maelle Dec 4, 2023
728acd7
refactor!: change R/make.R
maelle Dec 4, 2023
e795932
refactor!: change R/minimum.spanning.tree.R
maelle Dec 4, 2023
516afc1
refactor!: change R/motifs.R
maelle Dec 4, 2023
016ffa3
refactor!: change R/operators.R
maelle Dec 4, 2023
3ede6bd
refactor!: change R/other.R
maelle Dec 4, 2023
7886832
refactor!: change R/par.R
maelle Dec 4, 2023
1a30b16
refactor!: change R/paths.R
maelle Dec 4, 2023
461c4f1
refactor!: change R/plot.common.R
maelle Dec 4, 2023
114f382
refactor!: change R/plot.shapes.R
maelle Dec 4, 2023
4dbc6f4
refactor!: change R/scg.R
maelle Dec 4, 2023
af09787
refactor!: change R/simple.R
maelle Dec 4, 2023
2f800f1
refactor!: change R/structural.properties.R
maelle Dec 4, 2023
924bbe1
refactor!: change R/structure.info.R
maelle Dec 4, 2023
5188e36
refactor!: change R/test.R
maelle Dec 4, 2023
7e80d97
refactor!: change R/tkplot.R
maelle Dec 4, 2023
d01bcce
refactor!: change R/topology.R
maelle Dec 4, 2023
6043e51
refactor!: change R/triangles.R
maelle Dec 4, 2023
d388a4a
refactor: remove deprecated() def
maelle Dec 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,6 @@ importFrom(utils,capture.output)
importFrom(utils,edit)
importFrom(utils,head)
importFrom(utils,packageDescription)
importFrom(utils,packageName)
importFrom(utils,read.table)
importFrom(utils,setTxtProgressBar)
importFrom(utils,tail)
Expand Down
17 changes: 16 additions & 1 deletion R/adjacency.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@

#' Create graphs from adjacency matrices
#'
#' @description
#' `r lifecycle::badge("deprecated")`
#'
#' `graph.adjacency()` was renamed to `graph_from_adjacency_matrix()` to create a more
#' consistent API.
#' @inheritParams graph_from_adjacency_matrix
#' @keywords internal
#' @export
graph.adjacency <- function(adjmatrix , mode = c("directed","undirected","max","min","upper","lower","plus") , weighted = NULL , diag = TRUE , add.colnames = NULL , add.rownames = NA) { # nocov start
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
graph.adjacency <- function(adjmatrix , mode = c("directed","undirected","max","min","upper","lower","plus") , weighted = NULL , diag = TRUE , add.colnames = NULL , add.rownames = NA) { # nocov start
graph.adjacency <- function(adjmatrix, mode = c("directed", "undirected", "max", "min", "upper", "lower", "plus"), weighted = NULL, diag = TRUE, add.colnames = NULL, add.rownames = NA) { # nocov start

lifecycle::deprecate_soft("1.6.0", "graph.adjacency()", "graph_from_adjacency_matrix()")
graph_from_adjacency_matrix(adjmatrix = adjmatrix, mode = mode, weighted = weighted, diag = diag, add.colnames = add.colnames, add.rownames = add.rownames)
} # nocov end

## ----------------------------------------------------------------
##
## IGraph R package
Expand Down Expand Up @@ -276,7 +291,6 @@ graph.adjacency.sparse <- function(adjmatrix, mode, weighted = NULL, diag = TRUE
#' undirected graph will be created, `A(i,j)+A(j,i)` gives the edge
#' weights.} }
#'
#' @aliases graph.adjacency
#' @param adjmatrix A square adjacency matrix. From igraph version 0.5.1 this
#' can be a sparse matrix created with the `Matrix` package.
#' @param mode Character scalar, specifies how igraph should interpret the
Expand Down Expand Up @@ -455,3 +469,4 @@ is_symmetric <- function(x) {
#' @family adjacency
#' @export
from_adjacency <- function(...) constructor_spec(graph_from_adjacency_matrix, ...)
#' @export graph.adjacency
33 changes: 32 additions & 1 deletion R/assortativity.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,34 @@

#' Assortativity coefficient
#'
#' @description
#' `r lifecycle::badge("deprecated")`
#'
#' `assortativity.nominal()` was renamed to `assortativity_nominal()` to create a more
#' consistent API.
#' @inheritParams assortativity_nominal
#' @keywords internal
#' @export
assortativity.nominal <- function(graph , types , directed = TRUE) { # nocov start
lifecycle::deprecate_soft("1.6.0", "assortativity.nominal()", "assortativity_nominal()")
assortativity_nominal(graph = graph, types = types, directed = directed)
} # nocov end

#' Assortativity coefficient
#'
#' @description
#' `r lifecycle::badge("deprecated")`
#'
#' `assortativity.degree()` was renamed to `assortativity_degree()` to create a more
#' consistent API.
#' @inheritParams assortativity_degree
#' @keywords internal
#' @export
assortativity.degree <- function(graph , directed = TRUE) { # nocov start
lifecycle::deprecate_soft("1.6.0", "assortativity.degree()", "assortativity_degree()")
assortativity_degree(graph = graph, directed = directed)
} # nocov end

## -----------------------------------------------------------------------
##
## IGraph R package
Expand Down Expand Up @@ -68,7 +98,7 @@
#' `assortativity_degree()` uses vertex degree (minus one) as vertex values
#' and calls `assortativity()`.
#'
#' @aliases assortativity assortativity.degree assortativity.nominal
#' @aliases assortativity
#' @param graph The input graph, it can be directed or undirected.
#' @param values The vertex values, these can be arbitrary numeric values.
#' @inheritParams rlang::args_dots_empty
Expand Down Expand Up @@ -170,3 +200,4 @@ assortativity_nominal <- assortativity_nominal_impl
#' @rdname assortativity
#' @export
assortativity_degree <- assortativity_degree_impl
#' @export assortativity.degree
Loading