Merge pull request #55 from stocnet/develop

v0.4.0

Author: jhollway

.Rbuildignore

@@ -17,3 +17,4 @@ vignettes/precompile\.R
 ^Meta$
 ^CRAN-SUBMISSION$
 ^README\.Rmd$
+^.mailmap$

.mailmap

@@ -0,0 +1 @@
+James Hollway <james.hollway@graduateinstitute.ch> hollway <hollway@MA0359.local>

DESCRIPTION

@@ -1,27 +1,28 @@
 Package: manynet
-Title: Many Ways to Make, Modify, and Map Myriad Networks
-Version: 0.3.1
-Date: 2023-12-17
-Description: A set of tools for making, modifying, and mapping many different types of networks.
+Title: Many Ways to Make, Modify, Mark, and Map Myriad Networks
+Version: 0.4.0
+Date: 2024-01-24
+Description: A set of tools for making, modifying, marking, and mapping many different types of networks.
    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.
    The package includes functions for importing and exporting, creating and generating networks,
-   molding and manipulating networks and node and tie attributes,
+   modifying networks and node and tie attributes,
    and describing and visualizing networks with sensible defaults.
-URL: https://snlab-ch.github.io/manynet/
-BugReports: https://github.com/snlab-ch/manynet/issues
+URL: https://stocnet.github.io/manynet/
+BugReports: https://github.com/stocnet/manynet/issues
 Depends: R (>= 3.6.0)
 License: MIT + file LICENSE
 Language: en-GB
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.0
 Imports: 
     dplyr (>= 1.1.0),
     ggplot2,
     ggraph,
     igraph (>= 1.6.0),
     network,
+    pillar,
     tidygraph
 Suggests: 
     BiocManager,
@@ -43,8 +44,10 @@ Suggests:
     rmarkdown,
     roxygen2,
     RSiena,
-    testthat,
-    xml2
+    testthat (>= 3.0.0),
+    xml2,
+    future,
+    furrr
 Enhances:
     Rgraphviz
 Authors@R: 
@@ -59,3 +62,6 @@ Authors@R:
              comment = c("IHEID", ORCID = "0000-0003-3420-6085"))
     )
 Roxygen: list(markdown = TRUE, roclets = c("namespace", "rd"))
+Config/testthat/parallel: true
+Config/testthat/edition: 3
+Config/testthat/start-first: mark_is 

NAMESPACE

@@ -54,6 +54,7 @@ S3method(as_tidygraph,network.goldfish)
 S3method(as_tidygraph,siena)
 S3method(as_tidygraph,tbl_graph)
 S3method(delete_nodes,igraph)
+S3method(delete_ties,igraph)
 S3method(is_complex,data.frame)
 S3method(is_complex,igraph)
 S3method(is_complex,matrix)
@@ -100,7 +101,8 @@ S3method(is_weighted,igraph)
 S3method(is_weighted,matrix)
 S3method(is_weighted,network)
 S3method(is_weighted,tbl_graph)
-S3method(mutate,igraph)
+S3method(mutate_nodes,igraph)
+S3method(mutate_nodes,tbl_graph)
 S3method(na_to_mean,data.frame)
 S3method(na_to_mean,igraph)
 S3method(na_to_mean,matrix)
@@ -115,7 +117,19 @@ S3method(network_dims,data.frame)
 S3method(network_dims,igraph)
 S3method(network_dims,matrix)
 S3method(network_dims,network)
+S3method(plot,diff_model)
+S3method(plot,diffs_model)
+S3method(plot,learn_model)
+S3method(print,diff_model)
+S3method(print,diffs_model)
+S3method(print,learn_model)
+S3method(print,node_mark)
 S3method(print,tbl_graph)
+S3method(print,tie_mark)
+S3method(summary,diff_model)
+S3method(summary,diffs_model)
+S3method(summary,learn_model)
+S3method(to_acyclic,data.frame)
 S3method(to_acyclic,igraph)
 S3method(to_acyclic,matrix)
 S3method(to_acyclic,network)
@@ -256,6 +270,7 @@ export(add_tie_attribute)
 export(add_ties)
 export(aes)
 export(as.network)
+export(as_diffusion)
 export(as_edgelist)
 export(as_graphAM)
 export(as_igraph)
@@ -266,8 +281,8 @@ export(as_tidygraph)
 export(autographd)
 export(autographr)
 export(autographs)
-export(bind_edges)
 export(bind_node_attributes)
+export(bind_ties)
 export(create_components)
 export(create_core)
 export(create_empty)
@@ -278,11 +293,14 @@ export(create_ring)
 export(create_star)
 export(create_tree)
 export(delete_nodes)
+export(delete_ties)
 export(extract_tute)
+export(filter_nodes)
 export(filter_ties)
 export(from_egos)
 export(from_slices)
 export(from_subgraphs)
+export(from_ties)
 export(from_waves)
 export(generate_permutation)
 export(generate_random)
@@ -293,7 +311,6 @@ export(ggplot)
 export(ggsave)
 export(ggtitle)
 export(guides)
-export(is.igraph)
 export(is.network)
 export(is.tbl_graph)
 export(is_acyclic)
@@ -305,7 +322,9 @@ export(is_dynamic)
 export(is_edgelist)
 export(is_eulerian)
 export(is_graph)
+export(is_igraph)
 export(is_labelled)
+export(is_list)
 export(is_longitudinal)
 export(is_manynet)
 export(is_multiplex)
@@ -328,6 +347,7 @@ export(layout_tbl_graph_railway)
 export(layout_tbl_graph_triad)
 export(many_palettes)
 export(mutate)
+export(mutate_nodes)
 export(mutate_ties)
 export(na_to_mean)
 export(na_to_zero)
@@ -337,8 +357,25 @@ export(network_nodes)
 export(network_tie_attributes)
 export(network_ties)
 export(node_attribute)
+export(node_is_core)
+export(node_is_cutpoint)
+export(node_is_exposed)
+export(node_is_fold)
+export(node_is_infected)
+export(node_is_isolate)
+export(node_is_latent)
+export(node_is_max)
+export(node_is_mentor)
+export(node_is_min)
+export(node_is_random)
+export(node_is_recovered)
 export(node_mode)
 export(node_names)
+export(pkg_data)
+export(play_diffusion)
+export(play_diffusions)
+export(play_learning)
+export(play_segregation)
 export(read_dynetml)
 export(read_edgelist)
 export(read_graphml)
@@ -347,6 +384,7 @@ export(read_nodelist)
 export(read_pajek)
 export(read_ucinet)
 export(rename)
+export(rename_nodes)
 export(rename_ties)
 export(run_tute)
 export(scale_color_centres)
@@ -361,6 +399,18 @@ export(scale_colour_iheid)
 export(scale_colour_rug)
 export(scale_colour_sdgs)
 export(scale_colour_uzh)
+export(scale_edge_color_centres)
+export(scale_edge_color_ethz)
+export(scale_edge_color_iheid)
+export(scale_edge_color_rug)
+export(scale_edge_color_sdgs)
+export(scale_edge_color_uzh)
+export(scale_edge_colour_centres)
+export(scale_edge_colour_ethz)
+export(scale_edge_colour_iheid)
+export(scale_edge_colour_rug)
+export(scale_edge_colour_sdgs)
+export(scale_edge_colour_uzh)
 export(scale_fill_centres)
 export(scale_fill_ethz)
 export(scale_fill_iheid)
@@ -374,6 +424,14 @@ export(theme_iheid)
 export(theme_rug)
 export(theme_uzh)
 export(tie_attribute)
+export(tie_is_bridge)
+export(tie_is_feedback)
+export(tie_is_loop)
+export(tie_is_max)
+export(tie_is_min)
+export(tie_is_multiple)
+export(tie_is_random)
+export(tie_is_reciprocated)
 export(tie_signs)
 export(tie_weights)
 export(to_acyclic)
@@ -400,6 +458,7 @@ export(to_slices)
 export(to_subgraph)
 export(to_subgraphs)
 export(to_ties)
+export(to_tree)
 export(to_twomode)
 export(to_undirected)
 export(to_uniplex)
@@ -431,9 +490,11 @@ importFrom(dplyr,mutate)
 importFrom(dplyr,rename)
 importFrom(dplyr,select)
 importFrom(dplyr,summarise)
+importFrom(dplyr,tibble)
 importFrom(dplyr,ungroup)
 importFrom(ggplot2,aes)
 importFrom(ggplot2,arrow)
+importFrom(ggplot2,geom_histogram)
 importFrom(ggplot2,geom_point)
 importFrom(ggplot2,geom_segment)
 importFrom(ggplot2,geom_text)
@@ -456,19 +517,20 @@ importFrom(ggraph,geom_node_label)
 importFrom(ggraph,geom_node_point)
 importFrom(ggraph,geom_node_text)
 importFrom(ggraph,get_con)
-importFrom(ggraph,ggraph)
 importFrom(ggraph,scale_edge_width_continuous)
 importFrom(igraph,E)
 importFrom(igraph,V)
 importFrom(igraph,add_edges)
 importFrom(igraph,add_vertices)
+importFrom(igraph,any_loop)
 importFrom(igraph,any_multiple)
+importFrom(igraph,articulation_points)
 importFrom(igraph,as.directed)
 importFrom(igraph,as.undirected)
 importFrom(igraph,as_adjacency_matrix)
 importFrom(igraph,as_biadjacency_matrix)
 importFrom(igraph,as_data_frame)
-importFrom(igraph,bipartite.projection)
+importFrom(igraph,bipartite_projection)
 importFrom(igraph,complementer)
 importFrom(igraph,decompose)
 importFrom(igraph,degree)
@@ -479,23 +541,22 @@ importFrom(igraph,delete_vertices)
 importFrom(igraph,edge_attr)
 importFrom(igraph,edge_attr_names)
 importFrom(igraph,eulerian_path)
+importFrom(igraph,feedback_arc_set)
 importFrom(igraph,get.edgelist)
-importFrom(igraph,get.vertex.attribute)
 importFrom(igraph,graph_from_adjacency_matrix)
 importFrom(igraph,graph_from_biadjacency_matrix)
 importFrom(igraph,graph_from_data_frame)
 importFrom(igraph,gsize)
+importFrom(igraph,has_eulerian_path)
 importFrom(igraph,induced_subgraph)
-importFrom(igraph,is.connected)
-importFrom(igraph,is.directed)
-importFrom(igraph,is.igraph)
-importFrom(igraph,is.loop)
-importFrom(igraph,is.named)
-importFrom(igraph,is.simple)
-importFrom(igraph,is.weighted)
 importFrom(igraph,is_bipartite)
+importFrom(igraph,is_connected)
 importFrom(igraph,is_dag)
-importFrom(igraph,list.vertex.attributes)
+importFrom(igraph,is_directed)
+importFrom(igraph,is_igraph)
+importFrom(igraph,is_named)
+importFrom(igraph,is_simple)
+importFrom(igraph,is_weighted)
 importFrom(igraph,make_ego_graph)
 importFrom(igraph,make_lattice)
 importFrom(igraph,make_line_graph)
@@ -515,6 +576,9 @@ importFrom(igraph,simplify)
 importFrom(igraph,vcount)
 importFrom(igraph,vertex_attr)
 importFrom(igraph,vertex_attr_names)
+importFrom(igraph,which_loop)
+importFrom(igraph,which_multiple)
+importFrom(igraph,which_mutual)
 importFrom(igraph,write_graph)
 importFrom(network,as.edgelist)
 importFrom(network,as.matrix.network)
@@ -529,13 +593,17 @@ importFrom(network,list.edge.attributes)
 importFrom(network,network.size)
 importFrom(network,read.paj)
 importFrom(network,set.vertex.attribute)
+importFrom(pillar,style_subtle)
+importFrom(pillar,tbl_format_body)
+importFrom(pillar,tbl_format_setup)
 importFrom(stats,cor)
 importFrom(tidygraph,.E)
 importFrom(tidygraph,.G)
 importFrom(tidygraph,.N)
 importFrom(tidygraph,activate)
 importFrom(tidygraph,as_tbl_graph)
 importFrom(tidygraph,bind_edges)
+importFrom(tidygraph,filter)
 importFrom(tidygraph,is.tbl_graph)
 importFrom(tidygraph,mutate)
 importFrom(tidygraph,node_is_isolated)