diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 31878dcc..9c1a5540 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -18,8 +18,9 @@ jobs: fail-fast: false matrix: config: - - {os: macos-latest, r: 'release'} - - {os: windows-latest, r: 'release'} + # JAGS not working for these on GitHub + # - {os: macos-latest, r: 'release'} + # - {os: windows-latest, r: 'release'} - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} - {os: ubuntu-latest, r: 'release'} - {os: ubuntu-latest, r: 'oldrel-1'} diff --git a/NAMESPACE b/NAMESPACE index 20f93805..ef5ea247 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -56,6 +56,7 @@ importFrom(stats,time) importFrom(stats,var) importFrom(stats,weighted.mean) importFrom(terra,plot) +importFrom(utils,hasName) importFrom(utils,packageVersion) importFrom(utils,read.csv) importFrom(utils,write.csv) diff --git a/man/getScenarioDefaults.Rd b/man/getScenarioDefaults.Rd index fc6200e8..5de8f250 100644 --- a/man/getScenarioDefaults.Rd +++ b/man/getScenarioDefaults.Rd @@ -31,7 +31,7 @@ getScenarioDefaults( cowCount = NA, collarCount = NA, startYear = NA, - interannualVar = formals(caribouPopGrowth)$interannualVar, + interannualVar = list(eval(formals(caribouPopGrowth)$interannualVar)), curYear = 2023 ) } @@ -91,7 +91,7 @@ missing assumed to be every year} \item{cowCount}{Optional. Only used in \code{runScnSet()} to set the number of cows per year in recruitment survey} -\item{collarCount}{number >= 1. The target number of collars active each year. Set to NA to use \code{freqStartsPerYear} in \verb{simulateObservations(}} +\item{collarCount}{number >= 1. The target number of collars active each year. Set to NA to use \code{freqStartsPerYear} in \code{simulateObservations()}} \item{startYear}{year. First year in observation period. Optional, if not provided it will be calculated from \code{curYear} and \code{obsYears}} diff --git a/man/getSimsNational.Rd b/man/getSimsNational.Rd index d9467cfb..e38f1d1d 100644 --- a/man/getSimsNational.Rd +++ b/man/getSimsNational.Rd @@ -14,7 +14,7 @@ getSimsNational( adjustR = TRUE, cPars = getScenarioDefaults(), forceUpdate = F, - interannualVar = formals(caribouPopGrowth)$interannualVar + interannualVar = eval(formals(caribouPopGrowth)$interannualVar) ) } \arguments{