Skip to content

Commit

Permalink
Merge pull request #286 from snlab-ch/develop
Browse files Browse the repository at this point in the history
v1.2.0
  • Loading branch information
jhollway authored Dec 17, 2023
2 parents 11f1a19 + f3c6671 commit 7aff1cb
Show file tree
Hide file tree
Showing 17 changed files with 509 additions and 389 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: migraph
Title: Multimodal Network Analysis and More
Version: 1.1.9
Date: 2023-12-13
Version: 1.2.0
Date: 2023-12-17
Description: A set of tools for analysing multimodal networks.
It includes functions for measuring
centrality, centralization, cohesion, closure, constraint and diversity,
Expand Down
15 changes: 5 additions & 10 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,6 @@ export(guides)
export(is.igraph)
export(is.network)
export(is.tbl_graph)
export(is_acyclic)
export(is_aperiodic)
export(is_connected)
export(is_eulerian)
export(is_perfect_matching)
export(k_elbow)
export(k_silhouette)
export(k_strict)
Expand All @@ -121,6 +116,7 @@ export(network_eigenvector)
export(network_equivalency)
export(network_factions)
export(network_harmonic)
export(network_hazard)
export(network_heterophily)
export(network_homophily)
export(network_immunity)
Expand Down Expand Up @@ -175,11 +171,15 @@ export(node_infomap)
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_kernighanlin)
export(node_leading_eigen)
export(node_leiden)
Expand Down Expand Up @@ -278,10 +278,8 @@ importFrom(igraph,edge_density)
importFrom(igraph,fit_power_law)
importFrom(igraph,graph.neighborhood)
importFrom(igraph,graph_from_incidence_matrix)
importFrom(igraph,is.connected)
importFrom(igraph,is.igraph)
importFrom(igraph,is_bipartite)
importFrom(igraph,is_dag)
importFrom(igraph,knn)
importFrom(igraph,mean_distance)
importFrom(igraph,power_centrality)
Expand All @@ -293,9 +291,6 @@ importFrom(igraph,which_loop)
importFrom(igraph,which_multiple)
importFrom(igraph,which_mutual)
importFrom(manynet,as_igraph)
importFrom(manynet,is_directed)
importFrom(manynet,is_twomode)
importFrom(manynet,to_matching)
importFrom(network,as.network)
importFrom(network,is.network)
importFrom(purrr,flatten)
Expand Down
34 changes: 34 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
# migraph 1.2.0

2023-12-17

## Marks

- Added `node_is_infected()` to identify infected nodes at given time
- Added `node_is_latent()` to identify infected nodes at given time
- Added `node_is_recovered()` to identify infected nodes at given time
- Added `node_is_fold()` for identifying nodes that are occupying structural folds
- Dropped last `is_*()` functions from migraph to avoid unnecessary conflicts with manynet at startup
- Improved 'mark_nodes' documentation

## Measures

- Added `network_hazard()` for calculating the hazard rate for each time point of a diff_model object
- `node_adoption_time()` now works with incomplete diffusions
- Fixed bug with named vectors
- `node_exposure()` now uses `node_is_infected()` for more flexibility
- `node_thresholds()` now works with incomplete diffusions
- Adds exposure data where not provided

## Members

- `node_adopter()` now correctly identifies non-adopters

## Models

- `play_diffusion()`
- Now records only the first exposure event until susceptible again
- Now uses `node_is_exposed()` and `node_exposure()` internally
- Made play_diffusion() code easier to understand and debug
- Added some tests for `play_diffusion()`

# migraph 1.1.9

2023-12-13
Expand Down
92 changes: 0 additions & 92 deletions R/mark_is.R

This file was deleted.

Loading

0 comments on commit 7aff1cb

Please sign in to comment.