Skip to content

Commit

Permalink
Merge pull request #295 from stocnet/develop
Browse files Browse the repository at this point in the history 
v1.4.0
  • Loading branch information
@jhollway
jhollway committed Jul 19, 2024
2 parents 650b5c5 + a729dd6 commit 74b8590
Show file tree
Hide file tree
Showing 97 changed files with 918 additions and 18,731 deletions.
26 changes: 13 additions & 13 deletions DESCRIPTION
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
Package: migraph
Title: Many Network Measures, Motifs, Members, and Models
Version: 1.3.4
Date: 2024-03-07
Description: A set of tools for analysing multimodal networks.
It includes functions for measuring
centrality, centralization, cohesion, closure, constraint and diversity,
as well as for network block-modelling, regression, and diffusion models.
The package is released as a complement to
Title: Univariate and multivariate tests for multimodal and other networks
Version: 1.4.0
Date: 2024-07-18
Description: A set of tools for testing networks.
It includes functions for univariate and multivariate
conditional uniform graph and quadratic assignment procedure testing,
and network regression.
The package is a complement to
'Multimodal Political Networks' (2021, ISBN:9781108985000),
and includes various datasets used in the book.
Built on the 'manynet' package, all functions operate with matrices, edge lists,
and 'igraph', 'network', and 'tidygraph' objects,
and on one-mode, two-mode (bipartite), and sometimes three-mode networks.
and on one-mode and two-mode (bipartite) networks.
URL: https://stocnet.github.io/migraph/
BugReports: https://github.com/stocnet/migraph/issues
License: MIT + file LICENSE
Language: en-GB
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Depends:
R (>= 3.6.0),
manynet
Expand All @@ -30,10 +30,7 @@ Imports:
network,
future,
furrr,
pillar,
purrr,
rlang,
sna,
tidygraph,
tidyr
Suggests:
Expand Down Expand Up @@ -68,3 +65,6 @@ Authors@R:
comment = c(ORCID = "0000-0001-5943-9059"))
)
Roxygen: list(markdown = TRUE, roclets = c("namespace", "rd"))
Config/testthat/parallel: true
Config/testthat/edition: 3
Config/testthat/start-first: helper-functions
235 changes: 7 additions & 228 deletions NAMESPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,10 @@

S3method(glance,netlm)
S3method(glance,netlogit)
S3method(plot,graph_test)
S3method(plot,matrix)
S3method(plot,netlm)
S3method(plot,netlogit)
S3method(plot,network_measures)
S3method(plot,network_test)
S3method(plot,node_measure)
S3method(plot,node_member)
S3method(plot,tie_measure)
S3method(print,graph_measure)
S3method(print,graph_motif)
S3method(print,graph_test)
S3method(print,network_measure)
S3method(print,network_motif)
S3method(print,network_test)
S3method(print,node_measure)
S3method(print,node_member)
S3method(print,node_motif)
S3method(print,tie_measure)
S3method(summary,node_measure)
S3method(summary,node_member)
S3method(summary,node_motif)
S3method(tidy,netlm)
S3method(tidy,netlogit)
export("%>%")
Expand All @@ -33,184 +15,28 @@ export(.N)
export(aes)
export(as.network)
export(bind_edges)
export(cluster_concor)
export(cluster_hierarchical)
export(edge_betweenness)
export(edge_bridges)
export(edge_closeness)
export(edge_degree)
export(edge_eigenvector)
export(edge_loop)
export(edge_multiple)
export(edge_reciprocal)
export(ggplot)
export(ggsave)
export(ggtitle)
export(glance)
export(graph_adhesion)
export(graph_assortativity)
export(graph_balance)
export(graph_betweenness)
export(graph_blau_index)
export(graph_closeness)
export(graph_cohesion)
export(graph_components)
export(graph_congruency)
export(graph_core)
export(graph_degree)
export(graph_density)
export(graph_diameter)
export(graph_diversity)
export(graph_dyad_census)
export(graph_ei_index)
export(graph_eigenvector)
export(graph_equivalency)
export(graph_factions)
export(graph_homophily)
export(graph_length)
export(graph_mixed_census)
export(graph_modularity)
export(graph_reciprocity)
export(graph_smallworld)
export(graph_transitivity)
export(graph_triad_census)
export(guides)
export(is.network)
export(is.tbl_graph)
export(is_igraph)
export(k_elbow)
export(k_silhouette)
export(k_strict)
export(labs)
export(mutate)
export(network_adhesion)
export(network_assortativity)
export(network_balance)
export(network_betweenness)
export(network_brokerage_census)
export(network_change)
export(network_closeness)
export(network_cohesion)
export(network_components)
export(network_congruency)
export(network_connectedness)
export(network_core)
export(network_degree)
export(network_density)
export(network_diameter)
export(network_diversity)
export(network_dyad_census)
export(network_efficiency)
export(network_eigenvector)
export(network_equivalency)
export(network_factions)
export(network_harmonic)
export(network_hazard)
export(network_heterophily)
export(network_homophily)
export(network_immunity)
export(network_indegree)
export(network_infection_length)
export(network_length)
export(network_mixed_census)
export(network_modularity)
export(network_outdegree)
export(network_reach)
export(network_reciprocity)
export(network_reg)
export(network_reproduction)
export(network_richclub)
export(network_richness)
export(network_scalefree)
export(network_smallworld)
export(network_spatial)
export(network_stability)
export(network_transitivity)
export(network_transmissibility)
export(network_triad_census)
export(network_upperbound)
export(node_adopter)
export(node_adoption_time)
export(node_alpha)
export(node_automorphic_equivalence)
export(node_betweenness)
export(node_bridges)
export(node_brokerage_census)
export(node_brokering)
export(node_brokering_activity)
export(node_brokering_exclusivity)
export(node_closeness)
export(node_components)
export(node_constraint)
export(node_core)
export(node_coreness)
export(node_cuts)
export(node_deg)
export(node_degree)
export(node_diversity)
export(node_eccentricity)
export(node_edge_betweenness)
export(node_efficiency)
export(node_effsize)
export(node_eigenvector)
export(node_equivalence)
export(node_exposure)
export(node_fast_greedy)
export(node_flow)
export(node_fluid)
export(node_harmonic)
export(node_heterophily)
export(node_hierarchy)
export(node_homophily)
export(node_indegree)
export(node_induced)
export(node_infection_length)
export(node_infomap)
export(node_information)
export(node_kernighanlin)
export(node_leading_eigen)
export(node_leiden)
export(node_louvain)
export(node_multidegree)
export(node_neighbours_degree)
export(node_optimal)
export(node_outdegree)
export(node_pagerank)
export(node_path_census)
export(node_posneg)
export(node_power)
export(node_quad_census)
export(node_reach)
export(node_reciprocity)
export(node_redundancy)
export(node_regular_equivalence)
export(node_richness)
export(node_roulette)
export(node_spinglass)
export(node_strong_components)
export(node_structural_equivalence)
export(node_thresholds)
export(node_tie_census)
export(node_transitivity)
export(node_triad_census)
export(node_walktrap)
export(node_weak_components)
export(over_time)
export(over_waves)
export(rename)
export(scale_y_discrete)
export(test_distribution)
export(test_fit)
export(test_gof)
export(test_permutation)
export(test_random)
export(tidy)
export(tie_betweenness)
export(tie_closeness)
export(tie_cohesion)
export(tie_degree)
export(tie_eigenvector)
export(with_graph)
export(xlab)
export(ylab)
import(tidygraph)
importFrom(dplyr,"%>%")
importFrom(dplyr,bind_cols)
importFrom(dplyr,left_join)
Expand All @@ -220,74 +46,28 @@ importFrom(future,plan)
importFrom(generics,glance)
importFrom(generics,tidy)
importFrom(ggplot2,aes)
importFrom(ggplot2,element_blank)
importFrom(ggplot2,element_text)
importFrom(ggplot2,geom_hline)
importFrom(ggplot2,geom_tile)
importFrom(ggplot2,geom_vline)
importFrom(ggplot2,ggplot)
importFrom(ggplot2,ggsave)
importFrom(ggplot2,ggtitle)
importFrom(ggplot2,guides)
importFrom(ggplot2,labs)
importFrom(ggplot2,scale_fill_gradient)
importFrom(ggplot2,scale_x_discrete)
importFrom(ggplot2,scale_y_discrete)
importFrom(ggplot2,theme)
importFrom(ggplot2,theme_grey)
importFrom(ggplot2,xlab)
importFrom(ggplot2,ylab)
importFrom(igraph,V)
importFrom(igraph,adhesion)
importFrom(igraph,alpha_centrality)
importFrom(igraph,assortativity_degree)
importFrom(igraph,cohesion)
importFrom(igraph,components)
importFrom(igraph,degree)
importFrom(igraph,delete_vertices)
importFrom(igraph,diameter)
importFrom(igraph,distances)
importFrom(igraph,eccentricity)
importFrom(igraph,edge_betweenness)
importFrom(igraph,edge_density)
importFrom(igraph,fit_power_law)
importFrom(igraph,graph_from_incidence_matrix)
importFrom(igraph,is_bipartite)
importFrom(igraph,is_igraph)
importFrom(igraph,knn)
importFrom(igraph,make_ego_graph)
importFrom(igraph,mean_distance)
importFrom(igraph,power_centrality)
importFrom(igraph,reciprocity)
importFrom(igraph,transitivity)
importFrom(igraph,triad_census)
importFrom(igraph,vcount)
importFrom(manynet,as_igraph)
importFrom(manynet,bind_node_attributes)
importFrom(manynet,generate_random)
importFrom(manynet,is_complex)
importFrom(manynet,is_directed)
importFrom(network,as.network)
importFrom(network,is.network)
importFrom(purrr,flatten)
importFrom(rlang,"%||%")
importFrom(rlang,.data)
importFrom(rlang,enquo)
importFrom(rlang,eval_tidy)
importFrom(sna,brokerage)
importFrom(sna,flowbet)
importFrom(sna,gcor)
importFrom(sna,infocent)
importFrom(stats,as.dist)
importFrom(stats,as.formula)
importFrom(stats,binomial)
importFrom(stats,coef)
importFrom(stats,complete.cases)
importFrom(stats,cor)
importFrom(stats,cutree)
importFrom(stats,df.residual)
importFrom(stats,glm.fit)
importFrom(stats,hclust)
importFrom(stats,median)
importFrom(stats,pchisq)
importFrom(stats,quantile)
importFrom(tidygraph,"%E>%")
importFrom(tidygraph,.E)
importFrom(tidygraph,.G)
importFrom(tidygraph,.N)
Expand All @@ -296,4 +76,3 @@ importFrom(tidygraph,is.tbl_graph)
importFrom(tidygraph,mutate)
importFrom(tidygraph,rename)
importFrom(tidygraph,with_graph)
importFrom(tidyr,pivot_longer)
33 changes: 33 additions & 0 deletions NEWS.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
# migraph 1.4.0

2024-07-18

## Package

- Updated migraph logo with stocnet address, colorsafe colorway, and larger nodes and ties
- Copied thisRequires() helper into migraph from manynet
- testthat tests now parallelised
- Fixed precision issues in testthat tests
- Declared global variables `.data` and `.graph_context`

## Measures, Motifs, and Memberships

- All measures, motifs, and memberships have migrated to `{manynet}`
- see `{manynet}` > v1.0.0 for more details

## Models

- Added `test_distribution()` to test whether two vectors/distributions are from the same distribution
- `test_gof()` renamed to `test_fit()` to improve readability
- Split tests documentation into two
- `test_fit()` no longer measures fit against steps where there is no covariance
- Fixed bug in `test_random()` where parameters were passed to `manynet::generate_random()` instead of the original object, which is processed more intuitively within `manynet::generate_random()` (thanks @RWKrause)
- Corrected that `test_random()` returns results on edge-conditioned uniform graphs, not size
- Reexported `ggplot2::scale_y_discrete()`
- Specification advice in `network_reg()` now ignores absent ego terms for undirected networks

## Tutorials

- Added descriptions to tutorials
- Renamed regression tutorial the diversity tutorial

# migraph 1.3.4

2024-03-07
Expand Down
Loading

0 comments on commit 74b8590

Please sign in to comment.