Skip to content
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
757072f
Added tie_is_twomode() for identifying ties that are multimodal
jhollway Dec 3, 2025
2941294
Improved to_uniplex() to now handle filtering multimodal multiplex co…
jhollway Dec 3, 2025
8a628e4
#patch bump
jhollway Dec 3, 2025
821df10
Compiled both ison_marvel datasets into single multiplex dataset
jhollway Dec 5, 2025
7046a8e
Added net_node_names() and net_tie_names() to obtain information abou…
jhollway Dec 5, 2025
99212da
Split documentation of measure_attributes up into nodes and ties
jhollway Dec 5, 2025
c56a8a0
add_changes() needs to work with a tbl_graph
jhollway Feb 14, 2026
0504f9e
Removed unnecessary global variables
jhollway Feb 14, 2026
7fffd8b
Exporting own expect_nodes and expect_ties for other packages
jhollway Feb 14, 2026
796cbec
Added net_name() for obtaining the name of the network, if it has one
jhollway Feb 15, 2026
c79e4f5
write_graphml() first coerces to igraph
jhollway Feb 16, 2026
553e3c3
filter_nodes() now uses dplyr::all_of()
jhollway Feb 16, 2026
f1c6ff4
Restructured modifying functions to be documented around e.g. direction
jhollway Feb 16, 2026
6d67aeb
Fixed net_name() documentation
jhollway Feb 16, 2026
5901ecf
Using multiplex fict_marvel dataset
jhollway Feb 16, 2026
f5abeac
net_by_mixed() now works with multiplex networks
jhollway Feb 17, 2026
bd334a2
Using fict_marvel in tests
jhollway Feb 17, 2026
8cfbc5a
Fixed #123 by adding NAs in place and removing them before making the…
jhollway Feb 17, 2026
4126d59
Exporting expect_nodes() and expect_ties() for use in other packages
jhollway Feb 17, 2026
7dcc7d9
Restructured website
jhollway Feb 17, 2026
2df12f2
Added interpolate() helper for injecting e.g. missing data
jhollway Feb 17, 2026
a74167a
Improved to_mode1() and to_mode2() to drop unnecessary nodal information
jhollway Feb 17, 2026
db42558
Improved to_mode1() and to_mode2() to carry forward nodal and tie inf…
jhollway Feb 17, 2026
421eca9
Updated NEWS
jhollway Feb 18, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: manynet
Title: Many Ways to Make, Modify, Mark, and Measure Myriad Networks
Version: 1.7.0
Date: 2025-11-19
Version: 1.7.1
Copy link

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

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

The version/date are bumped for a 1.7.1 release, but there is no corresponding 1.7.1 entry in NEWS.md. If this PR is intended to cut v1.7.1, NEWS.md should be updated to summarize user-visible changes so the package changelog stays consistent with the release metadata.

Suggested change
Version: 1.7.1
Version: 1.7.0

Copilot uses AI. Check for mistakes.
Date: 2026-02-17
Description: Many tools for making, modifying, marking, measuring,
and motifs and memberships of many different types of networks.
All functions operate with matrices, edge lists, and 'igraph', 'network', and 'tidygraph' objects,
Expand Down
7 changes: 7 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,8 @@ export(describe_changes)
export(describe_network)
export(describe_nodes)
export(describe_ties)
export(expect_nodes)
export(expect_ties)
export(extract_tute)
export(filter_changes)
export(filter_nodes)
Expand Down Expand Up @@ -456,7 +458,9 @@ export(net_infection_peak)
export(net_infection_total)
export(net_length)
export(net_modularity)
export(net_name)
export(net_node_attributes)
export(net_node_names)
export(net_nodes)
export(net_outdegree)
export(net_reach)
Expand All @@ -471,6 +475,7 @@ export(net_spatial)
export(net_stability)
export(net_strength)
export(net_tie_attributes)
export(net_tie_names)
export(net_ties)
export(net_toughness)
export(net_transitivity)
Expand Down Expand Up @@ -717,6 +722,7 @@ export(tie_is_simmelian)
export(tie_is_transitive)
export(tie_is_triangular)
export(tie_is_triplet)
export(tie_is_twomode)
export(tie_signs)
export(tie_weights)
export(to_acyclic)
Expand Down Expand Up @@ -822,6 +828,7 @@ importFrom(igraph,edge_density)
importFrom(igraph,eulerian_path)
importFrom(igraph,feedback_arc_set)
importFrom(igraph,fit_power_law)
importFrom(igraph,graph_attr)
importFrom(igraph,graph_from_adjacency_matrix)
importFrom(igraph,graph_from_biadjacency_matrix)
importFrom(igraph,graph_from_data_frame)
Expand Down
12 changes: 0 additions & 12 deletions R/class_networks.R
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,6 @@ is_grand <- function(.data){
!is.null(igraph::graph_attr(.data, "grand"))
}

net_name <- function(.data, prefix = NULL){
existname <- ""
if(!is.null(igraph::graph_attr(.data, "name"))) {
existname <- igraph::graph_attr(.data, 'name')
} else if(is_grand(.data) &&
!is.null(igraph::graph_attr(.data, "grand")$name)){
existname <- igraph::graph_attr(.data, 'grand')$name
}
if(existname != "" && !is.null(prefix)) existname <- paste(prefix, existname)
existname
}

#' @rdname make_mnet
#' @export
describe_network <- function(x) {
Expand Down
38 changes: 14 additions & 24 deletions R/data_fict.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@

## Marvel ####

#' Multilevel two-mode affiliation, signed one-mode networks of Marvel comic
#' book characters (Yuksel 2017)
#' Multiplex two-mode affiliation and one-mode signed relationship network of
#' Marvel comic book characters (Yuksel 2017)
#'
#' @description
#' This package includes two datasets related to the Marvel _comic book_ universe.
#' The first, `ison_marvel_teams`, is a two-mode affiliation network of 53
#' Marvel comic book characters and their affiliations to 141 different teams.
#' This network includes only information about nodes' names and nodeset,
#' but additional nodal data can be taken from the other Marvel dataset here.
#'
#' The second network, `ison_marvel_relationships`, is a one-mode signed network
#' of friendships and enmities between the 53 Marvel comic book characters.
#' Friendships are indicated by a positive sign in the tie `sign` attribute,
#' whereas enmities are indicated by a negative sign in this edge attribute.
#' This multiplex network contains two types of ties related to the
#' Marvel _comic book_ universe.
#' The "affiliation" ties offer a two-mode affiliation network of 53
#' Marvel comic book characters and their affiliations to 141 teams.
#' The "relationship" ties offer a one-mode signed network
#' of friendships and enmities between the 53 Marvel comic book characters.
#' Friendships are indicated by a positive sign in the tie `sign` attribute,
#' whereas enmities are indicated by a negative sign in this edge attribute.
#' @details
#' Additional nodal variables have been coded and included by Dr Umut Yuksel:
#'
Expand All @@ -33,22 +31,14 @@
#' See also https://graphics.straitstimes.com/STI/STIMEDIA/Interactives/2018/04/marvel-cinematic-universe-whos-who-interactive/index.html.
#' @docType data
#' @keywords datasets
#' @name ison_marvel
#' @usage data(ison_marvel_teams)
#' @name fict_marvel
#' @usage data(fict_marvel)
#' @source Umut Yuksel, 31 March 2017
#' @format
#' ```{r, echo = FALSE}
#' ison_marvel_teams
#' ```
"ison_marvel_teams"

#' @rdname ison_marvel
#' @usage data(ison_marvel_relationships)
#' @format
#' ```{r, echo = FALSE}
#' ison_marvel_relationships
#' fict_marvel
#' ```
"ison_marvel_relationships"
"fict_marvel"

## Lord of the Rings ####

Expand Down
2 changes: 1 addition & 1 deletion R/make_read.R
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ write_graphml <- function(.data,
filename <- paste0(getwd(), "/", deparse(substitute(.data)), ".graphml")
snet_success("Writing to {.file {filename}}")
}
igraph::write_graph(.data,
igraph::write_graph(as_igraph(.data),
filename,
format = "graphml")
}
Expand Down
7 changes: 6 additions & 1 deletion R/manip_as.R
Original file line number Diff line number Diff line change
Expand Up @@ -510,8 +510,13 @@ as_igraph.networkDynamic <- function(.data, twomode = FALSE) {

# changes
changes <- do.call(rbind, lapply(1:length(.data$val),
function(x) data.frame(x, .data$val[[x]]$active)))
function(x) data.frame(node = x,
if(is.null(.data$val[[x]]$active))
matrix(c(NA, NA), ncol = 2) else
.data$val[[x]]$active
)))
names(changes) <- c("node","begin","end")
changes <- stats::na.omit(changes)

as_igraph(add_changes(out, changes))
}
Expand Down
Loading
Loading