Skip to content

Commit

Permalink
CRAN acceptance
Browse files Browse the repository at this point in the history
  • Loading branch information
ericward-noaa authored Jan 24, 2024
1 parent 762aac6 commit 415eb5b
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 11 deletions.
6 changes: 3 additions & 3 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Version: 1.2.0
Date: 2023-09-11 22:08:20 UTC
SHA: ba10aa7dd9c9ea57675350652ba4e2bf4df1b7cf
Version: 1.3.1
Date: 2024-01-24 17:50:23 UTC
SHA: 762aac6f412d4cd1d25d68b5d75be87a00614097
1 change: 0 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ BugReports: https://github.com/noaa-nwfsc/zoid/issues
Depends:
R (>= 3.4.0)
Imports:
compositions,
gtools,
methods,
Rcpp (>= 0.12.0),
Expand Down
8 changes: 8 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# zoid 1.3.1

* Remove dependency on compositions package, change URLs to noaa-nwfsc

# zoid 1.3.0

* Updated models to allow for random effects

# zoid 1.2.0

* Updated Stan code to reflect changes needed to be compatible with Stan 2.26 (arrays)
Expand Down
6 changes: 3 additions & 3 deletions R/fitting.R
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@
#' nrow = 3, byrow = TRUE
#' )
#' # fit a model with no covariates
#' fit <- fit_zoid(data_matrix = y)
#' fit <- fit_zoid(data_matrix = y, chains = 1, iter = 100)
#'
#' # fit a model with 1 factor
#' design <- data.frame("fac" = c("spring", "spring", "fall"))
#' fit <- fit_zoid(formula = ~fac, design_matrix = design, data_matrix = y)
#' fit <- fit_zoid(formula = ~fac, design_matrix = design, data_matrix = y, chains = 1, iter = 100)
#' }
#' # try a model with random effects
#' set.seed(123)
#' y <- matrix(runif(99,1,4), ncol=3)
#' design <- data.frame("fac" = sample(letters[1:5], size=nrow(y), replace=TRUE))
#' design$fac <- as.factor(design$fac)
#' fit <- fit_zoid(formula = ~(1|fac), design_matrix = design, data_matrix = y)
#' fit <- fit_zoid(formula = ~(1|fac), design_matrix = design, data_matrix = y, chains = 1, iter = 100)
#'
fit_zoid <- function(formula = NULL,
design_matrix,
Expand Down
2 changes: 1 addition & 1 deletion inst/CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ bibentry(bibtype = "Manual",
),
year = year,
note = note,
url = "https://nwfsc-cb.github.io/zoid/")
url = "https://noaa-nwfsc.github.io/zoid/")

14 changes: 14 additions & 0 deletions man/fit_dirichlet.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/fit_zoid.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 415eb5b

Please sign in to comment.