Skip to content

Commit

Permalink
Merge pull request #97 from stocnet/develop
Browse files Browse the repository at this point in the history
v1.2.6
  • Loading branch information
jhollway authored Oct 5, 2024
2 parents e651b76 + a62bcf5 commit be7c2bf
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 1 deletion.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: manynet
Title: Many Ways to Make, Modify, Map, Mark, and Measure Myriad Networks
Version: 1.2.5
Version: 1.2.6
Date: 2024-10-05
Description: Many tools for making, modifying, mapping, marking, measuring,
and motifs and memberships of many different types of networks.
Expand Down
7 changes: 7 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# manynet 1.2.6

## Package

- Fixed errors when testing without `{concaveman}`
- Fixed errors when plotting some examples without `{ggdendro}`

# manynet 1.2.5

## Package
Expand Down
2 changes: 2 additions & 0 deletions R/member_community.R
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,9 @@ NULL
#' \doi{10.1103/PhysRevE.69.026113}
#' @examples
#' node_in_betweenness(ison_adolescents)
#' if(require("ggdendro", quietly = TRUE)){
#' plot(node_in_betweenness(ison_adolescents))
#' }
#' @export
node_in_betweenness <- function(.data){
if(missing(.data)) {expect_nodes(); .data <- .G()}
Expand Down
6 changes: 6 additions & 0 deletions R/member_equivalence.R
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,10 @@ node_in_equivalence <- function(.data, census,
#' @examples
#' \donttest{
#' (nse <- node_in_structural(ison_algebra))
#' if(require("ggdendro", quietly = TRUE)){
#' plot(nse)
#' }
#' }
#' @export
node_in_structural <- function(.data,
k = c("silhouette", "elbow", "strict"),
Expand All @@ -100,8 +102,10 @@ node_in_structural <- function(.data,
#' \donttest{
#' (nre <- node_in_regular(ison_southern_women,
#' cluster = "concor"))
#' if(require("ggdendro", quietly = TRUE)){
#' plot(nre)
#' }
#' }
#' @export
node_in_regular <- function(.data,
k = c("silhouette", "elbow", "strict"),
Expand All @@ -126,6 +130,8 @@ node_in_regular <- function(.data,
#' if(require("sna", quietly = TRUE)){
#' (nae <- node_in_automorphic(ison_southern_women,
#' k = "elbow"))
#' }
#' if(require("ggdendro", quietly = TRUE)){
#' plot(nae)
#' }
#' }
Expand Down
2 changes: 2 additions & 0 deletions man/member_community_hier.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions man/member_equivalence.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tests/testthat/test-map_autograph.R
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ test_that("named networks plot correctly", {
# Test that autographr() works with arguments without quotes
test_that("node_group works correctly", {
skip_on_cran()
testthat::skip_if_not_installed("concaveman")
expect_equal(graphr(ison_lawfirm, node_group = gender),
graphr(ison_lawfirm, node_group = "gender"))
})
Expand Down

0 comments on commit be7c2bf

Please sign in to comment.