diff --git a/.Rbuildignore b/.Rbuildignore index 9402c78..787508c 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -7,3 +7,4 @@ ^manual$ ^CRAN-SUBMISSION$ ^.github$ +^MoNAn_logo\.png$ diff --git a/DESCRIPTION b/DESCRIPTION index 7b87269..70b6f22 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -7,7 +7,7 @@ Authors@R: c(person("Per", "Block", role = c("cre", "aut", "cph"), email = "bloc comment = c(ORCID = "0000-0002-7583-2392")), person("Christoph", "Stadtfeld", role = "aut", comment = c(ORCID = "0000-0002-2704-2134")), person("Nico", "Keiser", role = "aut", comment = c(ORCID = "0009-0007-3403-278X")), - person("Marion", "Hoffman", role = "aut", comment = c(ORCID = 0000-0002-0741-7760))) + person("Marion", "Hoffman", role = "aut", comment = c(ORCID = "0000-0002-0741-7760"))) Description: Implements the method to analyse weighted mobility networks or distribution networks as outlined in: Block, P., Stadtfeld, C., & Robins, G. (2022) . The purpose of the model is to analyse the structure of mobility, diff --git a/R/2f_effectFunctions_endogenousCovariateBased.R b/R/2f_effectFunctions_endogenousCovariateBased.R index 3a17cf2..4e3be1e 100644 --- a/R/2f_effectFunctions_endogenousCovariateBased.R +++ b/R/2f_effectFunctions_endogenousCovariateBased.R @@ -546,7 +546,7 @@ avoiding_dissimilar_covar_cont <- function(dep.var = 1, -#' associativity_all_GW_covar_bin +#' associativity_all_AC_covar_bin #' #' Do individuals with the same attribute tend to use the same paths and #' individuals with different attributes to move to different places? @@ -564,11 +564,12 @@ avoiding_dissimilar_covar_cont <- function(dep.var = 1, #' @param edge #' @param update #' @param getTargetContribution +#' @param alpha #' #' @return Returns the change statistic or target statistic of the effect for #' internal use by the estimation algorithm. #' @keywords internal -associativity_all_GW_covar_bin <- function(dep.var = 1, +associativity_all_AC_covar_bin <- function(dep.var = 1, resource.attribute.index, state, cache, @@ -576,7 +577,8 @@ associativity_all_GW_covar_bin <- function(dep.var = 1, j, edge, update, - getTargetContribution = FALSE){ + getTargetContribution = FALSE, + alpha = 2){ nResources <- cache[[dep.var]]$valuedNetwork[i, j] nResources_1 <- cache[[dep.var]]$resourceNetworks[[resource.attribute.index]][i, j] @@ -629,7 +631,7 @@ associativity_all_GW_covar_bin <- function(dep.var = 1, } -#' associativity_one_GW_covar_bin +#' associativity_one_AC_covar_bin #' #' Do individuals with the same attribute tend to use the same paths and #' individuals with different attributes to move to different places? @@ -647,11 +649,12 @@ associativity_all_GW_covar_bin <- function(dep.var = 1, #' @param edge #' @param update #' @param getTargetContribution +#' @param alpha #' #' @return Returns the change statistic or target statistic of the effect for #' internal use by the estimation algorithm. #' @keywords internal -associativity_one_GW_covar_bin <- function(dep.var = 1, +associativity_one_AC_covar_bin <- function(dep.var = 1, resource.attribute.index, state, cache, @@ -659,7 +662,8 @@ associativity_one_GW_covar_bin <- function(dep.var = 1, j, edge, update, - getTargetContribution = FALSE){ + getTargetContribution = FALSE, + alpha = 2){ nResources <- cache[[dep.var]]$valuedNetwork[i, j] nResources_1 <- cache[[dep.var]]$resourceNetworks[[resource.attribute.index]][i, j] diff --git a/man/MoNAn-package.Rd b/man/MoNAn-package.Rd index f35f40c..6d90b64 100644 --- a/man/MoNAn-package.Rd +++ b/man/MoNAn-package.Rd @@ -15,7 +15,7 @@ Authors: \itemize{ \item Christoph Stadtfeld (\href{https://orcid.org/0000-0002-2704-2134}{ORCID}) \item Nico Keiser (\href{https://orcid.org/0009-0007-3403-278X}{ORCID}) - \item Marion Hoffman + \item Marion Hoffman (\href{https://orcid.org/0000-0002-0741-7760}{ORCID}) } } diff --git a/man/associativity_all_GW_covar_bin.Rd b/man/associativity_all_AC_covar_bin.Rd similarity index 81% rename from man/associativity_all_GW_covar_bin.Rd rename to man/associativity_all_AC_covar_bin.Rd index d1d5a0c..ed8d8a8 100644 --- a/man/associativity_all_GW_covar_bin.Rd +++ b/man/associativity_all_AC_covar_bin.Rd @@ -1,10 +1,10 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/2f_effectFunctions_endogenousCovariateBased.R -\name{associativity_all_GW_covar_bin} -\alias{associativity_all_GW_covar_bin} -\title{associativity_all_GW_covar_bin} +\name{associativity_all_AC_covar_bin} +\alias{associativity_all_AC_covar_bin} +\title{associativity_all_AC_covar_bin} \usage{ -associativity_all_GW_covar_bin( +associativity_all_AC_covar_bin( dep.var = 1, resource.attribute.index, state, @@ -13,7 +13,8 @@ associativity_all_GW_covar_bin( j, edge, update, - getTargetContribution = FALSE + getTargetContribution = FALSE, + alpha = 2 ) } \arguments{ @@ -34,6 +35,8 @@ associativity_all_GW_covar_bin( \item{update}{} \item{getTargetContribution}{} + +\item{alpha}{} } \value{ Returns the change statistic or target statistic of the effect for diff --git a/man/associativity_one_GW_covar_bin.Rd b/man/associativity_one_AC_covar_bin.Rd similarity index 81% rename from man/associativity_one_GW_covar_bin.Rd rename to man/associativity_one_AC_covar_bin.Rd index b87fca9..29e7cc4 100644 --- a/man/associativity_one_GW_covar_bin.Rd +++ b/man/associativity_one_AC_covar_bin.Rd @@ -1,10 +1,10 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/2f_effectFunctions_endogenousCovariateBased.R -\name{associativity_one_GW_covar_bin} -\alias{associativity_one_GW_covar_bin} -\title{associativity_one_GW_covar_bin} +\name{associativity_one_AC_covar_bin} +\alias{associativity_one_AC_covar_bin} +\title{associativity_one_AC_covar_bin} \usage{ -associativity_one_GW_covar_bin( +associativity_one_AC_covar_bin( dep.var = 1, resource.attribute.index, state, @@ -13,7 +13,8 @@ associativity_one_GW_covar_bin( j, edge, update, - getTargetContribution = FALSE + getTargetContribution = FALSE, + alpha = 2 ) } \arguments{ @@ -34,6 +35,8 @@ associativity_one_GW_covar_bin( \item{update}{} \item{getTargetContribution}{} + +\item{alpha}{} } \value{ Returns the change statistic or target statistic of the effect for