Merge branch 'develop' of https://github.com/snlab-ch/migraph into de…

…velop
stocnet · Nov 15, 2023 · 78e6f95 · 78e6f95
2 parents 952aae4 + 515319a
commit 78e6f95
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/R/measure_heterogeneity.R b/R/measure_heterogeneity.R
@@ -154,7 +154,7 @@ node_heterophily <- function(.data, attribute){
   make_node_measure(ei, .data)
 }
 
-#' @describeIn heterogeneity Calculates the degree assortativity in a graph.
+#' @describeIn heterogeneity Calculates the degree assortativity in a network.
 #' @importFrom igraph assortativity_degree
 #' @examples 
 #' network_assortativity(mpn_elite_mex)

diff --git a/R/model_play.R b/R/model_play.R
@@ -290,7 +290,7 @@ play_segregation <- function(.data,
     }, FUN.VALUE = numeric(1))
     if(length(options)==0) next
     move_to <- switch(choice_function,
-                      satisficing = unoccupied[which(options <= heterophily)[1]],
+                      satisficing = unoccupied[sample(which(options <= heterophily[unoccupied]), 1)],
                       optimising = unoccupied[which.min(options)[1]],
                       minimising = unoccupied[which.min(igraph::distances(temp, 
                                                                           igraph::V(temp)[dissatisfied], 

diff --git a/man/heterogeneity.Rd b/man/heterogeneity.Rd